]> git.ipfire.org Git - thirdparty/kernel/stable.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>
Sun, 21 Aug 2022 13:16:12 +0000 (15:16 +0200)
commitcadeb5186e253ba9e44284423621090f1e2420e6
treef06fa4b0b99d5f5e282b91ae4278098413deb504
parent2a49b025c36ae749cee7ccc4b7e456e02539cdc3
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>
arch/powerpc/kernel/pci-common.c