]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/pci: Fix PHB numbering when using opal-phbid
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 2 Aug 2022 10:38:32 +0000 (20:38 +1000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:14 +0000 (14:24 +0200)
commit4ccf44c7812020355dbb595057a59a5224e183d9
tree9508a96ef3d295d5039eae6018bdbfd7a85d98fe
parent22bf53205ed3f13fa8a9e3c0d8557f0f8a522ef1
powerpc/pci: Fix PHB numbering when using opal-phbid

[ Upstream commit 664ad96097fcc83cc881c712d94210c4a3004e83 ]

The recent change to the PHB numbering logic has a logic error in the
handling of "ibm,opal-phbid".

When an "ibm,opal-phbid" property is present, &prop is written to and
ret is set to zero.

The following call to of_alias_get_id() is skipped because ret == 0.

But then the if (ret >= 0) is true, and the body of that if statement
sets prop = ret which throws away the value that was just read from
"ibm,opal-phbid".

Fix the logic by only doing the ret >= 0 check in the of_alias_get_id()
case.

Fixes: b614cf23313a ("powerpc/pci: Prefer PCI domain assignment via DT 'linux,pci-domain' and alias")
Reviewed-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220802105723.1055178-1-mpe@ellerman.id.au
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/kernel/pci-common.c