From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61795C433EF for ; Sun, 10 Oct 2021 03:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4869E60F5C for ; Sun, 10 Oct 2021 03:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230209AbhJJDqQ (ORCPT ); Sat, 9 Oct 2021 23:46:16 -0400 Received: from mga04.intel.com ([192.55.52.120]:35017 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbhJJDqL (ORCPT ); Sat, 9 Oct 2021 23:46:11 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10132"; a="225479696" X-IronPort-AV: E=Sophos;i="5.85,361,1624345200"; d="scan'208";a="225479696" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2021 20:44:14 -0700 X-IronPort-AV: E=Sophos;i="5.85,361,1624345200"; d="scan'208";a="489979373" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2021 20:44:13 -0700 Date: Sat, 9 Oct 2021 20:44:13 -0700 From: Ira Weiny To: Dan Williams Cc: linux-cxl@vger.kernel.org, stable@vger.kernel.org, Jonathan Cameron , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, hch@lst.de Subject: Re: [PATCH v3 03/10] cxl/pci: Fix NULL vs ERR_PTR confusion Message-ID: <20211010034413.GH3114988@iweiny-DESK2.sc.intel.com> References: <163379783658.692348.16064992154261275220.stgit@dwillia2-desk3.amr.corp.intel.com> <163379785305.692348.7804260538462033304.stgit@dwillia2-desk3.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <163379785305.692348.7804260538462033304.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: Mutt/1.11.1 (2018-12-01) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Oct 09, 2021 at 09:44:13AM -0700, Dan Williams wrote: > cxl_pci_map_regblock() may return an ERR_PTR(), but cxl_pci_setup_regs() > is only prepared for NULL as the error case. > > Fixes: f8a7e8c29be8 ("cxl/pci: Reserve all device regions at once") > Cc: > Cc: Jonathan Cameron > Cc: Ira Weiny Reviewed-by: Ira Weiny > Signed-off-by: Dan Williams > --- > 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); >