From ca76a3a8052b71c0334d5c094859cfa340c290a8 Mon Sep 17 00:00:00 2001

From: Dan Williams <dan.j.williams@intel.com>

Date: Fri, 15 Oct 2021 14:29:58 -0700

Subject: [PATCH] cxl/pci: Fix NULL vs ERR_PTR confusion

Git-commit: ca76a3a8052b71c0334d5c094859cfa340c290a8

Patch-mainline: v5.16-rc1

References: git-fixes stable-5.14.19

cxl_pci_map_regblock() may return an ERR_PTR(), but cxl_pci_setup_regs()

is only prepared for NULL as the error case. Pick the minimal fix for

-stable backport purposes and just have cxl_pci_map_regblock() return

NULL for errors.

Fixes: f8a7e8c29be8 ("cxl/pci: Reserve all device regions at once")

Cc: <stable@vger.kernel.org>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Link: https://lore.kernel.org/r/163433325724.834522.17809774578178224149.stgit@dwillia2-desk3.amr.corp.intel.com

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/cxl/pci.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c

index ccc7c2573ddc..9c178002d49e 100644

--- a/drivers/cxl/pci.c

+++ b/drivers/cxl/pci.c

@@ -317,7 +317,7 @@ static void __iomem *cxl_pci_map_regblock(struct cxl_mem *cxlm,

 	if (pci_resource_len(pdev, bar) < offset) {

 		dev_err(dev, "BAR%d: %pr: too small (offset: %#llx)\n", bar,

 			&pdev->resource[bar], (unsigned long long)offset);

-		return IOMEM_ERR_PTR(-ENXIO);

+		return NULL;

 	}

 	addr = pci_iomap(pdev, bar, 0);

-- 

2.26.2