[Skiboot] [PATCH] Revert "platforms/astbmc/slots.c: Allow comparison of bus numbers when matching slots"

Stewart Smith stewart at linux.vnet.ibm.com
Fri Mar 23 12:24:51 AEDT 2018


This reverts commit bda7cc4d0354eb3f66629d410b2afc08c79f795f.

Ben says:
It's on purpose that we do NOT compare the bus numbers,
they are always 0 in the slot table
we do a hierarchical walk of the tree, matching only the
devfn's along the way bcs the bus numbering isn't fixed
this breaks all slot naming etc... stuff on anything using
the "skiboot" slot tables (P8 opp typically)

Suggested-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 platforms/astbmc/slots.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/astbmc/slots.c b/platforms/astbmc/slots.c
index a5bd50ee8212..19b82fdd8c61 100644
--- a/platforms/astbmc/slots.c
+++ b/platforms/astbmc/slots.c
@@ -77,7 +77,7 @@ static const struct slot_table_entry *match_slot_dev_entry(struct phb *phb,
 		if (ent->etype == st_npu_slot)
 			bdfn = pd->bdfn & 0xf8;
 		else
-			bdfn = pd->bdfn & 0xffff;
+			bdfn = pd->bdfn & 0xff;
 
 		if (ent->location == bdfn)
 			return ent;
-- 
2.14.3



More information about the Skiboot mailing list