Commit 9813d27d authored Aug 02, 2022 by Michael Ellerman Committed by Greg Kroah-Hartman Aug 25, 2022

powerpc/pci: Fix PHB numbering when using opal-phbid



[ Upstream commit f4b39e88b42d13366b831270306326b5c20971ca ]

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


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 6a119c1a

arch/powerpc/kernel/pci-common.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -89,12 +89,14 @@ static int get_phb_number(struct device_node *dn)
		}
		if (ret)
		ret = of_property_read_u64(dn, "ibm,opal-phbid", &prop);
		if (ret)

		if (ret) {
		ret = of_alias_get_id(dn, "pci");
		if (ret >= 0) {
		prop = ret;
		ret = 0;
		}
		}
		if (ret) {
		u32 prop_32;
		ret = of_property_read_u32_index(dn, "reg", 1, &prop_32);