From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590778; b=wlxPTz9+MPwSUpfwQeUKVVvfmOLJd3pvFmLBTHOnHHSukBu7yVMSpsZDD5apnZFswTx8 bOKPMgGAdp255hP5ErqIrysbaWcf53SCtlm0Gqs8nQzsFQjOFoSR16wSoHwb7fkUryLsn 1kygStHX8e6wqTp9lPJMKY4ejadTcE/X5p7+PIH3t0QtlK/85Dmy1nkAAqmVEVXHPSBr6 S5cnSJIhkkxT9WBJkIvpwurkNPXFYb7j7zfhQm5+o7HgqKICfs2tdAhwrYXeeiIluC3F6 oHbrL9+k9B8kno27WAmEmiaTftb0uBxjNJvPSCWZTeBeSsl2g9uxnczJdcg0RUhNXGw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590778; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=p2DcIU3aTSVyWdnX6zTmr/6Bg1KfGI01wdLEdCyq+ro=; b=kpsC7qgHDaWeS4xzVpMYTTebPI7SHrPxsvJGHgjpSHbtBh6N2du6XPepEe4QpFj/ueN+ 80vrgbV/p6YWnv0sA/ytTulngp2YXcw76Oz8NZ/GaEli+mTiZeqJgJefIygxxP6jJ94RZ TakDK4Mz20dcqGsh+b5qmpCgcaO0Pt7OfdkCwwLdol82h2HQp/4t+GeFYIl472C0A/4q1 LAh7dsWGoVPCSrQd/WbTrShCw+fjMSGuen07XbyQ40ivnE+d+dFp2XHhqoDJp+YaO/Oev ajxALabW6/F1+EhrLn/s1TWIeqgRVe6h1E7qhmHiy80K8F+/DtgVRVNXDxFSox1FebA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JT2pdviY; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90371606E20E; Fri, 13 Nov 2026 17:26:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JT2pdviY Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CD7D1F000C4; Fri, 13 Nov 2026 17:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590778; bh=p2DcIU3aTSVyWdnX6zTmr/6Bg1KfGI01wdLEdCyq+ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JT2pdviYqiezc/zWcAD2pLlY/7ZRJMZGZC9L+XqPaIlj/2BuOx9ulRqDnAmIqdY0R 3TzztQjX2JEd97IMNnQpcXkjdwRiPoErGqotda3bi1CLDc03vVCS9GGE0ao6iXEaBs ulZWjXJhWkvX+s2I5RiiiMMfFFUvJwbBEhCIkaQA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shixiong Ou , Helge Deller , Sasha Levin Subject: [PATCH 6.18 674/686] fbdev: nvidia: Convert to managed PCI and ioremap API Date: Fri, 13 Nov 2026 10:53:27 -0500 Message-ID: <20261113153844.503487576@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shixiong Ou [ Upstream commit a41961f364bc7aee1611796e7ab5bd687708d770 ] Fix missing pci_disable_device() in probe and remove. Use pcim_enable_device(), pcim_request_all_regions(), devm_ioremap() and devm_ioremap_wc() to replace manual resource management. Remove all pci_release_regions() and iounmap() calls. Signed-off-by: Shixiong Ou Signed-off-by: Helge Deller Stable-dep-of: 8710af6a3520 ("fbdev: nvidia: Release write-combining handle on probe failure") Signed-off-by: Sasha Levin --- drivers/video/fbdev/nvidia/nvidia.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index c9dcc9e899487..f917d569bdbd5 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c @@ -1289,7 +1289,7 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) NVTRACE_ENTER(); assert(pd != NULL); - if (pci_enable_device(pd)) { + if (pcim_enable_device(pd)) { printk(KERN_ERR PFX "cannot enable PCI device\n"); return -ENODEV; } @@ -1302,7 +1302,7 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) nvidiafb_fix.mmio_start = pci_resource_start(pd, 0); nvidiafb_fix.mmio_len = pci_resource_len(pd, 0); - REGS = ioremap(nvidiafb_fix.mmio_start, nvidiafb_fix.mmio_len); + REGS = devm_ioremap(&pd->dev, nvidiafb_fix.mmio_start, nvidiafb_fix.mmio_len); if (!REGS) { printk(KERN_ERR PFX "cannot ioremap MMIO base\n"); return -ENODEV; @@ -1330,7 +1330,7 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) if (info->pixmap.addr == NULL) goto err_out_kfree; - if (pci_request_regions(pd, "nvidiafb")) { + if (pcim_request_all_regions(pd, "nvidiafb")) { printk(KERN_ERR PFX "cannot request PCI regions\n"); goto err_out_enable; } @@ -1355,7 +1355,7 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) sprintf(nvidiafb_fix.id, "NV%x", (pd->device & 0x0ff0) >> 4); if (NVCommonSetup(info)) - goto err_out_free_base0; + goto err_out_enable; par->FbAddress = nvidiafb_fix.smem_start; par->FbMapSize = par->RamAmountKBytes * 1024; @@ -1375,8 +1375,8 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) par->ScratchBufferStart = par->FbUsableSize - par->ScratchBufferSize; par->CursorStart = par->FbUsableSize + (32 * 1024); - info->screen_base = ioremap_wc(nvidiafb_fix.smem_start, - par->FbMapSize); + info->screen_base = devm_ioremap_wc(&pd->dev, nvidiafb_fix.smem_start, + par->FbMapSize); info->screen_size = par->FbUsableSize; nvidiafb_fix.smem_len = par->RamAmountKBytes * 1024; @@ -1420,19 +1420,15 @@ static int nvidiafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) return 0; err_out_iounmap_fb: - iounmap(info->screen_base); fb_destroy_modelist(&info->modelist); err_out_free_base1: fb_destroy_modedb(info->monspecs.modedb); nvidia_delete_i2c_busses(par); -err_out_free_base0: - pci_release_regions(pd); err_out_enable: kfree(info->pixmap.addr); err_out_kfree: framebuffer_release(info); err_out: - iounmap(REGS); return -ENODEV; } @@ -1447,11 +1443,8 @@ static void nvidiafb_remove(struct pci_dev *pd) unregister_framebuffer(info); arch_phys_wc_del(par->wc_cookie); - iounmap(info->screen_base); fb_destroy_modedb(info->monspecs.modedb); nvidia_delete_i2c_busses(par); - iounmap(par->REGS); - pci_release_regions(pd); kfree(info->pixmap.addr); framebuffer_release(info); NVTRACE_LEAVE(); -- 2.53.0