diff options
Diffstat (limited to 'drivers/misc/cxl/cxl.h')
| -rw-r--r-- | drivers/misc/cxl/cxl.h | 18 | 
1 files changed, 5 insertions, 13 deletions
| diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h index c8568ea7c518..a03f8e7535e5 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h @@ -357,6 +357,7 @@ static const cxl_p2n_reg_t CXL_PSL_WED_An     = {0x0A0};  #define CXL_PSL9_DSISR_An_PF_RGP  0x0000000000000090ULL  /* PTE not found (Radix Guest (parent)) 0b10010000 */  #define CXL_PSL9_DSISR_An_PF_HRH  0x0000000000000094ULL  /* PTE not found (HPT/Radix Host)       0b10010100 */  #define CXL_PSL9_DSISR_An_PF_STEG 0x000000000000009CULL  /* PTE not found (STEG VA)              0b10011100 */ +#define CXL_PSL9_DSISR_An_URTCH   0x00000000000000B4ULL  /* Unsupported Radix Tree Configuration 0b10110100 */  /****** CXL_PSL_TFC_An ******************************************************/  #define CXL_PSL_TFC_An_A  (1ull << (63-28)) /* Acknowledge non-translation fault */ @@ -844,24 +845,15 @@ static inline bool cxl_is_power8(void)  static inline bool cxl_is_power9(void)  { -	/* intermediate solution */ -	if (!cxl_is_power8() && -	   (cpu_has_feature(CPU_FTRS_POWER9) || -	    cpu_has_feature(CPU_FTR_POWER9_DD1))) +	if (pvr_version_is(PVR_POWER9))  		return true;  	return false;  } -static inline bool cxl_is_psl8(struct cxl_afu *afu) +static inline bool cxl_is_power9_dd1(void)  { -	if (afu->adapter->caia_major == 1) -		return true; -	return false; -} - -static inline bool cxl_is_psl9(struct cxl_afu *afu) -{ -	if (afu->adapter->caia_major == 2) +	if ((pvr_version_is(PVR_POWER9)) && +	    cpu_has_feature(CPU_FTR_POWER9_DD1))  		return true;  	return false;  } |