From 7721ff79aff1e4774ec0630d98f397dd303933a8 Mon Sep 17 00:00:00 2001 From: Prasad Bg Ranganath Date: Sun, 12 Jun 2016 22:46:44 -0500 Subject: New rings and obus0,1,2,3 support in ringId file Modified p9_ringId.C and p9_ring_identification.H for accommudating new rings support Change-Id: I235f175e4a015aa91b366e752a93faa22cbe5131 Original-Change-Id: I5a43ddf01c7377327b6d13c3bde5191458cf96d7 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25695 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Claus M. Olsen Reviewed-by: Joseph E. Dery Reviewed-by: Martin Peschke Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30245 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/import/chips/p9/utils/imageProcs/p9_ringId.C | 232 +++++++++++++++-------- 1 file changed, 157 insertions(+), 75 deletions(-) (limited to 'src/import/chips/p9/utils/imageProcs/p9_ringId.C') diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 66249918..8be00a0b 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -37,17 +37,22 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"occ_time" , 0x05, 0x01, 0x01, "occ_time_ring" , NON_VPD_RING, 0, 0x0100000000000100}, {"perv_ana_func" , 0x06, 0x01, 0x01, "perv_ana_func_ring" , NON_VPD_RING, 0, 0x0080000000008000}, {"perv_ana_gptr" , 0x07, 0x01, 0x01, "perv_ana_gptr_ring" , NON_VPD_RING, 0, 0x0080000000002000}, - {"perv_pll_gptr" , 0x08, 0x01, 0x01, "perv_pll_gptr_ring" , NON_VPD_PLL_RING, 0, 0x0002000000002000}, + {"perv_pll_gptr" , 0x08, 0x01, 0x01, "perv_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, {"perv_pll_bndy_bucket_1" , 0x09, 0x01, 0x01, "perv_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_bndy_bucket_2" , 0x0a, 0x01, 0x01, "perv_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_bndy_bucket_3" , 0x0b, 0x01, 0x01, "perv_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_bndy_bucket_4" , 0x0c, 0x01, 0x01, "perv_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, {"perv_pll_bndy_bucket_5" , 0x0d, 0x01, 0x01, "perv_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"perv_pll_func" , 0x0e, 0x01, 0x01, "perv_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, + {"perv_pibnet_gptr" , 0x0f, 0x01, 0x01, "perv_pibnet_gptr_ring" , NON_VPD_RING, 0, 0x0600000000002000}, + {"perv_pibnet_time" , 0x10, 0x01, 0x01, "perv_pibnet_time_ring" , NON_VPD_RING, 0, 0x0600000000000100}, + }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"perv_repr" , 0x0f, 0x01, 0x01, "perv_repr_ring" , NON_VPD_RING, 0, 0x0800000000000200}, - {"occ_repr" , 0x10, 0x01, 0x01, "occ_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, + {"perv_repr" , 0x11, 0x01, 0x01, "perv_repr_ring" , NON_VPD_RING, 0, 0x0800000000000200}, + {"occ_repr" , 0x12, 0x01, 0x01, "occ_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, + {"perv_pibnet_repr" , 0x13, 0x01, 0x01, "perv_pibnet_repr_ring" , NON_VPD_RING, 0, 0x0600000000000200}, }; }; namespace N0 @@ -67,8 +72,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] = const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"n0_repr" , 0x09, 0x02, 0x02, "n0_repr_ring" , NON_VPD_RING, 0, 0x09C0000000000200}, - {"n0_nx_repr" , 0x0A, 0x02, 0x02, "n0_nx_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, - {"n0_cxa0_repr" , 0x0B, 0x02, 0x02, "n0_cxa0_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, + {"n0_nx_repr" , 0x0a, 0x02, 0x02, "n0_nx_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, + {"n0_cxa0_repr" , 0x0b, 0x02, 0x02, "n0_cxa0_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, }; }; namespace N1 @@ -85,15 +90,15 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"n1_ioo1_gptr" , 0x07, 0x03, 0x03, "n1_ioo1_gptr_ring" , NON_VPD_RING, 0, 0x0080000000002000}, {"n1_ioo1_time" , 0x08, 0x03, 0x03, "n1_ioo1_time_ring" , NON_VPD_RING, 0, 0x0080000000000100}, {"n1_mcs23_fure" , 0x09, 0x03, 0x03, "n1_mcs23_fure_ring" , NON_VPD_RING, 0, 0x0040000000009000}, - {"n1_mcs23_gptr" , 0x0A, 0x03, 0x03, "n1_mcs23_gptr_ring" , NON_VPD_RING, 0, 0x0040000000002000}, - {"n1_mcs23_time" , 0x0B, 0x03, 0x03, "n1_mcs23_time_ring" , NON_VPD_RING, 0, 0x0040000000000100}, + {"n1_mcs23_gptr" , 0x0a, 0x03, 0x03, "n1_mcs23_gptr_ring" , NON_VPD_RING, 0, 0x0040000000002000}, + {"n1_mcs23_time" , 0x0b, 0x03, 0x03, "n1_mcs23_time_ring" , NON_VPD_RING, 0, 0x0040000000000100}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"n1_repr" , 0x0C, 0x03, 0x03, "n1_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, - {"n1_ioo0_repr" , 0x0D, 0x03, 0x03, "n1_ioo0_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, - {"n1_ioo1_repr" , 0x0E, 0x03, 0x03, "n1_ioo1_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, - {"n1_mcs23_repr" , 0x0F, 0x03, 0x03, "n1_mcs23_repr_ring" , NON_VPD_RING, 0, 0x0040000000000200}, + {"n1_repr" , 0x0c, 0x03, 0x03, "n1_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, + {"n1_ioo0_repr" , 0x0d, 0x03, 0x03, "n1_ioo0_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, + {"n1_ioo1_repr" , 0x0e, 0x03, 0x03, "n1_ioo1_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, + {"n1_mcs23_repr" , 0x0f, 0x03, 0x03, "n1_mcs23_repr_ring" , NON_VPD_RING, 0, 0x0040000000000200}, }; }; namespace N2 @@ -106,11 +111,15 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"n2_cxa1_fure" , 0x03, 0x04, 0x04, "n2_cxa1_fure_ring" , NON_VPD_RING, 0, 0x0400000000009000}, {"n2_cxa1_gptr" , 0x04, 0x04, 0x04, "n2_cxa1_gptr_ring" , NON_VPD_RING, 0, 0x0400000000002000}, {"n2_cxa1_time" , 0x05, 0x04, 0x04, "n2_cxa1_time_ring" , NON_VPD_RING, 0, 0x0400000000000100}, + {"n2_psi_fure" , 0x06, 0x04, 0x04, "n2_psi_fure_ring" , NON_VPD_RING, 0, 0x0400000000009000}, + {"n2_psi_gptr" , 0x07, 0x04, 0x04, "n2_psi_gptr_ring" , NON_VPD_RING, 0, 0x0400000000002000}, + {"n2_psi_time" , 0x08, 0x04, 0x04, "n2_psi_time_ring" , NON_VPD_RING, 0, 0x0400000000000100}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"n2_repr" , 0x06, 0x04, 0x04, "n2_repr_ring" , NON_VPD_RING, 0, 0x0BC0000000000200}, - {"n2_cxa1_repr" , 0x07, 0x04, 0x04, "n2_cxa1_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, + {"n2_repr" , 0x09, 0x04, 0x04, "n2_repr_ring" , NON_VPD_RING, 0, 0x0BC0000000000200}, + {"n2_cxa1_repr" , 0x0a, 0x04, 0x04, "n2_cxa1_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, + {"n2_psi_repr" , 0x0b, 0x04, 0x04, "n2_cxa1_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, }; }; namespace N3 @@ -123,11 +132,15 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"n3_mcs01_fure" , 0x03, 0x05, 0x05, "n3_mcs01_fure_ring" , NON_VPD_RING, 0, 0x0020000000009000}, {"n3_mcs01_gptr" , 0x04, 0x05, 0x05, "n3_mcs01_gptr_ring" , NON_VPD_RING, 0, 0x0020000000002000}, {"n3_mcs01_time" , 0x05, 0x05, 0x05, "n3_mcs01_time_ring" , NON_VPD_RING, 0, 0x0020000000000100}, + {"n3_np_fure" , 0x06, 0x05, 0x05, "n3_np_fure_ring" , NON_VPD_RING, 0, 0x0100000000009000}, + {"n3_np_gptr" , 0x07, 0x05, 0x05, "n3_np_gptr_ring" , NON_VPD_RING, 0, 0x0100000000002000}, + {"n3_np_time" , 0x08, 0x05, 0x05, "n3_np_time_ring" , NON_VPD_RING, 0, 0x0100000000000100}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"n3_repr" , 0x06, 0x05, 0x05, "n3_repr_ring" , NON_VPD_RING, 0, 0x0EC0000000000200}, - {"n3_mcs01_repr" , 0x07, 0x05, 0x05, "n3_mcs01_repr-ring" , NON_VPD_RING, 0, 0x0020000000000200}, + {"n3_repr" , 0x09, 0x05, 0x05, "n3_repr_ring" , NON_VPD_RING, 0, 0x0EC0000000000200}, + {"n3_mcs01_repr" , 0x0a, 0x05, 0x05, "n3_mcs01_repr_ring" , NON_VPD_RING, 0, 0x0020000000000200}, + {"n3_np_repr" , 0x0b, 0x05, 0x05, "n3_np_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, }; }; namespace XB @@ -144,15 +157,15 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"xb_io1_gptr" , 0x07, 0x06, 0x06, "xb_io1_gptr_ring" , NON_VPD_RING, 0, 0x0220000000002000}, {"xb_io1_time" , 0x08, 0x06, 0x06, "xb_io1_time_ring" , NON_VPD_RING, 0, 0x0220000000000100}, {"xb_io2_fure" , 0x09, 0x06, 0x06, "xb_io2_fure_ring" , NON_VPD_RING, 0, 0x0110000000009000}, - {"xb_io2_gptr" , 0x0A, 0x06, 0x06, "xb_io2_gptr_ring" , NON_VPD_RING, 0, 0x0110000000002000}, - {"xb_io2_time" , 0x0B, 0x06, 0x06, "xb_io2_time_ring" , NON_VPD_RING, 0, 0x0110000000000100}, - {"xb_pll_gptr" , 0x0C, 0x06, 0x06, "xb_pll_gptr_ring" , NON_VPD_PLL_RING, 0, 0x0002000000002000}, - {"xb_pll_other" , 0x0D, 0x06, 0x06, "xb_pll_other_ring" , NON_VPD_PLL_RING, 0, 0x0002000000005F70}, - {"xb_pll_bndy_bucket_1" , 0x0E, 0x06, 0x06, "xb_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"xb_pll_bndy_bucket_2" , 0x0F, 0x06, 0x06, "xb_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"xb_pll_bndy_bucket_3" , 0x10, 0x06, 0x06, "xb_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"xb_pll_bndy_bucket_4" , 0x11, 0x06, 0x06, "xb_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"xb_pll_bndy_bucket_5" , 0x12, 0x06, 0x06, "xb_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_io2_gptr" , 0x0a, 0x06, 0x06, "xb_io2_gptr_ring" , NON_VPD_RING, 0, 0x0110000000002000}, + {"xb_io2_time" , 0x0b, 0x06, 0x06, "xb_io2_time_ring" , NON_VPD_RING, 0, 0x0110000000000100}, + {"xb_pll_gptr" , 0x0c, 0x06, 0x06, "xb_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"xb_pll_bndy_bucket_1" , 0x0d, 0x06, 0x06, "xb_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_pll_bndy_bucket_2" , 0x0e, 0x06, 0x06, "xb_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_pll_bndy_bucket_3" , 0x0f, 0x06, 0x06, "xb_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_pll_bndy_bucket_4" , 0x10, 0x06, 0x06, "xb_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_pll_bndy_bucket_5" , 0x11, 0x06, 0x06, "xb_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"xb_pll_func" , 0x12, 0x06, 0x06, "xb_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { @@ -175,13 +188,13 @@ const GenRingIdList RING_ID_LIST_COMMON[] = {"mc_iom23_fure" , 0x06, 0x07, 0x07, "mc_iom23_fure_ring" , NON_VPD_RING, 0, 0x0100000000009000}, {"mc_iom23_gptr" , 0x07, 0x07, 0x07, "mc_iom23_gptr_ring" , NON_VPD_RING, 0, 0x0100000000002000}, {"mc_iom23_time" , 0x08, 0x07, 0x07, "mc_iom23_time_ring" , NON_VPD_RING, 0, 0x0100000000000100}, - {"mc_pll_gptr" , 0x09, 0x07, 0x07, "mc_pll_gptr_ring" , NON_VPD_PLL_RING, 0, 0x0002000000002000}, - {"mc_pll_other" , 0x0A, 0x07, 0x07, "mc_pll_other_ring" , NON_VPD_PLL_RING, 0, 0x0002000000005F70}, - {"mc_pll_bndy_bucket_1" , 0x0B, 0x07, 0x07, "mc_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"mc_pll_bndy_bucket_2" , 0x0C, 0x07, 0x07, "mc_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"mc_pll_bndy_bucket_3" , 0x0D, 0x07, 0x07, "mc_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"mc_pll_bndy_bucket_4" , 0x0E, 0x07, 0x07, "mc_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, - {"mc_pll_bndy_bucket_5" , 0x0F, 0x07, 0x07, "mc_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 5, 0x0002000000000080}, + {"mc_pll_gptr" , 0x09, 0x07, 0x07, "mc_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"mc_pll_bndy_bucket_1" , 0x0a, 0x07, 0x07, "mc_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"mc_pll_bndy_bucket_2" , 0x0b, 0x07, 0x07, "mc_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"mc_pll_bndy_bucket_3" , 0x0c, 0x07, 0x07, "mc_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"mc_pll_bndy_bucket_4" , 0x0d, 0x07, 0x07, "mc_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"mc_pll_bndy_bucket_5" , 0x0e, 0x07, 0x07, "mc_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"mc_pll_func" , 0x0f, 0x07, 0x07, "mc_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { @@ -190,63 +203,129 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"mc_iom23_repr" , 0x12, 0x07, 0x08, "mc_iom23_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, }; }; -namespace OB +namespace OB0 +{ +const GenRingIdList RING_ID_LIST_COMMON[] = +{ + {"ob0_fure" , 0x00, 0x09, 0x09, "ob0_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, + {"ob0_gptr" , 0x01, 0x09, 0x09, "ob0_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, + {"ob0_time" , 0x02, 0x09, 0x09, "ob0_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"ob0_pll_gptr" , 0x03, 0x09, 0x09, "ob0_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"ob0_pll_bndy_bucket_1" , 0x04, 0x09, 0x09, "ob0_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob0_pll_bndy_bucket_2" , 0x05, 0x09, 0x09, "ob0_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob0_pll_bndy_bucket_3" , 0x06, 0x09, 0x09, "ob0_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob0_pll_bndy_bucket_4" , 0x07, 0x09, 0x09, "ob0_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob0_pll_bndy_bucket_5" , 0x08, 0x09, 0x09, "ob0_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob0_pll_func" , 0x09, 0x09, 0x09, "ob0_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, +}; +const GenRingIdList RING_ID_LIST_INSTANCE[] = +{ + {"ob0_repr" , 0x0a, 0x09, 0x09, "ob0_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, +}; +}; +namespace OB1 +{ +const GenRingIdList RING_ID_LIST_COMMON[] = +{ + {"ob1_fure" , 0x00, 0x0a, 0x0a, "ob1_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, + {"ob1_gptr" , 0x01, 0x0a, 0x0a, "ob1_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, + {"ob1_time" , 0x02, 0x0a, 0x0a, "ob1_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"ob1_pll_gptr" , 0x03, 0x0a, 0x0a, "ob1_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"ob1_pll_bndy_bucket_1" , 0x04, 0x0a, 0x0a, "ob1_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob1_pll_bndy_bucket_2" , 0x05, 0x0a, 0x0a, "ob1_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob1_pll_bndy_bucket_3" , 0x06, 0x0a, 0x0a, "ob1_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob1_pll_bndy_bucket_4" , 0x07, 0x0a, 0x0a, "ob1_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob1_pll_bndy_bucket_5" , 0x08, 0x0a, 0x0a, "ob1_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob1_pll_func" , 0x09, 0x0a, 0x0a, "ob1_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, +}; +const GenRingIdList RING_ID_LIST_INSTANCE[] = +{ + {"ob1_repr" , 0x0a, 0x0a, 0x0a, "ob1_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, +}; +}; +namespace OB2 +{ +const GenRingIdList RING_ID_LIST_COMMON[] = +{ + {"ob2_fure" , 0x00, 0x0b, 0x0b, "ob2_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, + {"ob2_gptr" , 0x01, 0x0b, 0x0b, "ob2_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, + {"ob2_time" , 0x02, 0x0b, 0x0b, "ob2_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"ob2_pll_gptr" , 0x03, 0x0b, 0x0b, "ob2_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"ob2_pll_bndy_bucket_1" , 0x04, 0x0b, 0x0b, "ob2_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob2_pll_bndy_bucket_2" , 0x05, 0x0b, 0x0b, "ob2_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob2_pll_bndy_bucket_3" , 0x06, 0x0b, 0x0b, "ob2_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob2_pll_bndy_bucket_4" , 0x07, 0x0b, 0x0b, "ob2_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob2_pll_bndy_bucket_5" , 0x08, 0x0b, 0x0b, "ob2_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"ob2_pll_func" , 0x09, 0x0b, 0x0b, "ob2_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, +}; +const GenRingIdList RING_ID_LIST_INSTANCE[] = +{ + {"ob2_repr" , 0x0a, 0x0b, 0x0b, "ob2_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, +}; +}; +namespace OB3 { const GenRingIdList RING_ID_LIST_COMMON[] = { - {"ob_fure" , 0x00, 0x09, 0x09, "ob_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, - {"ob_gptr" , 0x01, 0x09, 0x09, "ob_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, - {"ob_time" , 0x02, 0x09, 0x09, "ob_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, - {"ob_pll_gptr" , 0x03, 0x09, 0x09, "ob_pll_gptr_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, - {"ob_pll_other" , 0x04, 0x09, 0x09, "ob_pll_other_ring" , NON_VPD_PLL_RING, 0, 0x0002000000005F70}, - {"ob_pll_bndy_bucket_1" , 0x05, 0x09, 0x09, "ob_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, - {"ob_pll_bndy_bucket_2" , 0x06, 0x09, 0x09, "ob_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, - {"ob_pll_bndy_bucket_3" , 0x07, 0x09, 0x09, "ob_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, - {"ob_pll_bndy_bucket_4" , 0x08, 0x09, 0x09, "ob_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, - {"ob_pll_bndy_bucket_5" , 0x09, 0x09, 0x09, "ob_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_fure" , 0x00, 0x0c, 0x0c, "ob3_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, + {"ob3_gptr" , 0x01, 0x0c, 0x0c, "ob3_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, + {"ob3_time" , 0x02, 0x0c, 0x0c, "ob3_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"ob3_pll_gptr" , 0x03, 0x0c, 0x0c, "ob3_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"ob3_pll_bndy_bucket_1" , 0x04, 0x0c, 0x0c, "ob3_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_pll_bndy_bucket_2" , 0x05, 0x0c, 0x0c, "ob3_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_pll_bndy_bucket_3" , 0x06, 0x0c, 0x0c, "ob3_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_pll_bndy_bucket_4" , 0x07, 0x0c, 0x0c, "ob3_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_pll_bndy_bucket_5" , 0x08, 0x0c, 0x0c, "ob3_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0, 0x0002000000008000}, + {"ob3_pll_func" , 0x09, 0x0c, 0x0c, "ob3_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"ob_repr" , 0x0a, 0x09, 0x0C, "ob_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, + {"ob3_repr" , 0x0a, 0x0c, 0x0c, "ob3_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; }; namespace PCI0 { const GenRingIdList RING_ID_LIST_COMMON[] = { - {"pci0_fure" , 0x00, 0x0D, 0x0D, "pci0_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, - {"pci0_gptr" , 0x01, 0x0D, 0x0D, "pci0_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, - {"pci0_time" , 0x02, 0x0D, 0x0D, "pci0_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"pci0_fure" , 0x00, 0x0d, 0x0d, "pci0_fure_ring" , NON_VPD_RING, 0, 0x0E00000000009000}, + {"pci0_gptr" , 0x01, 0x0d, 0x0d, "pci0_gptr_ring" , NON_VPD_RING, 0, 0x0E00000000002000}, + {"pci0_time" , 0x02, 0x0d, 0x0d, "pci0_time_ring" , NON_VPD_RING, 0, 0x0E00000000000100}, + {"pci0_pll_func" , 0x03, 0x0d, 0x0d, "pci0_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, + {"pci0_pll_gptr" , 0x04, 0x0d, 0x0d, "pci0_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"pci0_repr" , 0x03, 0x0D, 0x0D, "pci0_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, + {"pci0_repr" , 0x05, 0x0d, 0x0d, "pci0_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; }; namespace PCI1 { const GenRingIdList RING_ID_LIST_COMMON[] = { - {"pci1_fure" , 0x00, 0x0E, 0x0E, "pci1_fure_ring" , NON_VPD_RING, 0, 0x0F00000000009000}, - {"pci1_gptr" , 0x01, 0x0E, 0x0E, "pci1_gptr_ring" , NON_VPD_RING, 0, 0x0F00000000002000}, - {"pci1_time" , 0x02, 0x0E, 0x0E, "pci1_time_ring" , NON_VPD_RING, 0, 0x0F00000000000100}, + {"pci1_fure" , 0x00, 0x0e, 0x0e, "pci1_fure_ring" , NON_VPD_RING, 0, 0x0F00000000009000}, + {"pci1_gptr" , 0x01, 0x0e, 0x0e, "pci1_gptr_ring" , NON_VPD_RING, 0, 0x0F00000000002000}, + {"pci1_time" , 0x02, 0x0e, 0x0e, "pci1_time_ring" , NON_VPD_RING, 0, 0x0F00000000000100}, + {"pci1_pll_func" , 0x03, 0x0e, 0x0e, "pci1_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, + {"pci1_pll_gptr" , 0x04, 0x0e, 0x0e, "pci1_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"pci1_repr" , 0x03, 0x0E, 0x0E, "pci1_repr_ring" , NON_VPD_RING, 0, 0x0F00000000000200}, + {"pci1_repr" , 0x05, 0x0e, 0x0e, "pci1_repr_ring" , NON_VPD_RING, 0, 0x0F00000000000200}, }; }; namespace PCI2 { const GenRingIdList RING_ID_LIST_COMMON[] = { - {"pci2_fure" , 0x00, 0x0F, 0x0F, "pci2_fure_ring" , NON_VPD_RING, 0, 0x0F80000000009000}, - {"pci2_gptr" , 0x01, 0x0F, 0x0F, "pci2_gptr_ring" , NON_VPD_RING, 0, 0x0F80000000002000}, - {"pci2_time" , 0x02, 0x0F, 0x0F, "pci2_time_ring" , NON_VPD_RING, 0, 0x0F80000000000100}, + {"pci2_fure" , 0x00, 0x0f, 0x0f, "pci2_fure_ring" , NON_VPD_RING, 0, 0x0F80000000009000}, + {"pci2_gptr" , 0x01, 0x0f, 0x0f, "pci2_gptr_ring" , NON_VPD_RING, 0, 0x0F80000000002000}, + {"pci2_time" , 0x02, 0x0f, 0x0f, "pci2_time_ring" , NON_VPD_RING, 0, 0x0F80000000000100}, + {"pci2_pll_func" , 0x03, 0x0f, 0x0f, "pci2_pll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, + {"pci2_pll_gptr" , 0x04, 0x0f, 0x0f, "pci2_pll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"pci2_repr" , 0x03, 0x0F, 0x0F, "pci2_repr_ring" , NON_VPD_RING, 0, 0x0F80000000000200}, + {"pci2_repr" , 0x05, 0x0F, 0x0F, "pci2_repr_ring" , NON_VPD_RING, 0, 0x0F80000000000200}, }; }; namespace EQ @@ -254,31 +333,34 @@ namespace EQ const GenRingIdList RING_ID_LIST_COMMON[] = { {"eq_fure" , 0x00, 0x10, 0x10, "eq_fure_ring" , NON_VPD_RING, 0, 0x0C10000000009000}, - {"eq_gptr" , 0x01, 0x10, 0x10, "eq_gptr_ring" , NON_VPD_RING, 0, 0x0C10000000004000}, + {"eq_gptr" , 0x01, 0x10, 0x10, "eq_gptr_ring" , NON_VPD_RING, 0, 0x0C10000000002000}, {"eq_time" , 0x02, 0x10, 0x10, "eq_time_ring" , NON_VPD_RING, 0, 0x0C10000000000100}, - {"ex_l3_fure" , 0x03, 0x10, 0x10, "ex_l3_fure_ring" , NON_VPD_RING, 0, 0x0200000000009000}, - {"ex_l3_gptr" , 0x04, 0x10, 0x10, "ex_l3_gptr_ring" , NON_VPD_RING, 0, 0x0200000000004000}, - {"ex_l3_time" , 0x05, 0x10, 0x10, "ex_l3_time_ring" , NON_VPD_RING, 0, 0x0200000000000100}, - {"ex_l2_fure" , 0x06, 0x10, 0x10, "ex_l2_fure_ring" , NON_VPD_RING, 0, 0x0080000000009000}, - {"ex_l2_gptr" , 0x07, 0x10, 0x10, "ex_l2_gptr_ring" , NON_VPD_RING, 0, 0x0080000000004000}, - {"ex_l2_time" , 0x08, 0x10, 0x10, "ex_l2_time_ring" , NON_VPD_RING, 0, 0x0080000000000100}, - {"ex_l3_refr_fure" , 0x09, 0x10, 0x10, "ex_l3_refr_fure_ring" , NON_VPD_RING, 0, 0x0008000000009000}, - {"ex_l3_refr_gptr" , 0x0A, 0x10, 0x10, "ex_l3_refr_gptr_ring" , NON_VPD_RING, 0, 0x0008000000004000}, - {"ex_l3_refr_time" , 0x0B, 0x10, 0x10, "ex_l3_refr_time_ring" , NON_VPD_RING, 0, 0x0008000000000100}, - {"eq_ana_func" , 0x0C, 0x10, 0x10, "eq_ana_func_ring" , NON_VPD_RING, 0, 0x002000000000C000}, - {"eq_ana_gptr" , 0x0D, 0x10, 0x10, "eq_ana_gptr_ring" , NON_VPD_RING, 0, 0x0020000000002000}, - {"eq_dpll_func" , 0x0E, 0x10, 0x10, "eq_dpll_func_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, - {"eq_dpll_gptr" , 0x13, 0x10, 0x10, "eq_dpll_gptr_ring" , NON_VPD_PLL_RING, 0, 0x0002000000002000}, - {"eq_dpll_other" , 0x14, 0x10, 0x10, "eq_dpll_other_ring" , NON_VPD_PLL_RING, 0, 0x0002000000005F70}, - {"eq_ana_bndy" , 0x15, 0x10, 0x10, "eq_ana_bndy_ring" , NON_VPD_PLL_RING, 0, 0x0002000000000080}, + {"eq_mode" , 0x03, 0x10, 0x10, "eq_mode_ring" , NON_VPD_RING, 0, 0x0C10000000004000}, + {"ex_l3_fure" , 0x04, 0x10, 0x10, "ex_l3_fure_ring" , NON_VPD_RING, 0, 0x0200000000009000}, + {"ex_l3_gptr" , 0x05, 0x10, 0x10, "ex_l3_gptr_ring" , NON_VPD_RING, 0, 0x0200000000002000}, + {"ex_l3_time" , 0x06, 0x10, 0x10, "ex_l3_time_ring" , NON_VPD_RING, 0, 0x0200000000000100}, + {"ex_l2_mode" , 0x07, 0x10, 0x10, "ex_l2_fure_ring" , NON_VPD_RING, 0, 0x0080000000009000}, + {"ex_l2_fure" , 0x08, 0x10, 0x10, "ex_l2_fure_ring" , NON_VPD_RING, 0, 0x0080000000009000}, + {"ex_l2_gptr" , 0x09, 0x10, 0x10, "ex_l2_gptr_ring" , NON_VPD_RING, 0, 0x0080000000002000}, + {"ex_l2_time" , 0x0a, 0x10, 0x10, "ex_l2_time_ring" , NON_VPD_RING, 0, 0x0080000000000100}, + {"ex_l3_refr_fure" , 0x0b, 0x10, 0x10, "ex_l3_refr_fure_ring" , NON_VPD_RING, 0, 0x0008000000009000}, + {"ex_l3_refr_gptr" , 0x0c, 0x10, 0x10, "ex_l3_refr_gptr_ring" , NON_VPD_RING, 0, 0x0008000000002000}, + {"eq_ana_func" , 0x0d, 0x10, 0x10, "eq_ana_func_ring" , NON_VPD_RING, 0, 0x0020000000008000}, + {"eq_ana_gptr" , 0x0e, 0x10, 0x10, "eq_ana_gptr_ring" , NON_VPD_RING, 0, 0x0020000000002000}, + {"eq_dpll_func" , 0x0f, 0x10, 0x10, "eq_dpll_func_ring" , NON_VPD_RING, 0, 0x0002000000008000}, + {"eq_dpll_gptr" , 0x10, 0x10, 0x10, "eq_dpll_gptr_ring" , NON_VPD_RING, 0, 0x0002000000002000}, + {"eq_dpll_mode" , 0x11, 0x10, 0x10, "eq_dpll_mode_ring" , NON_VPD_RING, 0, 0x0002000000004000}, + {"eq_ana_bndy" , 0x12, 0x10, 0x10, "eq_ana_bndy_ring" , NON_VPD_RING, 0, 0x0002000000000080}, + {"eq_ana_mode" , 0x13, 0x10, 0x10, "eq_ana_mode_ring" , NON_VPD_RING, 0, 0x0002000000000080}, }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"eq_repr" , 0x16, 0x10, 0x15, "eq_repr_ring" , NON_VPD_RING, 0, 0x0237516800000512}, - {"ex_l3_repr" , 0x17, 0x10, 0x15, "ex_l3_repr_ring" , NON_VPD_RING, 0, 0x3355443200000512}, - {"ex_l2_repr" , 0x18, 0x10, 0x15, "ex_l2_repr_ring" , NON_VPD_RING, 0, 0x0838860800000512}, - {"ex_l3_refr_repr" , 0x19, 0x10, 0x15, "ex_l3_refr_repr_ring" , NON_VPD_RING, 0, 0x0052428800000512}, + {"eq_repr" , 0x14, 0x10, 0x15, "eq_repr_ring" , NON_VPD_RING, 0, 0x0C10000000000200}, + {"ex_l3_repr" , 0x15, 0x10, 0x15, "ex_l3_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, + {"ex_l2_repr" , 0x16, 0x10, 0x15, "ex_l2_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, + {"ex_l3_refr_repr" , 0x17, 0x10, 0x15, "ex_l3_refr_repr_ring" , NON_VPD_RING, 0, 0x0008000000000200}, + {"ex_l3_refr_time" , 0x18, 0x10, 0x15, "ex_l3_refr_time_ring" , NON_VPD_RING, 0, 0x0008000000000100}, }; }; namespace EC -- cgit v1.2.1