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)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 2 Aug 2022 12:30:06 +0000 (22:30 +1000)
commitf4b39e88b42d13366b831270306326b5c20971ca
tree6b618387affd46f13e058fd86aa83d83e64ef1ef
parentca829e05d3d4f728810cc5e4b468d9ebc7745eb3
powerpc/pci: Fix PHB numbering when using opal-phbid

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: 0fe1e96fef0a ("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
arch/powerpc/kernel/pci-common.c