From 75ac15f7103234eaafc2d7edc089e4b426a78f33 Mon Sep 17 00:00:00 2001
From: Mark Pizzutillo <Mark.Pizzutillo@ibm.com>
Date: Thu, 5 Sep 2019 15:36:11 -0400
Subject: Fix bug causing get_mmio index overflow for swift

Change-Id: Idbbc0186adda0575fccf0cc778d228ede0ea3394
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83359
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: RYAN P KING <rpking@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83373
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
---
 src/import/chips/p9/procedures/hwp/nest/p9a_get_mmio.C | 6 +++---
 src/import/chips/p9/procedures/hwp/nest/p9a_put_mmio.C | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9a_get_mmio.C b/src/import/chips/p9/procedures/hwp/nest/p9a_get_mmio.C
index c2cb8d8ef..1e9ce665f 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9a_get_mmio.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9a_get_mmio.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018                             */
+/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -55,8 +55,8 @@ fapi2::ReturnCode p9a_get_mmio(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>
                                std::vector<uint8_t>& o_data)
 {
     uint8_t data[8];
-    uint8_t l_idx;
-    uint8_t l_data_idx;
+    uint32_t l_idx;
+    uint32_t l_data_idx;
     uint32_t l_max_grans;
     uint32_t l_grans;
     p9_ADU_oper_flag l_myAduFlag;
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9a_put_mmio.C b/src/import/chips/p9/procedures/hwp/nest/p9a_put_mmio.C
index adebd16da..ddc6fbbe9 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9a_put_mmio.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9a_put_mmio.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2018                             */
+/* Contributors Listed Below - COPYRIGHT 2018,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -55,8 +55,8 @@ fapi2::ReturnCode p9a_put_mmio(const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>
                                const std::vector<uint8_t>& i_data)
 {
     uint8_t data[8];
-    uint8_t l_idx;
-    uint8_t l_data_idx;
+    uint32_t l_idx;
+    uint32_t l_data_idx;
     uint32_t l_max_grans;
     uint32_t l_grans;
     p9_ADU_oper_flag l_myAduFlag;
-- 
cgit v1.2.3