From f9daa4d82873a0c3631c9e852bd44e4d7354824f Mon Sep 17 00:00:00 2001 From: Yue Du Date: Fri, 1 Apr 2016 01:06:34 -0500 Subject: SSX initial import and move files from ppe/ duplicate folders to pmlib Change-Id: I1414f8383510893ef5546c3cb9489d0a275b5495 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22728 Tested-by: Jenkins Server Reviewed-by: Douglas R. Gilbert Reviewed-by: Gregory S. Still --- .../chips/p9/common/pmlib/common/libcommonfiles.mk | 3 +- .../chips/p9/common/pmlib/include/occhw_common.h | 4 +- .../p9/common/pmlib/include/occhw_irq_config.h | 6 +- .../include/registers/pba_register_addresses.h | 67 ++++++++++++---------- 4 files changed, 43 insertions(+), 37 deletions(-) (limited to 'import/chips/p9/common') diff --git a/import/chips/p9/common/pmlib/common/libcommonfiles.mk b/import/chips/p9/common/pmlib/common/libcommonfiles.mk index b8028ccf..45a892e5 100644 --- a/import/chips/p9/common/pmlib/common/libcommonfiles.mk +++ b/import/chips/p9/common/pmlib/common/libcommonfiles.mk @@ -45,8 +45,9 @@ C-SOURCES = \ memcpy.c \ memset.c \ rand32.c \ + rand64.c \ string.c \ - sync.c + sync.c S-SOURCES = diff --git a/import/chips/p9/common/pmlib/include/occhw_common.h b/import/chips/p9/common/pmlib/include/occhw_common.h index 05eeaee0..608ca333 100644 --- a/import/chips/p9/common/pmlib/include/occhw_common.h +++ b/import/chips/p9/common/pmlib/include/occhw_common.h @@ -370,11 +370,11 @@ // Macros for fields of PBA_MODECTL //////////////////////////////////// -/// The 64KB OCI HTM marker space is enabled by default at 0x40070000 +/// The 64KB OCI HTM marker space is enabled by default at 0xC0070000 /// /// See the comments for occhw_trace.h -#define PBA_OCI_MARKER_BASE 0x40070000 +#define PBA_OCI_MARKER_BASE 0xC0070000 // SSX Kernel reserved trace addresses, see occhw_trace.h. diff --git a/import/chips/p9/common/pmlib/include/occhw_irq_config.h b/import/chips/p9/common/pmlib/include/occhw_irq_config.h index a9bb3613..69ad6d36 100644 --- a/import/chips/p9/common/pmlib/include/occhw_irq_config.h +++ b/import/chips/p9/common/pmlib/include/occhw_irq_config.h @@ -120,10 +120,10 @@ OCCHW_IRQ_PMC_PCB_INTR_TYPE0_PENDING OCCHW_IRQ_TARGET_ID_NONE \ OCCHW_IRQ_PMC_PCB_INTR_TYPE1_PENDING OCCHW_IRQ_TARGET_ID_GPE2 \ OCCHW_IRQ_PMC_PCB_INTR_TYPE2_PENDING OCCHW_IRQ_TARGET_ID_GPE3 \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE3_PENDING OCCHW_IRQ_TARGET_ID_NONE \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE4_PENDING OCCHW_IRQ_TARGET_ID_NONE \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE3_PENDING OCCHW_IRQ_TARGET_ID_GPE3 \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE4_PENDING OCCHW_IRQ_TARGET_ID_GPE2 \ OCCHW_IRQ_PMC_PCB_INTR_TYPE5_PENDING OCCHW_IRQ_TARGET_ID_NONE \ - OCCHW_IRQ_PMC_PCB_INTR_TYPE6_PENDING OCCHW_IRQ_TARGET_ID_NONE \ + OCCHW_IRQ_PMC_PCB_INTR_TYPE6_PENDING OCCHW_IRQ_TARGET_ID_GPE3 \ OCCHW_IRQ_PMC_PCB_INTR_TYPE7_PENDING OCCHW_IRQ_TARGET_ID_NONE \ OCCHW_IRQ_PMC_O2S_0A_ONGOING OCCHW_IRQ_TARGET_ID_NONE \ OCCHW_IRQ_PMC_O2S_0B_ONGOING OCCHW_IRQ_TARGET_ID_NONE \ diff --git a/import/chips/p9/common/pmlib/include/registers/pba_register_addresses.h b/import/chips/p9/common/pmlib/include/registers/pba_register_addresses.h index 7d430a70..a306f570 100644 --- a/import/chips/p9/common/pmlib/include/registers/pba_register_addresses.h +++ b/import/chips/p9/common/pmlib/include/registers/pba_register_addresses.h @@ -78,40 +78,45 @@ #define PBA_XSHINCN(n) (PBA_XSHINC0 + ((PBA_XSHINC1 - PBA_XSHINC0) * (n))) #define PBA_XSHINC0 0xc0040140 #define PBA_XSHINC1 0xc0040160 -#define PBA_PIB_BASE 0x68000 -#define PBA_FIR 0x00068000 -#define PBA_FIR_AND 0x00068001 -#define PBA_FIR_OR 0x00068002 -#define PBA_FIRMASK 0x00068003 -#define PBA_FIRMASK_AND 0x00068004 -#define PBA_FIRMASK_OR 0x00068005 -#define PBA_FIRACT0 0x00068006 -#define PBA_FIRACT1 0x00068007 -#define PBA_OCCACT 0x0006800a -#define PBA_CFG 0x0006800b -#define PBA_ERRRPT0 0x0006800c -#define PBA_ERRRPT1 0x0006800d -#define PBA_ERRRPT2 0x0006800e + + +// The following are only available via SCOM +// #define PBA_PIB_BASE 0x68000 +#define PBA_PIB_BASE 0x05012840 +#define PBA_FIR PBA_PIB_BASE +#define PBA_FIR_AND (PBA_PIB_BASE + 1) +#define PBA_FIR_OR (PBA_PIB_BASE + 2) +#define PBA_FIRMASK (PBA_PIB_BASE + 3) +#define PBA_FIRMASK_AND (PBA_PIB_BASE + 4) +#define PBA_FIRMASK_OR (PBA_PIB_BASE + 5) +#define PBA_FIRACT0 (PBA_PIB_BASE + 6) +#define PBA_FIRACT1 (PBA_PIB_BASE + 7) +#define PBA_OCCACT (PBA_PIB_BASE + 0xa) +#define PBA_CFG (PBA_PIB_BASE + 0xb) +#define PBA_ERRRPT0 (PBA_PIB_BASE + 0xc) +#define PBA_ERRRPT1 (PBA_PIB_BASE + 0xd) +#define PBA_ERRRPT2 (PBA_PIB_BASE + 0xe) #define PBA_RBUFVALN(n) (PBA_RBUFVAL0 + ((PBA_RBUFVAL1 - PBA_RBUFVAL0) * (n))) -#define PBA_RBUFVAL0 0x00068010 -#define PBA_RBUFVAL1 0x00068011 -#define PBA_RBUFVAL2 0x00068012 -#define PBA_RBUFVAL3 0x00068013 -#define PBA_RBUFVAL4 0x00068014 -#define PBA_RBUFVAL5 0x00068015 +#define PBA_RBUFVAL0 (PBA_PIB_BASE + 0x10) +#define PBA_RBUFVAL1 (PBA_PIB_BASE + 0x11) +#define PBA_RBUFVAL2 (PBA_PIB_BASE + 0x12) +#define PBA_RBUFVAL3 (PBA_PIB_BASE + 0x13) +#define PBA_RBUFVAL4 (PBA_PIB_BASE + 0x14) +#define PBA_RBUFVAL5 (PBA_PIB_BASE + 0x15) #define PBA_WBUFVALN(n) (PBA_WBUFVAL0 + ((PBA_WBUFVAL1 - PBA_WBUFVAL0) * (n))) -#define PBA_WBUFVAL0 0x00068018 -#define PBA_WBUFVAL1 0x00068019 -#define PBA_TRUSTEDPIB_BASE 0x68020 +#define PBA_WBUFVAL0 (PBA_PIB_BASE + 0x18) +#define PBA_WBUFVAL1 (PBA_PIB_BASE + 0x19) +//#define PBA_TRUSTEDPIB_BASE 0x68020 +#define PBA_TRUSTEDPIB_BASE 0x05012B00 #define PBA_BARN(n) (PBA_BAR0 + ((PBA_BAR1 - PBA_BAR0) * (n))) -#define PBA_BAR0 0x00068020 -#define PBA_BAR1 0x00068021 -#define PBA_BAR2 0x00068022 -#define PBA_BAR3 0x00068023 +#define PBA_BAR0 (PBA_TRUSTEDPIB_BASE) +#define PBA_BAR1 (PBA_TRUSTEDPIB_BASE + 1) +#define PBA_BAR2 (PBA_TRUSTEDPIB_BASE + 2) +#define PBA_BAR3 (PBA_TRUSTEDPIB_BASE + 3) #define PBA_BARMSKN(n) (PBA_BARMSK0 + ((PBA_BARMSK1 - PBA_BARMSK0) * (n))) -#define PBA_BARMSK0 0x00068024 -#define PBA_BARMSK1 0x00068025 -#define PBA_BARMSK2 0x00068026 -#define PBA_BARMSK3 0x00068027 +#define PBA_BARMSK0 (PBA_TRUSTEDPIB_BASE + 4) +#define PBA_BARMSK1 (PBA_TRUSTEDPIB_BASE + 5) +#define PBA_BARMSK2 (PBA_TRUSTEDPIB_BASE + 6) +#define PBA_BARMSK3 (PBA_TRUSTEDPIB_BASE + 7) #endif // __PBA_REGISTER_ADDRESSES_H__ -- cgit v1.2.1