From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Apr 2025 10:32:35 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u793T-003yOW-0s for lore@lore.pengutronix.de; Tue, 22 Apr 2025 10:32:35 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u793S-0007t2-ME for lore@pengutronix.de; Tue, 22 Apr 2025 10:32:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=HTcXyItNTJoqByulB5uHtmY3D9tfiY0yc3LIiBoOKvA=; b=v7QvZduLtcDi9BrqJAFX9+xp8m RFHNwoCUHmljED4+1Wu2rIRFW2HcD1PXz6ZHDXVsMfNcgWE0HK5dvwT5sEzY23lIfExRrl8zsX2yC JrkzW74OOQIvb8B3zlefiLnE1CwVfR4J7Y9t/YZiwiSit+bGgt+eHvCWguCG2rrVxsTQ3dh7bch3N BN2M4/v4cgsIErJi1iOCD2s7CScrBWpGpP3RLdHlNhBvCN0CBINLxwOrRAtvHanKIGXkSsYQdPMkb jVLCpAzie4OiW+csWT+hW6Glf55hI6UFxPxQzc2TyAttZeyHPKF/ONJKPkUSKifSszHWARYdtsjno pgg0jvFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u792j-00000006Jwv-1bW6; Tue, 22 Apr 2025 08:31:49 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u77y9-000000066M5-1AAZ for barebox@lists.infradead.org; Tue, 22 Apr 2025 07:23:02 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u77y7-0003qX-Rj; Tue, 22 Apr 2025 09:22:59 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u77y7-001Vmj-2A; Tue, 22 Apr 2025 09:22:59 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1u77y7-000kcO-1s; Tue, 22 Apr 2025 09:22:59 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Tue, 22 Apr 2025 09:22:58 +0200 Message-Id: <20250422072258.179188-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250422_002301_315686_1DB016B6 X-CRM114-Status: GOOD ( 15.20 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.4 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] driver: have dev_platform_ioremap_resource return error pointer X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) From: Ahmad Fatoum devm_request_mem_region doesn't return NULL on error on Linux and thus it should neither in barebox. Fix this. Signed-off-by: Ahmad Fatoum --- v1 -> v2: - clarify IS_ERR(resource::start) (Sascha) --- drivers/base/driver.c | 11 ++++++++++- include/linux/device.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/base/driver.c b/drivers/base/driver.c index edba037fa2dd..85cec7efab46 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -549,7 +549,14 @@ void __iomem *dev_platform_get_and_ioremap_resource(struct device *dev, res = dev_request_mem_resource(dev, num); if (IS_ERR(res)) return IOMEM_ERR_PTR(PTR_ERR(res)); - else if (WARN_ON(IS_ERR_VALUE(res->start))) + + /* As everything is mapped 1:1 by default, drivers on unlucky + * platforms can end up successfully requesting memory, but + * getting a base address that looks like an error pointer. + * Let's warn loudly about this case, as these drivers + * should be using dev_request_mem_resource instead. + */ + if (WARN_ON(IS_ERR_VALUE(res->start))) return IOMEM_ERR_PTR(-EINVAL); if (out_res) @@ -587,6 +594,8 @@ void __iomem *dev_request_mem_region(struct device *dev, int num) struct resource *res; res = dev_request_mem_resource(dev, num); + if (!IS_ERR(res) && WARN_ON(IS_ERR_VALUE(res->start))) + return IOMEM_ERR_PTR(res->start); if (IS_ERR(res)) return ERR_CAST(res); diff --git a/include/linux/device.h b/include/linux/device.h index 66294910abb3..661d8b24730e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -39,7 +39,7 @@ static inline void __iomem *dev_platform_ioremap_resource(struct device *dev, * so we don't need to do anything besides requesting the regions * and can leave the memory attributes unchanged. */ - return dev_request_mem_region_err_null(dev, resource); + return dev_request_mem_region(dev, resource); } static inline void __iomem *devm_ioremap(struct device *dev, -- 2.39.5