]> www.infradead.org Git - nvme.git/commit
PCI: Check for the existence of 'dev.of_node' before calling of_platform_populate()
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Wed, 17 Jul 2024 04:27:46 +0000 (09:57 +0530)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jul 2024 18:08:20 +0000 (11:08 -0700)
commit24777bac4af5fcddb0cf4a7d8a2b6ee2a98fe6fd
treee98eee2342eda1e84e612d87e74e7b79a0fd7908
parentf2f6a8e8871725035959b90bac048cde555aa0e9
PCI: Check for the existence of 'dev.of_node' before calling of_platform_populate()

Commit 50b040ef3732 ("PCI/pwrctl: only call of_platform_populate() if
CONFIG_OF is enabled") added the CONFIG_OF guard for the
of_platform_populate() API.  But it missed the fact that the CONFIG_OF
platforms can also run on ACPI without devicetree (so dev.of_node will
be NULL).  In those cases, of_platform_populate() will fail with below
error messages as seen on the Ampere Altra box:

  pci 000c:00:01.0: failed to populate child OF nodes (-22)
  pci 000c:00:02.0: failed to populate child OF nodes (-22)

Fix this by checking for the existence of 'dev.of_node' before calling
the of_platform_populate() API.  This also warrants the removal of
CONFIG_OF check, since dev_of_node() helper will return NULL if
CONFIG_OF is not enabled.

While at it, let's also use dev_of_node() to pass device OF node pointer
to of_platform_populate().

Fixes: 50b040ef3732 ("PCI/pwrctl: only call of_platform_populate() if CONFIG_OF is enabled")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/linux-arm-msm/CAHk-=wjcO_9dkNf-bNda6bzykb5ZXWtAYA97p7oDsXPHmMRi6g@mail.gmail.com
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/pci/bus.c