@@ -23,12 +23,12 @@ uint32_t pir_to_chip_id(uint32_t pir)
uint32_t pir_to_core_id(uint32_t pir)
{
- if (proc_gen == proc_gen_p9)
+ if (proc_gen == proc_gen_p9) {
if (this_cpu()->is_fused_core)
return P9_PIRFUSED2NORMALCOREID(pir);
else
return P9_PIR2COREID(pir);
- else if (proc_gen == proc_gen_p8)
+ } else if (proc_gen == proc_gen_p8)
return P8_PIR2COREID(pir);
else
assert(false);
@@ -38,7 +38,7 @@ uint32_t pir_to_thread_id(uint32_t pir)
{
if (proc_gen == proc_gen_p9) {
if (this_cpu()->is_fused_core)
- return P9_PIR2FUSEDTHREADID(pir);
+ return P9_PIRFUSED2NORMALTHREADID(pir);
else
return P9_PIR2THREADID(pir);
} else if (proc_gen == proc_gen_p8)
@@ -98,6 +98,8 @@
(P9_PIR2FUSEDCOREID(pir) << 1) | \
(P9_PIR2FUSEDTHREADID(pir) & 1)
+#define P9_PIRFUSED2NORMALTHREADID(pir) (((pir) >> 1) & 0x3)
+
/* P9 specific ones mostly used by XIVE */
#define P9_PIR2LOCALCPU(pir) ((pir) & 0xff)
#define P9_PIRFROMLOCALCPU(chip, cpu) (((chip) << 8) | (cpu))
@@ -226,6 +228,11 @@ struct proc_chip {
};
extern uint32_t pir_to_chip_id(uint32_t pir);
+
+/*
+ * Note: In P9 fused-core mode, these will return the "normal"
+ * core ID and thread ID (ie, thread ID 0..3)
+ */
extern uint32_t pir_to_core_id(uint32_t pir);
extern uint32_t pir_to_thread_id(uint32_t pir);