[Skiboot] [PATCH v5 08/27] hdata: endian conversions

[Nicholas Piggin]

Signed-off-by: Nicholas Piggin <npiggin at gmail.com>
---
 hdata/memory.c | 3 ++-
 hdata/spira.c  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hdata/memory.c b/hdata/memory.c
index 9af7ae71d..9e5e99b9c 100644
--- a/hdata/memory.c
+++ b/hdata/memory.c
@@ -135,7 +135,8 @@ static bool add_address_range(struct dt_node *root,
 	      "on Chip 0x%x mattr: 0x%x pattr: 0x%x status:0x%x\n",
 	      (long long)be64_to_cpu(arange->start),
 	      (long long)be64_to_cpu(arange->end),
-	      chip_id, arange->mirror_attr, mem_type, mem_status);
+	      chip_id, be32_to_cpu(arange->mirror_attr),
+	      mem_type, mem_status);
 
 	/* reg contains start and length */
 	reg[0] = cleanup_addr(be64_to_cpu(arange->start));
diff --git a/hdata/spira.c b/hdata/spira.c
index f1ce25dff..661349fed 100644
--- a/hdata/spira.c
+++ b/hdata/spira.c
@@ -952,7 +952,7 @@ static void dt_init_secureboot_node(const struct iplparams_sysparams *sysparams)
 
 static void opal_dump_add_mpipl_boot(const struct iplparams_iplparams *p)
 {
-	u32 mdrt_cnt = spira.ntuples.mdump_res.act_cnt;
+	u32 mdrt_cnt = be16_to_cpu(spira.ntuples.mdump_res.act_cnt);
 	u32 mdrt_max_cnt = MDRT_TABLE_SIZE / sizeof(struct mdrt_table);
 	struct dt_node *dump_node;
 
@@ -975,7 +975,7 @@ static void opal_dump_add_mpipl_boot(const struct iplparams_iplparams *p)
 		return;
 	}
 
-	if (p->cec_ipl_attrib != IPLPARAMS_ATTRIB_MEM_PRESERVE) {
+	if (be16_to_cpu(p->cec_ipl_attrib) != IPLPARAMS_ATTRIB_MEM_PRESERVE) {
 		prlog(PR_DEBUG, "DUMP: Memory not preserved\n");
 		return;
 	}
@@ -1663,7 +1663,7 @@ static void add_npus(void)
 static void fixup_spira(void)
 {
 #if !defined(TEST)
-	spiras = (struct spiras *)CPU_TO_BE64(SPIRA_HEAP_BASE);
+	spiras = (struct spiras *)SPIRA_HEAP_BASE;
 #endif
 
 	/* Validate SPIRA-S signature */
-- 
2.23.0