[Skiboot] [PATCH] garrison.c: Update GPU location codes to match workbook

Alistair Popple alistair at popple.id.au
Wed Jun 1 14:23:57 AEST 2016


The Garrison workbook numbers GPUs starting from GPU1 instead of
GPU0. Update the skiboot location codes to match.

Signed-off-by: Alistair Popple <alistair at popple.id.au>
---
 platforms/astbmc/garrison.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c
index 2370baf..3ff84a3 100644
--- a/platforms/astbmc/garrison.c
+++ b/platforms/astbmc/garrison.c
@@ -47,7 +47,7 @@ static const struct slot_table_entry garrison_phb0_2_slot[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU0",
+		.name = "GPU1",
 	},
 	{ .etype = st_end },
 };
@@ -56,7 +56,7 @@ static const struct slot_table_entry garrison_phb0_3_slot[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU1",
+		.name = "GPU2",
 	},
 	{ .etype = st_end },
 };
@@ -65,22 +65,22 @@ static const struct slot_table_entry garrison_npu0_slots[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU1",
+		.name = "GPU2",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,1),
-		.name = "GPU1",
+		.name = "GPU2",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(1,0),
-		.name = "GPU0",
+		.name = "GPU1",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(1,1),
-		.name = "GPU0",
+		.name = "GPU1",
 	},
 	{ .etype = st_end },
 };
@@ -136,7 +136,7 @@ static const struct slot_table_entry garrison_phb1_2_slot[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU2",
+		.name = "GPU3",
 	},
 	{ .etype = st_end },
 };
@@ -145,7 +145,7 @@ static const struct slot_table_entry garrison_phb1_3_slot[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU3",
+		.name = "GPU4",
 	},
 	{ .etype = st_end },
 };
@@ -154,22 +154,22 @@ static const struct slot_table_entry garrison_npu1_slots[] = {
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
-		.name = "GPU3",
+		.name = "GPU4",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,1),
-		.name = "GPU3",
+		.name = "GPU4",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(1,0),
-		.name = "GPU2",
+		.name = "GPU3",
 	},
 	{
 		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(1,1),
-		.name = "GPU2",
+		.name = "GPU3",
 	},
 	{ .etype = st_end },
 };
-- 
2.1.4



More information about the Skiboot mailing list