On 9/17/25 6:40 AM, Neeraj Kumar wrote:
> CXL LSA v2.1 utilizes the region labels stored in the LSA for interleave
> set configuration instead of interleave-set cookie used in previous LSA
> versions. As interleave-set cookie is not required for CXL LSA v2.1 format
> so skip its usage for CXL LSA 2.1 format
>
> Signed-off-by: Neeraj Kumar <s.neeraj@samsung.com>
> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
> Acked-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
> drivers/nvdimm/namespace_devs.c | 8 +++++++-
> drivers/nvdimm/region_devs.c | 10 ++++++++++
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
> index 55cfbf1e0a95..3271b1c8569a 100644
> --- a/drivers/nvdimm/namespace_devs.c
> +++ b/drivers/nvdimm/namespace_devs.c
> @@ -1684,7 +1684,13 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region,
> int rc = 0;
> u16 i;
>
> - if (cookie == 0) {
> + /*
> + * CXL LSA v2.1 utilizes the region label stored in the LSA for
> + * interleave set configuration. Whereas EFI LSA v1.1 & v1.2
> + * utilizes interleave-set cookie. i.e, CXL labels skip the
> + * need for 'interleave-set cookie'
> + */
> + if (!ndd->cxl && cookie == 0) {
> dev_dbg(&nd_region->dev, "invalid interleave-set-cookie\n");
> return ERR_PTR(-ENXIO);
> }
> diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
> index de1ee5ebc851..88275f352240 100644
> --- a/drivers/nvdimm/region_devs.c
> +++ b/drivers/nvdimm/region_devs.c
> @@ -858,6 +858,16 @@ u64 nd_region_interleave_set_cookie(struct nd_region *nd_region,
> if (!nd_set)
> return 0;
>
> + /*
> + * CXL LSA v2.1 utilizes the region label stored in the LSA for
> + * interleave set configuration. Whereas EFI LSA v1.1 & v1.2
> + * utilizes interleave-set cookie. i.e, CXL labels skip the
> + * need for 'interleave-set cookie'
> + */
> + if (nsindex && __le16_to_cpu(nsindex->major) == 2
> + && __le16_to_cpu(nsindex->minor) == 1)
> + return 0;
> +
> if (nsindex && __le16_to_cpu(nsindex->major) == 1
> && __le16_to_cpu(nsindex->minor) == 1)
> return nd_set->cookie1;