diff options
| author | Michael Neuling <mikey@neuling.org> | 2016-05-02 15:26:20 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-05-10 16:04:51 +1000 |
| commit | 3ff350343a67cd1897f37684613468a5f849ac1b (patch) | |
| tree | e3155d50f049b8905b8a2386404a6fe6a5e8411c | |
| parent | 4e62374cd3a124b792e3e1befbeaadc0985e4df3 (diff) | |
| download | skiboot-3ff350343a67cd1897f37684613468a5f849ac1b.zip skiboot-3ff350343a67cd1897f37684613468a5f849ac1b.tar.gz skiboot-3ff350343a67cd1897f37684613468a5f849ac1b.tar.bz2 | |
Abstract HILE and attn enable bit definitions for HID0
Abstract HILE and attn enable bits definitions for HID0 in case these
locations randomly change in future chip revisions.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | core/cpu.c | 14 | ||||
| -rw-r--r-- | include/processor.h | 4 |
2 files changed, 12 insertions, 6 deletions
@@ -47,6 +47,8 @@ unsigned int cpu_max_pir; struct cpu_thread *boot_cpu; static struct lock reinit_lock = LOCK_UNLOCKED; static bool hile_supported; +static unsigned long hid0_hile; +static unsigned long hid0_attn; unsigned long cpu_secondary_start __force_data = 0; @@ -404,7 +406,7 @@ static void enable_attn(void) unsigned long hid0; hid0 = mfspr(SPR_HID0); - hid0 |= SPR_HID0_ENABLE_ATTN; + hid0 |= hid0_hile; set_hid0(hid0); } @@ -413,7 +415,7 @@ static void disable_attn(void) unsigned long hid0; hid0 = mfspr(SPR_HID0); - hid0 &= ~SPR_HID0_ENABLE_ATTN; + hid0 &= ~hid0_hile; set_hid0(hid0); } @@ -454,10 +456,14 @@ void init_boot_cpu(void) case PVR_TYPE_P8: proc_gen = proc_gen_p8; hile_supported = PVR_VERS_MAJ(mfspr(SPR_PVR)) >= 2; + hid0_hile = SPR_HID0_POWER8_HILE; + hid0_attn = SPR_HID0_POWER8_ENABLE_ATTN; break; case PVR_TYPE_P8NVL: proc_gen = proc_gen_p8; hile_supported = true; + hid0_hile = SPR_HID0_POWER8_HILE; + hid0_attn = SPR_HID0_POWER8_ENABLE_ATTN; break; default: proc_gen = proc_gen_unknown; @@ -713,9 +719,9 @@ static void cpu_change_hile(void *hilep) hid0 = mfspr(SPR_HID0); if (hile) - hid0 |= SPR_HID0_HILE; + hid0 |= hid0_hile; else - hid0 &= ~SPR_HID0_HILE; + hid0 &= ~hid0_hile; prlog(PR_DEBUG, "CPU: [%08x] HID0 set to 0x%016lx\n", this_cpu()->pir, hid0); set_hid0(hid0); diff --git a/include/processor.h b/include/processor.h index 7fa5377..e05c4bb 100644 --- a/include/processor.h +++ b/include/processor.h @@ -161,8 +161,8 @@ /* Bits in HID0 */ #define SPR_HID0_POWER8_4LPARMODE PPC_BIT(2) #define SPR_HID0_POWER8_2LPARMODE PPC_BIT(6) -#define SPR_HID0_HILE PPC_BIT(19) -#define SPR_HID0_ENABLE_ATTN PPC_BIT(31) +#define SPR_HID0_POWER8_HILE PPC_BIT(19) +#define SPR_HID0_POWER8_ENABLE_ATTN PPC_BIT(31) /* PVR bits */ #define SPR_PVR_TYPE 0xffff0000 |