Re: [PATCH v5 5/5] cxl/hdm: Rename decoder coherency flags

[Dave Jiang <dave.jiang@intel.com>]

On 6/15/26 7:55 AM, Davidlohr Bueso wrote:
> Align with the ACPI CXL Window restriction naming and convert
> CXL_DECODER_F_TYPE2/F_TYPE3 to F_DEVMEM/F_HOSTONLY. Type2 and
> Type3 coherency models were named prior to Back-Invalidate.
> 
> Reviewed-by: Ben Cheatham <benjamin.cheatham@amd.com>
> Signed-off-by: Davidlohr Bueso <dave@stgolabs.net>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>


> ---
>  drivers/cxl/acpi.c      |  6 +++---
>  drivers/cxl/core/port.c | 12 ++++++------
>  drivers/cxl/cxl.h       |  4 ++--
>  3 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
> index 6a9ba82719e9..087dd1e86d40 100644
> --- a/drivers/cxl/acpi.c
> +++ b/drivers/cxl/acpi.c
> @@ -143,9 +143,9 @@ static unsigned long cfmws_to_decoder_flags(int restrictions)
>  	unsigned long flags = CXL_DECODER_F_ENABLE;
>  
>  	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_DEVMEM)
> -		flags |= CXL_DECODER_F_TYPE2;
> +		flags |= CXL_DECODER_F_DEVMEM;
>  	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_HOSTONLYMEM)
> -		flags |= CXL_DECODER_F_TYPE3;
> +		flags |= CXL_DECODER_F_HOSTONLY;
>  	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_VOLATILE)
>  		flags |= CXL_DECODER_F_RAM;
>  	if (restrictions & ACPI_CEDT_CFMWS_RESTRICT_PMEM)
> @@ -445,7 +445,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,
>  
>  	cxld = &cxlrd->cxlsd.cxld;
>  	cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions);
> -	cxld->target_type = (cxld->flags & CXL_DECODER_F_TYPE2) ?
> +	cxld->target_type = (cxld->flags & CXL_DECODER_F_DEVMEM) ?
>  		CXL_DECODER_DEVMEM : CXL_DECODER_HOSTONLYMEM;
>  	cxld->hpa_range = (struct range) {
>  		.start = cfmws->base_hpa,
> diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
> index 71801dfd614b..63005cf0fa91 100644
> --- a/drivers/cxl/core/port.c
> +++ b/drivers/cxl/core/port.c
> @@ -128,8 +128,8 @@ static DEVICE_ATTR_RO(name)
>  
>  CXL_DECODER_FLAG_ATTR(cap_pmem, CXL_DECODER_F_PMEM);
>  CXL_DECODER_FLAG_ATTR(cap_ram, CXL_DECODER_F_RAM);
> -CXL_DECODER_FLAG_ATTR(cap_type2, CXL_DECODER_F_TYPE2);
> -CXL_DECODER_FLAG_ATTR(cap_type3, CXL_DECODER_F_TYPE3);
> +CXL_DECODER_FLAG_ATTR(cap_type2, CXL_DECODER_F_DEVMEM);
> +CXL_DECODER_FLAG_ATTR(cap_type3, CXL_DECODER_F_HOSTONLY);
>  CXL_DECODER_FLAG_ATTR(locked, CXL_DECODER_F_LOCK);
>  CXL_DECODER_FLAG_ATTR(cap_bi, CXL_DECODER_F_BI);
>  
> @@ -357,8 +357,8 @@ static bool can_create_pmem(struct cxl_root_decoder *cxlrd)
>  	unsigned long flags = cxlrd->cxlsd.cxld.flags;
>  	unsigned long hdm_h, hdm_db;
>  
> -	hdm_h = CXL_DECODER_F_TYPE3 | CXL_DECODER_F_PMEM;
> -	hdm_db = CXL_DECODER_F_TYPE2 | CXL_DECODER_F_BI | CXL_DECODER_F_PMEM;
> +	hdm_h = CXL_DECODER_F_HOSTONLY | CXL_DECODER_F_PMEM;
> +	hdm_db = CXL_DECODER_F_DEVMEM | CXL_DECODER_F_BI | CXL_DECODER_F_PMEM;
>  
>  	return (flags & hdm_h) == hdm_h || (flags & hdm_db) == hdm_db;
>  }
> @@ -368,8 +368,8 @@ static bool can_create_ram(struct cxl_root_decoder *cxlrd)
>  	unsigned long flags = cxlrd->cxlsd.cxld.flags;
>  	unsigned long hdm_h, hdm_db;
>  
> -	hdm_h = CXL_DECODER_F_TYPE3 | CXL_DECODER_F_RAM;
> -	hdm_db = CXL_DECODER_F_TYPE2 | CXL_DECODER_F_BI | CXL_DECODER_F_RAM;
> +	hdm_h = CXL_DECODER_F_HOSTONLY | CXL_DECODER_F_RAM;
> +	hdm_db = CXL_DECODER_F_DEVMEM | CXL_DECODER_F_BI | CXL_DECODER_F_RAM;
>  
>  	return (flags & hdm_h) == hdm_h || (flags & hdm_db) == hdm_db;
>  }
> diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
> index 29231d0db470..b0b4ea4ff8a5 100644
> --- a/drivers/cxl/cxl.h
> +++ b/drivers/cxl/cxl.h
> @@ -282,8 +282,8 @@ int cxl_dport_map_rcd_linkcap(struct pci_dev *pdev, struct cxl_dport *dport);
>   */
>  #define CXL_DECODER_F_RAM   BIT(0)
>  #define CXL_DECODER_F_PMEM  BIT(1)
> -#define CXL_DECODER_F_TYPE2 BIT(2)
> -#define CXL_DECODER_F_TYPE3 BIT(3)
> +#define CXL_DECODER_F_DEVMEM BIT(2)
> +#define CXL_DECODER_F_HOSTONLY BIT(3)
>  #define CXL_DECODER_F_LOCK  BIT(4)
>  #define CXL_DECODER_F_ENABLE    BIT(5)
>  #define CXL_DECODER_F_NORMALIZED_ADDRESSING BIT(6)