From 3d6c5417a82f5dec8e708c0f311f1634a2aad651 Mon Sep 17 00:00:00 2001 From: nagurram-in Date: Wed, 13 Sep 2017 07:11:01 -0500 Subject: Fixed slot map entry id's,vendor id and some other stuff Change-Id: Ibf3695beac7d52a959e0c3098e341486fc4cc0da Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46140 Reviewed-by: VENKATESH SAINATH Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: William G. Hoffa --- src/usr/hdat/hdatiohub.C | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'src/usr/hdat') diff --git a/src/usr/hdat/hdatiohub.C b/src/usr/hdat/hdatiohub.C index adef08e3f..876da1a4a 100644 --- a/src/usr/hdat/hdatiohub.C +++ b/src/usr/hdat/hdatiohub.C @@ -76,8 +76,8 @@ const HdatKeywordInfo l_pvpdKeywords[] = extern trace_desc_t *g_trac_hdat; const uint32_t HDAT_MULTIPLE = 16; -const uint32_t PROC0_NUM_SLOT_TABLE_AREAS = 14; -const uint32_t PROC1_NUM_SLOT_TABLE_AREAS = 13; +const uint32_t PROC0_NUM_SLOT_TABLE_AREAS = 16; +const uint32_t PROC1_NUM_SLOT_TABLE_AREAS = 11; const uint32_t PROC0_NUM_SLOT_ENTRY_INFO = 2; const uint32_t PROC1_NUM_SLOT_ENTRY_INFO = 3; const uint32_t MAX_NUM_OF_PROCS = 2; @@ -100,35 +100,36 @@ hdatSlotMapArea_t hdatSlotMapAreas[MAX_NUM_OF_PROCS][MAX_NUM_OF_SLOT_TABLE_ARE { { 1,0,0,0,0,0,0xFFFF,0,0,3,1,0,0,0,0,0,0,"SLOT3" }, -{ 2,0,1,0,0,0,0xFF00,0,0,0,0,0,0,0,0,0,0,0}, -{ 3,2,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, +{ 2,0,1,0,1,0,0xFF00,0x1111,0,0,0,0,0,0,0,0,0,0}, +{ 3,2,0,3,0,0,0,0,0,0,0,0,0,0x104C,0x8241,0,0,0}, { 4,0,2,0,0,0,0x00FF,0,0,0,0,0,0,0,0,0,0,0}, { 5,4,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, { 6,0,3,0,0,0,0xFF00,0,0,1,1,0,0,0,0,0,0,"SLOT1" }, { 7,0,4,0,0,0,0x00F0,0,0,0,0,0,0,0,0,0,0,0}, -{ 8,7,4,1,0,0,0,0,0,0,2,0,0,0x10B5,8725,0,0,0}, -{ 9,8,4,2,0,0,0,0,0,0,0,0,4,0x10B5,8725,0,0,0 }, -{ 10,9,4,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU3" }, -{ 11,8,4,2,0,0,0,0,0,0,0,0,5,0x10B5,8725,0,0,0 }, -{ 12,11,4,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU4" }, -{ 13,0,5,0,0,0,0x000F,0,0,0,0,0,0,0,0,0,0,0}, -{ 14,13,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0} +{ 8,7,4,1,0,0,0,0,0,0,2,0,0,0x10B5,0x8725,0x10B5,0x8725,0}, +{ 10,8,4,2,0,0,0,0,0,0,0,1,10,0x10B5,0x8725,0x10B5,0x8725,0 }, +{ 11,10,4,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU0" }, +{ 12,8,4,2,0,0,0,0,0,0,0,1,11,0x10B5,0x8725,0x10B5,0x8725,0 }, +{ 13,12,4,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU1"}, +{ 14,8,4,2,0,0,0,0,0,0,0,1,12,0x10B5,0x8725,0x10B5,0x8725,0}, +{ 15,14,4,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU2"}, +{ 16,0,5,0,0,0,0x000F,0,0,0,0,0,0,0,0,0,0,0}, +{ 17,16,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0} + }, { -{ 15,0,0,0,0,0,0xFFFF,0,0,2,1,0,0,0,0,0,0,"SLOT2" }, -{ 16,0,3,0,0,0,0xFF00,0,0,1,1,0,0,0,0,0,0,"SLOT1" }, -{ 17,0,4,0,0,0,0x00F0,0,0,0,1,0,0,0,0,0,0,"SLOT0" }, -{ 18,0,5,0,0,0,0x000F,0,0,0,0,0,0,0,0,0,0,0}, -{ 19,18,5,1,0,0,0,0,0,0,2,1,1,0x10B5,8725,0,0,0}, -{ 20,19,5,2,0,0,0,0,0,0,0,1,10,0x10B5,8725,0,0,0 }, -{ 21,20,5,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU0" }, -{ 22,19,5,2,0,0,0,0,0,0,0,1,11,0x10B5,8725,0,0,0 }, -{ 23,22,5,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU1" }, -{ 24,19,5,2,0,0,0,0,0,0,0,1,12,0x10B5,8725,0,0,0 }, -{ 25,24,5,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU2" }, -{ 26,19,5,2,0,0,0,0,0,0,0,1,13,0x10B5,8725,0,0,0 }, -{ 27,26,5,3,0,0,0,0,0,0,0,0,0,0,0,0,0,"GPU5" } +{ 18,0,0,0,0,0,0xFFFF,0,0,2,1,0,0,0,0,0,0,"SLOT2" }, +{ 19,0,3,0,0,0,0xFF00,0,0,1,1,0,0,0,0,0,0,"SLOT1" }, +{ 20,0,4,0,0,0,0x00F0,0,0,0,1,0,0,0,0,0,0,"SLOT0" }, +{ 21,0,5,0,0,0,0x000F,0,0,0,0,0,0,0,0,0,0,0}, +{ 22,21,5,1,0,0,0,0,0,0,2,1,1,0x10B5,0x8725,0x10B5,0x8725,0}, +{ 23,22,5,2,0,0,0,0,0,0,0,0,4,0x10B5,0x8725,0x10B5,0x8725,0 }, +{ 24,23,5,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU3" }, +{ 25,22,5,2,0,0,0,0,0,0,0,0,5,0x10B5,0x8725,0x10B5,0x8725,0 }, +{ 26,25,5,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU4" }, +{ 27,22,5,2,0,0,0,0,0,0,0,1,13,0x10B5,0x8725,0x10B5,0x8725,0 }, +{ 28,27,5,3,0,0,0,0,0,0,0,0,0,0x10DE,0x1DB1,0x10DE,0x1DB1,"GPU5" } } }; @@ -139,13 +140,12 @@ hdatSlotEntryInfo_t hdatSlotMapEntries[MAX_NUM_OF_PROCS][MAX_NUM_OF_SLOT_ENTRY_I { 6,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 } }, { -{ 15,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 }, -{ 16,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 }, -{ 17,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 } +{ 18,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 }, +{ 19,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 }, +{ 20,0,0,0,0,0,0,0,0,0,0,0,0x2,0,0,0,0,0,0 } } }; - /******************************************************************************* * IO HUB constructor *******************************************************************************/ -- cgit v1.2.1