From 9f85e40904d8566acf4d022f47aa8a0f836675bc Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Thu, 22 Mar 2018 14:42:19 +0530 Subject: hdata: Move 'HRMOR_BIT' macro to header file Its already defined twice. And soon I want to use in few other place. Lets move it to header file. Signed-off-by: Vasant Hegde Signed-off-by: Stewart Smith --- hdata/memory.c | 2 -- hdata/spira.c | 5 ++--- hdata/spira.h | 6 ++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hdata/memory.c b/hdata/memory.c index 27dc559f..a8389895 100644 --- a/hdata/memory.c +++ b/hdata/memory.c @@ -602,8 +602,6 @@ static struct dt_node *add_hb_reserve_node(const char *name, u64 start, u64 end) return node; } -#define HRMOR_BIT (1ul << 63) - static void get_hb_reserved_mem(struct HDIF_common_hdr *ms_vpd) { const struct msvpd_hb_reserved_mem *hb_resv_mem; diff --git a/hdata/spira.c b/hdata/spira.c index 0724dcc4..19f456a1 100644 --- a/hdata/spira.c +++ b/hdata/spira.c @@ -88,16 +88,15 @@ __section(".cpuctrl.data") struct cpu_ctl_init_data cpu_ctl_init_data = { * To help the FSP distinguishing between TCE tokens and actual physical * addresses, we set the top bit to 1 on physical addresses */ -#define ADDR_TOP_BIT (1ul << 63) __section(".mdst.data") struct dump_mdst_table init_mdst_table[2] = { { - .addr = CPU_TO_BE64(INMEM_CON_START | ADDR_TOP_BIT), + .addr = CPU_TO_BE64(INMEM_CON_START | HRMOR_BIT), .type = CPU_TO_BE32(DUMP_REGION_CONSOLE), .size = CPU_TO_BE32(INMEM_CON_LEN), }, { - .addr = CPU_TO_BE64(HBRT_CON_START | ADDR_TOP_BIT), + .addr = CPU_TO_BE64(HBRT_CON_START | HRMOR_BIT), .type = CPU_TO_BE32(DUMP_REGION_HBRT_LOG), .size = CPU_TO_BE32(HBRT_CON_LEN), }, diff --git a/hdata/spira.h b/hdata/spira.h index 39e0e333..d4731946 100644 --- a/hdata/spira.h +++ b/hdata/spira.h @@ -19,6 +19,12 @@ #include "hdif.h" +/* + * To help the FSP to distinguish between physical address and TCE mapped address. + * Also to help hostboot to distinguish physical and relative address. + */ +#define HRMOR_BIT (1ul << 63) + /* * The SPIRA structure * -- cgit v1.2.1