From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07D0A25335F; Tue, 29 Apr 2025 17:54:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949299; cv=none; b=bX6pAfSqj/yzMThk7c0jjpqAOKJ6xvNwDF0Y1Zp/pomaYHduHxoe3nu7KrXqPsJmDEbys3qb3kFSbVBwykbCT62+3/oHHa/7pJ+lGV4NFSs1AaU16mpHGLY5dj63C9OIq613nz2eJSfxFfE0QCJr3NCdWekNFDuVfeOqUouG4bA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949299; c=relaxed/simple; bh=pndw5YK8vUz8lZBaDk8yPehDnsru6FSR5v+5PPXpDGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EM96lQmCiA056QjU9j5YnAnN1qvZ5gbeZWekkCt9NIa1NWrPu9jgSJ7Xli/ueFEBZi1Pj3rrHcoz6diHa1bMV2U6brGrYbsc8T2MzqRqOdbkx4QjVrBLionGcyuilUEUleCVWl+XRL2/EZOHiT48JMsh1C+pElfKJ/KJzQOzAec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Aip2WVr4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Aip2WVr4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F5F3C4CEE3; Tue, 29 Apr 2025 17:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949298; bh=pndw5YK8vUz8lZBaDk8yPehDnsru6FSR5v+5PPXpDGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aip2WVr4QIzohfHrMjnCUfBqe5918oZpjWkqb3I6qNmqqJw32roxutD4HY6e7Dpmu xHLIwEQd4BiVU2xy0o20K9Htjjo8P1szdlQPtUHW/ot8uY2nGYkljCQUzNqGrp8C+n +2hWdUgY7IhJtY2xuVCp98O6/K6nO8lAKRXg8S4g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guixin Liu , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 5.15 274/373] gpio: tegra186: fix resource handling in ACPI probe path Date: Tue, 29 Apr 2025 18:42:31 +0200 Message-ID: <20250429161134.398802221@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161123.119104857@linuxfoundation.org> References: <20250429161123.119104857@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guixin Liu [ Upstream commit 8323f3a69de6f6e96bf22f32dd8e2920766050c2 ] When the Tegra186 GPIO controller is probed through ACPI matching, the driver emits two error messages during probing: "tegra186-gpio NVDA0508:00: invalid resource (null)" "tegra186-gpio NVDA0508:00: invalid resource (null)" Fix this by getting resource first and then do the ioremap. Fixes: 2606e7c9f5fc ("gpio: tegra186: Add ACPI support") Cc: stable@vger.kernel.org Signed-off-by: Guixin Liu Link: https://lore.kernel.org/r/20250327032349.78809-1-kanie@linux.alibaba.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/gpio/gpio-tegra186.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c index 52e08bc2f0530..da310b20fad00 100644 --- a/drivers/gpio/gpio-tegra186.c +++ b/drivers/gpio/gpio-tegra186.c @@ -630,6 +630,7 @@ static int tegra186_gpio_probe(struct platform_device *pdev) struct gpio_irq_chip *irq; struct tegra_gpio *gpio; struct device_node *np; + struct resource *res; char **names; int err; @@ -649,19 +650,19 @@ static int tegra186_gpio_probe(struct platform_device *pdev) gpio->num_banks++; /* get register apertures */ - gpio->secure = devm_platform_ioremap_resource_byname(pdev, "security"); - if (IS_ERR(gpio->secure)) { - gpio->secure = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(gpio->secure)) - return PTR_ERR(gpio->secure); - } - - gpio->base = devm_platform_ioremap_resource_byname(pdev, "gpio"); - if (IS_ERR(gpio->base)) { - gpio->base = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(gpio->base)) - return PTR_ERR(gpio->base); - } + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "security"); + if (!res) + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + gpio->secure = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(gpio->secure)) + return PTR_ERR(gpio->secure); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio"); + if (!res) + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + gpio->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(gpio->base)) + return PTR_ERR(gpio->base); err = platform_irq_count(pdev); if (err < 0) -- 2.39.5