[Skiboot] [PATCH 09/10] sparse: hdata/spira sw_xstop_fir_bitpos is uint8_t, has no endian

Stewart Smith stewart at linux.ibm.com
Thu Jul 18 16:51:16 AEST 2019


hdata/spira.c:625:33: warning: incorrect type in argument 1 (different base types)
hdata/spira.c:625:33:    expected restricted beint32_t [usertype] be_val
hdata/spira.c:625:33:    got unsigned char [usertype] fir_bit
hdata/spira.c:625:33: warning: incorrect type in argument 1 (different base types)
hdata/spira.c:625:33:    expected restricted beint32_t [usertype] be_val
hdata/spira.c:625:33:    got unsigned char [usertype] fir_bit

Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
 hdata/spira.c            | 4 ++--
 hdata/test/op920.wsp.dts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hdata/spira.c b/hdata/spira.c
index 945cc7e8c50f..dad779fa223d 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -619,13 +619,13 @@ static bool add_xscom_sppcrd(uint64_t xscom_base)
 		if ((csize >= (offsetof(struct sppcrd_chip_info,
 					sw_xstop_fir_bitpos) + 1)) &&
 						cinfo->sw_xstop_fir_scom) {
-			__be32 fir_bit = cinfo->sw_xstop_fir_bitpos;
+			uint8_t fir_bit = cinfo->sw_xstop_fir_bitpos;
 
 			if (!dt_find_property(dt_root, "ibm,sw-checkstop-fir"))
 				dt_add_property_cells(dt_root,
 					"ibm,sw-checkstop-fir",
 					be32_to_cpu(cinfo->sw_xstop_fir_scom),
-					be32_to_cpu(fir_bit));
+					fir_bit);
 		}
 	}
 
diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts
index fbc5a39c8a53..b9aa0f204b3c 100644
--- a/hdata/test/op920.wsp.dts
+++ b/hdata/test/op920.wsp.dts
@@ -8,7 +8,7 @@
 	ibm,io-base-loc-code = "UOPWR.7887E6A-Node0";
 	nest-frequency = <0x0 0x77359400>;
 	vendor = "IBM";
-	ibm,sw-checkstop-fir = <0x5012000 0x1f000000>;
+	ibm,sw-checkstop-fir = <0x5012000 0x1f>;
 	model = "8335-GTH";
 	system-id = "7887E6A";
 	model-name = "ibm,witherspoon";
-- 
2.21.0



More information about the Skiboot mailing list