| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103 |
- --- a/arch/mips/include/asm/octeon/octeon-model.h
- +++ b/arch/mips/include/asm/octeon/octeon-model.h
- @@ -45,6 +45,7 @@
- */
-
- #define OCTEON_FAMILY_MASK 0x00ffff00
- +#define OCTEON_PRID_MASK 0x00ffffff
-
- /* Flag bits in top byte */
- /* Ignores revision in model checks */
- @@ -63,6 +64,46 @@
- #define OM_MATCH_6XXX_FAMILY_MODELS 0x40000000
- /* Match all cnf7XXX Octeon models. */
- #define OM_MATCH_F7XXX_FAMILY_MODELS 0x80000000
- +/* Match all cn7XXX Octeon models. */
- +#define OM_MATCH_7XXX_FAMILY_MODELS 0x10000000
- +#define OM_MATCH_FAMILY_MODELS (OM_MATCH_5XXX_FAMILY_MODELS | \
- + OM_MATCH_6XXX_FAMILY_MODELS | \
- + OM_MATCH_F7XXX_FAMILY_MODELS | \
- + OM_MATCH_7XXX_FAMILY_MODELS)
- +/*
- + * CN7XXX models with new revision encoding
- + */
- +
- +#define OCTEON_CN73XX_PASS1_0 0x000d9700
- +#define OCTEON_CN73XX (OCTEON_CN73XX_PASS1_0 | OM_IGNORE_REVISION)
- +#define OCTEON_CN73XX_PASS1_X (OCTEON_CN73XX_PASS1_0 | \
- + OM_IGNORE_MINOR_REVISION)
- +
- +#define OCTEON_CN70XX_PASS1_0 0x000d9600
- +#define OCTEON_CN70XX_PASS1_1 0x000d9601
- +#define OCTEON_CN70XX_PASS1_2 0x000d9602
- +
- +#define OCTEON_CN70XX_PASS2_0 0x000d9608
- +
- +#define OCTEON_CN70XX (OCTEON_CN70XX_PASS1_0 | OM_IGNORE_REVISION)
- +#define OCTEON_CN70XX_PASS1_X (OCTEON_CN70XX_PASS1_0 | \
- + OM_IGNORE_MINOR_REVISION)
- +#define OCTEON_CN70XX_PASS2_X (OCTEON_CN70XX_PASS2_0 | \
- + OM_IGNORE_MINOR_REVISION)
- +
- +#define OCTEON_CN71XX OCTEON_CN70XX
- +
- +#define OCTEON_CN78XX_PASS1_0 0x000d9500
- +#define OCTEON_CN78XX_PASS1_1 0x000d9501
- +#define OCTEON_CN78XX_PASS2_0 0x000d9508
- +
- +#define OCTEON_CN78XX (OCTEON_CN78XX_PASS1_0 | OM_IGNORE_REVISION)
- +#define OCTEON_CN78XX_PASS1_X (OCTEON_CN78XX_PASS1_0 | \
- + OM_IGNORE_MINOR_REVISION)
- +#define OCTEON_CN78XX_PASS2_X (OCTEON_CN78XX_PASS2_0 | \
- + OM_IGNORE_MINOR_REVISION)
- +
- +#define OCTEON_CN76XX (0x000d9540 | OM_CHECK_SUBMODEL)
-
- /*
- * CNF7XXX models with new revision encoding
- @@ -217,6 +258,10 @@
- #define OCTEON_CN3XXX (OCTEON_CN58XX_PASS1_0 | OM_MATCH_PREVIOUS_MODELS | OM_IGNORE_REVISION)
- #define OCTEON_CN5XXX (OCTEON_CN58XX_PASS1_0 | OM_MATCH_5XXX_FAMILY_MODELS)
- #define OCTEON_CN6XXX (OCTEON_CN63XX_PASS1_0 | OM_MATCH_6XXX_FAMILY_MODELS)
- +#define OCTEON_CNF7XXX (OCTEON_CNF71XX_PASS1_0 | \
- + OM_MATCH_F7XXX_FAMILY_MODELS)
- +#define OCTEON_CN7XXX (OCTEON_CN78XX_PASS1_0 | \
- + OM_MATCH_7XXX_FAMILY_MODELS)
-
- /* These are used to cover entire families of OCTEON processors */
- #define OCTEON_FAM_1 (OCTEON_CN3XXX)
- @@ -288,9 +333,16 @@ static inline uint64_t cvmx_read_csr(uin
- ((((arg_model) & (OM_FLAG_MASK)) == OM_CHECK_SUBMODEL) \
- && __OCTEON_MATCH_MASK__((chip_model), (arg_model), OCTEON_58XX_MODEL_REV_MASK)) || \
- ((((arg_model) & (OM_MATCH_5XXX_FAMILY_MODELS)) == OM_MATCH_5XXX_FAMILY_MODELS) \
- - && ((chip_model) >= OCTEON_CN58XX_PASS1_0) && ((chip_model) < OCTEON_CN63XX_PASS1_0)) || \
- + && ((chip_model & OCTEON_PRID_MASK) >= OCTEON_CN58XX_PASS1_0) \
- + && ((chip_model & OCTEON_PRID_MASK) < OCTEON_CN63XX_PASS1_0)) || \
- ((((arg_model) & (OM_MATCH_6XXX_FAMILY_MODELS)) == OM_MATCH_6XXX_FAMILY_MODELS) \
- - && ((chip_model) >= OCTEON_CN63XX_PASS1_0)) || \
- + && ((chip_model & OCTEON_PRID_MASK) >= OCTEON_CN63XX_PASS1_0) \
- + && ((chip_model & OCTEON_PRID_MASK) < OCTEON_CNF71XX_PASS1_0)) || \
- + ((((arg_model) & (OM_MATCH_F7XXX_FAMILY_MODELS)) == OM_MATCH_F7XXX_FAMILY_MODELS) \
- + && ((chip_model & OCTEON_PRID_MASK) >= OCTEON_CNF71XX_PASS1_0) \
- + && ((chip_model & OCTEON_PRID_MASK) < OCTEON_CN78XX_PASS1_0)) || \
- + ((((arg_model) & (OM_MATCH_7XXX_FAMILY_MODELS)) == OM_MATCH_7XXX_FAMILY_MODELS) \
- + && ((chip_model & OCTEON_PRID_MASK) >= OCTEON_CN78XX_PASS1_0)) || \
- ((((arg_model) & (OM_MATCH_PREVIOUS_MODELS)) == OM_MATCH_PREVIOUS_MODELS) \
- && (((chip_model) & OCTEON_58XX_MODEL_MASK) < ((arg_model) & OCTEON_58XX_MODEL_MASK))) \
- )))
- @@ -326,6 +378,15 @@ static inline int __octeon_is_model_runt
- #define OCTEON_IS_COMMON_BINARY() 1
- #undef OCTEON_MODEL
-
- +#define OCTEON_IS_OCTEON1() OCTEON_IS_MODEL(OCTEON_CN3XXX)
- +#define OCTEON_IS_OCTEONPLUS() OCTEON_IS_MODEL(OCTEON_CN5XXX)
- +#define OCTEON_IS_OCTEON2() \
- + (OCTEON_IS_MODEL(OCTEON_CN6XXX) || OCTEON_IS_MODEL(OCTEON_CNF71XX))
- +
- +#define OCTEON_IS_OCTEON3() OCTEON_IS_MODEL(OCTEON_CN7XXX)
- +
- +#define OCTEON_IS_OCTEON1PLUS() (OCTEON_IS_OCTEON1() || OCTEON_IS_OCTEONPLUS())
- +
- const char *octeon_model_get_string(uint32_t chip_id);
- const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
-
|
