From patchwork Mon Aug 19 16:51:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768712 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D8B0C3DA4A for ; Mon, 19 Aug 2024 17:00:33 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NwxbMRfa8A0AMonhiodSZXz8snc1ppjCUOJ6oxZMysE=; b=3F70BlQe1FQm1ddEpP7tLqKxE3 esnyMa6cs8qtXCI5TAhdXyiMJ1Owm3Qh+xz3gV/O13zizbMAN7cE1Wi2WBGRvfFDXGF3Iv8CllJLI 2ViLqCwqG6dRQCiT29yNTAgasQTKhpYeoB/dtS6ZngvXmX2wAWGdqYpMY9d5AKcolLwTTXT3GdG6j t9y/XtD8Q4tJaRDXmsMBx/jFYM4RHD1g/o6t7YDcQ5LjEJJ4KpbQ6GKSg20P7WdV8HYbOlawUEqd0 64paNKjU9qqSzGPI8bY5xUq70Ake48eNRGuL1LzTzQAcbB0AkVcA/bNvRO2qPaN+mAmFDASdUlFGZ U3OeddGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5jw-00000002I41-38Om; Mon, 19 Aug 2024 17:00:20 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5ce-00000002Fbw-3J9j for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:52:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=NwxbMRfa8A0AMonhiodSZXz8snc1ppjCUOJ6oxZMysE=; b=oK2bI8o8vm/KlWqUuyzXuqi0ZR 9uQE9SUh/DSaxxtHXlZuazY4a4UyQPRF26PKmpJ1wSsuR9kc3FI6fc+8yLUoUhqgJMTVgGhEYoZOM VVFFc5qifadmXtqAEe9S++Ptq0tZTJZFNOLWRHtlkZ+Tqh0+Ubzx10NylYQNk2yOI3w9OEdeAp/KK cbFVwZhL4R1Zdc1MyFYutj8ER+7fq7T0owxCrt5kqwYeBzrz2BTTJWj1r9ZZQXLn/mQXraOcd352/ a8E/fpTRHNr+remQJ/WLEvSFmaQPvSERn+qm16oPO32nQJAg67CBfCQZjddnZfRWi+faGbL5sOKoJ +ySIUEQA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5ca-00000009AuH-3rRe for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:52:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NwxbMRfa8A0AMonhiodSZXz8snc1ppjCUOJ6oxZMysE=; b=AJiUOVWzj1XGIRu+4UsoXR5O7MpVsv18d6TnYjP9YxUhwSwb6NaV5w3lXJeSo7Es01cTwW NyqoFRB89o7z0QWesxIdY3CJBAmQC8L4BpVtZfvDGJn/LirlmbUsPp4Z9/nZuQ6LhJObAu L85sBvB8GqXaSoR5WIpgczsKEX0co2w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NwxbMRfa8A0AMonhiodSZXz8snc1ppjCUOJ6oxZMysE=; b=KrZsJim5+BYDIcyKlhnjqcwKCG9Tgc+fzdG/FAZScseHkTd5/C6Ykekp7akv1UvMK9l49N fY5IPK6L5Kncx8S1M6i7uK+7tnH6MgqqR5RvNbcCbFGWK23Ky8vWL+jvgX2mxxI9xN10RN VaGh9lNlmql+sMtxrD0F7GGy/TW7+Ds= Received: from mail-ua1-f72.google.com (mail-ua1-f72.google.com [209.85.222.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-ichCu8pGMtyNkxJxYDuGuA-1; Mon, 19 Aug 2024 12:52:36 -0400 X-MC-Unique: ichCu8pGMtyNkxJxYDuGuA-1 Received: by mail-ua1-f72.google.com with SMTP id a1e0cc1a2514c-842f65a51e9so91512241.1 for ; Mon, 19 Aug 2024 09:52:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086355; x=1724691155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NwxbMRfa8A0AMonhiodSZXz8snc1ppjCUOJ6oxZMysE=; b=HeUGb2vZi8zGHF2jRrtvHXQXFHO7HcEUPM4Jr0AZy1L73KMWbtiSU9uqtHO4rQSN7/ /Y0qM4ah38o4AWb2UAVGS4/7Hk8u+vrNI0MVfEhwvLC9UQA3NTcZ45yaBRzVpI8oDSPl 3eyS7A4Zby+XuVE7/hNfOH05rEgchxmLKogt6lBLGDKBuJ5vUPRyqAAA4A0N7v7rp00g ebEw5J5G0UvJc1mWF/gElkXk9D1OTEbCSeKfO8J4c5z3wzShbOAiIIlfZG0ZOph4vKB1 pHGynFQjGlHOBFKNP/Tgziy+u+evz+XUSGTV/ADgZLX3c+CzBBCPDxc9dYc09gZw+DxV 61FQ== X-Forwarded-Encrypted: i=1; AJvYcCWgw71W7j/AR9sovLnJkPCFop0wjQP9SM9PSbEWqAszM+uY2+xb6j6+puz0rUSpaHa5yajxy4LV8DraGLv4YmeMH9pbRGmm0F2eNlHHEXY/BsXmw8E= X-Gm-Message-State: AOJu0YzwxwdodT2QZKHgnBRy9NeCEHVbtowB3ml3ytnsRKJ8y6RN2ju1 hg6IhOTX/7T9X3G+LjKO08VDG2s/o5QVb7oao4in9EYBIGoVGT7ZgMx6aLcS9zAupWIo8bssM6n REKtWD5Xu2GP8EhUhooieCqtk0VWKg/jPwmUpcyMDve0p8lvgoT2RIjiiOB8u6Z/WuzAAXcxF X-Received: by 2002:a05:6102:5494:b0:495:c40b:f7ca with SMTP id ada2fe7eead31-4977bf0d2d4mr5497593137.3.1724086355211; Mon, 19 Aug 2024 09:52:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHysbKKqXtZq0nkk+KqqjyQL404GAu1sdBPta+GD7btYSYi5SLJQ3pijiCStxEYNXypkns3Gw== X-Received: by 2002:a05:6102:5494:b0:495:c40b:f7ca with SMTP id ada2fe7eead31-4977bf0d2d4mr5497574137.3.1724086354811; Mon, 19 Aug 2024 09:52:34 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:34 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 1/9] PCI: Make pcim_release_region() a public function Date: Mon, 19 Aug 2024 18:51:41 +0200 Message-ID: <20240819165148.58201-3-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175245_204710_69CD0575 X-CRM114-Status: GOOD ( 14.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_release_region() is the managed counterpart of pci_release_region(). It can be useful in some cases where drivers want to manually release a requested region before the driver's remove() callback is invoked. Make pcim_release_region() a public function. Signed-off-by: Philipp Stanner Reviewed-by: Damien Le Moal --- drivers/pci/devres.c | 1 + drivers/pci/pci.h | 1 - include/linux/pci.h | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index b97589e99fad..608f13ef2a4b 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -906,6 +906,7 @@ void pcim_release_region(struct pci_dev *pdev, int bar) devres_release(&pdev->dev, pcim_addr_resource_release, pcim_addr_resources_match, &res_searched); } +EXPORT_SYMBOL(pcim_release_region); /** diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 2fe6055a334d..01b55ed2867c 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -889,7 +889,6 @@ static inline pci_power_t mid_pci_get_power_state(struct pci_dev *pdev) int pcim_intx(struct pci_dev *dev, int enable); int pcim_request_region_exclusive(struct pci_dev *pdev, int bar, const char *name); -void pcim_release_region(struct pci_dev *pdev, int bar); /* * Config Address for PCI Configuration Mechanism #1 diff --git a/include/linux/pci.h b/include/linux/pci.h index 01b9f1a351be..dfa9af3a9c22 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2295,6 +2295,7 @@ void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); void __iomem * const *pcim_iomap_table(struct pci_dev *pdev); int pcim_request_region(struct pci_dev *pdev, int bar, const char *name); +void pcim_release_region(struct pci_dev *pdev, int bar); void __iomem *pcim_iomap_region(struct pci_dev *pdev, int bar, const char *name); int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name); From patchwork Mon Aug 19 16:51:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768727 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CDF29C3DA4A for ; Mon, 19 Aug 2024 17:01:50 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H1gq3j2cCLpN/PPS7zpa0q0nk2Py/Mwk9dwym7YeAH0=; b=JOFfuzuQE8cX6d+5ZNVIn+gbIo knhjDC4u26QtAGOmdkeoIuLadue1l9yCiCSjksKFU0xL87NHkMKeMaTCvQAKhG0NGSZPSWLB+3Nx2 1vA5e4PHZlwkiSdocFK0eLItawLF6dvgco2I8CAm55v0Nry5SGM6L//L+6FPFDtnLsbCFOlK/XABZ tcJxl9Cql4iBPx6YNU6CT9N6NwFh0t8Bv+YmJxs+b0ayywT1UjL8pZCuuGx2vOsBmwUi0/gDTUsll wKViitwuuK2PRh2V4SCB9uD4v0v1jlv1O8Q0T0OM2nvzScVqHUv2GHZeOD1+/5mVc4qBMuEM5J5HK bUOqDSiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5lG-00000002ITy-1fKr; Mon, 19 Aug 2024 17:01:42 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5ch-00000002Fci-1sSE for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:52:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=H1gq3j2cCLpN/PPS7zpa0q0nk2Py/Mwk9dwym7YeAH0=; b=WCN6Z4rfp3/vzxweEr33l2PWf3 UEhfcqXL/imQMGrvANdsYPwC4LPxyQYRESThwQCgH6IjHWG3uy8rBupXBIoTAFXNlm6dBFzSi9M9J feH40J/2XJ/pQDqVunmWjM5hnvDB1L05MJVb1PTQGfyJUmn4cvT3SVLIRg3k5udWSFcqFOVjP/agL EMQSOGVrwuYSEfYcrAjR4ZHhEdiQ9aWA1IbBua3bFr+Tmm8OqWEjzHTd0hrvfcoUpGXQl7g5LK8h5 rDJzafy3oFy+eCiavGCWNhkTakPXBcFiLGM02zNpZ+pr5q1thutSg+mqJCsL98DSNtBZ1/rexdbEs DrY774qA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cb-00000009AuG-2el9 for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:52:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H1gq3j2cCLpN/PPS7zpa0q0nk2Py/Mwk9dwym7YeAH0=; b=gE/dPG6T7HzFpffZl6xNsjE+ZU/UbcHxIhidDqER2zaJtlEdsxLZbHQAQiEXGh3eDuBxAD JlVqwGK0VUBnE4S+7EDazbNf59uHovUymZGoBwZnWZHfli3YV6HZV/jjwXSnQwmwUjVPJT NbV1W39e+61ZeCKftEPVv3b/oCPp/1k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H1gq3j2cCLpN/PPS7zpa0q0nk2Py/Mwk9dwym7YeAH0=; b=gE/dPG6T7HzFpffZl6xNsjE+ZU/UbcHxIhidDqER2zaJtlEdsxLZbHQAQiEXGh3eDuBxAD JlVqwGK0VUBnE4S+7EDazbNf59uHovUymZGoBwZnWZHfli3YV6HZV/jjwXSnQwmwUjVPJT NbV1W39e+61ZeCKftEPVv3b/oCPp/1k= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-630-egvuEg4hNaexGAuuN1dSNw-1; Mon, 19 Aug 2024 12:52:41 -0400 X-MC-Unique: egvuEg4hNaexGAuuN1dSNw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7a380541b28so7310585a.0 for ; Mon, 19 Aug 2024 09:52:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086361; x=1724691161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H1gq3j2cCLpN/PPS7zpa0q0nk2Py/Mwk9dwym7YeAH0=; b=MEUSCSBv4jjvvrPgyJjFaF8uxyzLAt0TMrwW6IevlHNPlH0J57IZzVDd3jVz8KjYO9 HHFP0dqMLxsgEtTB8gFAjfEirYBzqJ+zc3hMiGeH2Q+5Pgi2s/KLE516DJ2U3Ucwd1aV e/ownC/MOszSgOE7cqBgvVu1BLiuv0HQhVhSLRDrPt/CyoKdT1LCMu3kt/5JoeJbgFyP FImMtUw9EifC6zlBeF1vFKOkr/kXwfkEzlCjXDQVxeNb6fuVX63CFV/6MiHKncGAfLYQ sJD1hpWJ1HITQ4lU3p+WLUnLnnWYTQNxuhHafsZKxpP3vg4TsTRMSN8d+q2pGEubkLnA w7EQ== X-Forwarded-Encrypted: i=1; AJvYcCU+eVJArIVZs3zLExbYiOMDQAclPMHUIDR9L1NRCEckhJgvySd1mTRtzl1oW3J1YZzcUUo2tEPMHkP9w/zpJnDO@lists.infradead.org X-Gm-Message-State: AOJu0Yxq3+DBvejEsf9sn/qzVYJnXwQzdN5B+owrT4XffPgrSUuq593U tjCSM7nWgitkM+SJfwz6WLjec6P8qETWO7GIGgjaOjE8pSbNhsd53Flq5QMOvPuiApw2V0q+OH8 o/xRkjv7fXk0oNSGfFDenOnGB4OJURUJO2R3MdrMJli0YA76VN9I5H+zKv09x1C9u7+/RnhFJ X-Received: by 2002:a05:620a:401:b0:7a5:8f8:8b06 with SMTP id af79cd13be357-7a508f891afmr698687385a.1.1724086360753; Mon, 19 Aug 2024 09:52:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGDQD7k05CAjlfTOWOVMO5sw6hxjyjU2n/8i8XcW8KeWV0cEA9UCT2L0/OAyhNTDQ76PX01Q== X-Received: by 2002:a05:620a:401:b0:7a5:8f8:8b06 with SMTP id af79cd13be357-7a508f891afmr698682785a.1.1724086360215; Mon, 19 Aug 2024 09:52:40 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:40 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 2/9] PCI: Make pcim_iounmap_region() a public function Date: Mon, 19 Aug 2024 18:51:42 +0200 Message-ID: <20240819165148.58201-4-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175245_936789_DD65E24E X-CRM114-Status: GOOD ( 13.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The function pcim_iounmap_regions() is problematic because it uses a bitmask mechanism to release / iounmap multiple BARs at once. It, thus, prevents getting rid of the problematic iomap table mechanism which was deprecated in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Make pcim_iounmap_region() public as the successor of pcim_iounmap_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Damien Le Moal --- drivers/pci/devres.c | 3 ++- include/linux/pci.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index 608f13ef2a4b..30c813766e8b 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -771,7 +771,7 @@ EXPORT_SYMBOL(pcim_iomap_region); * Unmap a BAR and release its region manually. Only pass BARs that were * previously mapped by pcim_iomap_region(). */ -static void pcim_iounmap_region(struct pci_dev *pdev, int bar) +void pcim_iounmap_region(struct pci_dev *pdev, int bar) { struct pcim_addr_devres res_searched; @@ -782,6 +782,7 @@ static void pcim_iounmap_region(struct pci_dev *pdev, int bar) devres_release(&pdev->dev, pcim_addr_resource_release, pcim_addr_resources_match, &res_searched); } +EXPORT_SYMBOL(pcim_iounmap_region); /** * pcim_iomap_regions - Request and iomap PCI BARs (DEPRECATED) diff --git a/include/linux/pci.h b/include/linux/pci.h index dfa9af3a9c22..7de75900854a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2298,6 +2298,7 @@ int pcim_request_region(struct pci_dev *pdev, int bar, const char *name); void pcim_release_region(struct pci_dev *pdev, int bar); void __iomem *pcim_iomap_region(struct pci_dev *pdev, int bar, const char *name); +void pcim_iounmap_region(struct pci_dev *pdev, int bar); int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name); int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, const char *name); From patchwork Mon Aug 19 16:51:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768728 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2377DC3DA4A for ; Mon, 19 Aug 2024 17:02:37 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tC041gyCjeykzm80lE0q63CM17fX2IeQcUJmRWOoBEs=; b=JARfVXeEwBjZcQ80Iq9OspjjMG h0w0IpSMUbXQ/LWP6koBlLut+LDK0rLLFpf10AIpR9FDnAXfadpxtwSSHk9euIH504niuyomsxt3a nMEc8p4Pigbw960DMgGn0wGKX5EeFwoMboORMkaTAfU8SApVJy577uNVj8+0nOD7PzyF85km5IcUo GEeAiDaLefqNGKw0PSz1zw1Nr+CRUe3M6BvUoJuQ1J26xopE3ciuADBMsbPIKwiCyb6Xp/qHGZhNY ZHSpiAsarmRF5EU25oysnbVeVu9+aeKwpmmMUcWnScSkDCPwLJaagYpzyOk1un9X5NyIA6bT8BuIX GbWKGrJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5lv-00000002IeM-1JVa; Mon, 19 Aug 2024 17:02:23 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cj-00000002Fd4-0AIq for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:52:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=tC041gyCjeykzm80lE0q63CM17fX2IeQcUJmRWOoBEs=; b=VSmZZr225nDQWPykJQFanGshuQ I2i5HiXXf0ZLMPQbl6aeb2z7WgAXsTj5TadoEoXiFCDouwYKH74kG9mIWLfwwwgLtgyAya7Kdd/xR eaAYNVoqz71mhs92gCpiutFMheiuKW4pAhLTXucDNPYaH3ifCjP5KNdfDlce60NJV4rrWGWH2HlEa nZZUjme6gTS3o5iM1MRJkZL50PqSJgW30wigSf0BajlbDY615l0/3tnh44M+tZVTni1Y9FWe+NFXg u/+eGCGCC2K2H1At0u7tlknQOXG6jZfhFtHOzBI8YICDCSBIDUP/o68+JqoJbwQOVLhFJUVyI4pz0 IeXt37WA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cf-00000009Av6-2Tff for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:52:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tC041gyCjeykzm80lE0q63CM17fX2IeQcUJmRWOoBEs=; b=PhhMsPZ4UBuRMCfOKN8URsEsjQilsaRYmyyfLmoYv2ioD70RwUed4xMEOAcN6lYnogzlss 9YhOBofBUz6cbqypT+lDGhSAE5u4lC48+NrqFYLIx76sH+l4nhOL2vvWUQF6QB1xdi4WM6 NCogHG2QaOxNGG+JSvne8VVJjDpWsdU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tC041gyCjeykzm80lE0q63CM17fX2IeQcUJmRWOoBEs=; b=L2Aydgd/9yNEcoKPFHoWaU0ii5fG3jzRZ8/pzPvCIpHRZ+VITsF32CROL2x2R5UTJDIa1L fLl8MSjJQlPzFAaHaCl/pW3rSSnD+g5h+6+CnDZI0lpkWPKRmNtrqh+lRXpN3c533GH+z6 Im5lU4ypHjLv4Ff3npCI0Gh8o9IfDG4= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-mzTiJjJxO5u24EgZ9NEdzA-1; Mon, 19 Aug 2024 12:52:47 -0400 X-MC-Unique: mzTiJjJxO5u24EgZ9NEdzA-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-6bf6a978302so9344896d6.1 for ; Mon, 19 Aug 2024 09:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086366; x=1724691166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tC041gyCjeykzm80lE0q63CM17fX2IeQcUJmRWOoBEs=; b=gFB1lx8935UUkxJqa8BDB7gVBUYWUJNTTQDdl9VVtRWTxHXvXtRO1NfTa+/48PU3oa i7DS98Z/POfO2nKtdn4tBKNvq6keE/rTAgbhrPfNwHKPrHwqp8aOPANTpyC6tlYILCF5 9cCHBkzzv9pBvI5NrpbGdGXGgW5V05/8so39tM2Z1a3VrnGkNmDCn4vahC2LzqsINvU6 wrqgy0RNnahUlgSUCFBt0yg9zDcPyfDNFnl3aVQs+O0bwfSU5T2rFkkV5Oxtko4gVZW2 ztvJsocBFo4ALc2S9dBKpKq8ihE5vTiEjpOPXg9TxfaH7mHCDJIonsjDim1rR1KSfzfu H7Cg== X-Forwarded-Encrypted: i=1; AJvYcCUt5q7FZluLX/vcfl1ld+UMwXkLiK/3vQ1T4157vdMHs0jU8U1SiK+HEWBzOZFp1kNAzuOeUIAjyG1b/3hxuk4xLGlswvGAee1P/DxjGCDAvclhEA8= X-Gm-Message-State: AOJu0Yw9JBJYOI8cCKRJToGGn7llmBmwwwvEm+bvH0O98Rnk1RssKUMC uUFmJDlpVqfY81CExo1+p/pB1Jheo0aCtQzRpMyAGp7o0PoMUlc6i2CecwRLeAwPOq22ZaDnI4R F++3655Wm7dV/PwJfrBlTbbgOc7jmU391IDoLfDxT925shHtP2hoMiu0ZQAqjrjl50bWdFasx X-Received: by 2002:a05:620a:370c:b0:79b:eca2:b807 with SMTP id af79cd13be357-7a506b5a38amr835424085a.3.1724086366033; Mon, 19 Aug 2024 09:52:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEtuH1Vc6yAH1kELWuk66Dch7OPcqy61XGhK4KsxZEzCDqaZHzSUCLXnDGGtW4mk4ZWqmvkng== X-Received: by 2002:a05:620a:370c:b0:79b:eca2:b807 with SMTP id af79cd13be357-7a506b5a38amr835421185a.3.1724086365518; Mon, 19 Aug 2024 09:52:45 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:45 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 3/9] fpga/dfl-pci.c: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:43 +0200 Message-ID: <20240819165148.58201-5-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175249_904568_FFFF5D20 X-CRM114-Status: GOOD ( 14.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Port dfl-pci.c to the successor, pcim_iomap_region(). Consistently, replace pcim_iounmap_regions() with pcim_iounmap_region(). Signed-off-by: Philipp Stanner --- drivers/fpga/dfl-pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c index 80cac3a5f976..2099c497feec 100644 --- a/drivers/fpga/dfl-pci.c +++ b/drivers/fpga/dfl-pci.c @@ -41,10 +41,13 @@ struct cci_drvdata { static void __iomem *cci_pci_ioremap_bar0(struct pci_dev *pcidev) { - if (pcim_iomap_regions(pcidev, BIT(0), DRV_NAME)) + void __iomem *bar0; + + bar0 = pcim_iomap_region(pcidev, 0, DRV_NAME); + if (IS_ERR(bar0)) return NULL; - return pcim_iomap_table(pcidev)[0]; + return bar0; } static int cci_pci_alloc_irq(struct pci_dev *pcidev) @@ -296,7 +299,7 @@ static int find_dfls_by_default(struct pci_dev *pcidev, } /* release I/O mappings for next step enumeration */ - pcim_iounmap_regions(pcidev, BIT(0)); + pcim_iounmap_region(pcidev, 0); return ret; } From patchwork Mon Aug 19 16:51:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768729 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E1AD6C3DA4A for ; Mon, 19 Aug 2024 17:03:11 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VvDTGRlH2pE5xUmthqP2K8NKj/VvlYnHCpyCpsJBmcw=; b=VUnjWi5T5o6AwsC2hsa1FUdr/O pta/F32udtEvoBKM/2jqdSbYq2IA63UBml1Jms1B4anRYhFwWG7CSecYE2QiMvq65KYBuBqsaZnuH UKbluhSavBhylNOf7Mc6cvkJOfCJQ7n36qDwdu5dA4DSSQSXGnJYGdlnYmhZn4pKqNp5gvKOUeFgw zHmuw0KEu7xHPzCHC+MrFpQTGoUnsbZ5334aR9Rd6wHjkZFSCALwdQhIjpCMA/W2MbwRU55c5XM/n Fzr2GHuDj4Wo041DHhAYscVZOi+Il2N+3xlcBkTx9pBLVW+bPo55jBdAtKEb+zg0GaU6YSGLGT1px aJx1xf1g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5mZ-00000002Ipx-0iYM; Mon, 19 Aug 2024 17:03:03 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cw-00000002Fi8-1yhK for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=VvDTGRlH2pE5xUmthqP2K8NKj/VvlYnHCpyCpsJBmcw=; b=g49wxYgfckvhBSVQNaKgyuOlDZ YEE93FfusYCbv0z7p7pPnob4rvEHy4soFsXvWwD37ZHd7Sk1QtfUOxNjzVBNapNOkv/J8r0BrSwQ/ p3iKjRZ2Bs2Z0aZ+3haNlVemFbmOOtSLtvPsbgU9T+3Dp6zx4abHOdqhc+UJbOPV5k79YqVrBdoPR TAopSP3jscf20oeJ1xnyjRo2eYsYPhmwTFNQRCjpay1+h5rxFnGy3SPN/eAjEDUMrXLJKVaLzE2wC CuUV2yJOhtIxPYJvjesypP5swzJOK0F+IRuEFPV9oqEOel1aPIO7MNOQ/SQk+1ZGu0vw0NyCwt+3H SyvTLzfQ==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5ct-00000009AwV-0nwR for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VvDTGRlH2pE5xUmthqP2K8NKj/VvlYnHCpyCpsJBmcw=; b=J1eobuwPUzikcqsRGWh/+PwxQkCgUZrDgTvaP6BRqjM5WkqzU5ekDU4mJHOLzLw/Ym+Ex5 F/3a+hOM2KMZxExXz+m970aN8UAzpDIYgYMsnZafTw/FJz8K62bd2B0XLGh7b4dKorSlz4 Z0by7bMljhdote1AGDakSle5hm635F8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VvDTGRlH2pE5xUmthqP2K8NKj/VvlYnHCpyCpsJBmcw=; b=HSqPI6Wjq3AEMub2C22BjH+ONm90b4PQBFql28RdsYkiCPd+R2wnrwUcfgXAg07hNK8KkE /TiTly0yR82RdE8bV6I+HGCuOYppQi2sniNpUKsxSeF56GU232ZcZ2QWkRO2HTBtBhT2UI Y8D9yL8oO6iJMx+34eL1nUNmzvUCbl0= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-465-T8vtS3QcPlmuotAs50-rFA-1; Mon, 19 Aug 2024 12:52:52 -0400 X-MC-Unique: T8vtS3QcPlmuotAs50-rFA-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-44ff65342daso4070161cf.2 for ; Mon, 19 Aug 2024 09:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086371; x=1724691171; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VvDTGRlH2pE5xUmthqP2K8NKj/VvlYnHCpyCpsJBmcw=; b=B/Ffn3RyJO3tEItrbrRGADQpSMBMFRrGL8GWFA6VgDG+reukTVhEsd52zxhKhFw1No /Q3XTyjdeC84DRQ4NmLGSUAGbMGTfYU5Iv5Vces7+rqnHox0EgSGHt+UEwgJe62gKWUo e7UQyQAA1hPKzNErcTF4vqpvihg75CGIngQYGDJvA2jsG2eurH345mZXSkYLproLZ6z1 OMCGaHK0s+PkpnhYQ6AR5iPgxxkFPYOLndiSkYwOcuLABhHfETBD+D8Tpsub587QQ+VJ D6MxI5WEzNZ7iICbS4a5rcu9wGM4lh5NqNNJ71lhlTeXbJinZB5PSJTfHteIeHC0BHC6 tkpw== X-Forwarded-Encrypted: i=1; AJvYcCUhYWvmK7fcnpW/y43nhtf2/VGOnjInCTaV8ZEgPuyX4LdPG6JWgVv+WJMxyG3dO6QNiIC7E5BwBcLVVvP1KSOgy8pvakbjeVdihlJUH8P7RRc2oVc= X-Gm-Message-State: AOJu0YwgN4M65No2PQkfpSIhxqGlcLNGRjhnIjJvlkIN6bVRsJld5HrE DOVGUIRnN6OBymMs8k1Wp63G+ZWK5d1QDKBZay7ALsLr/cWKD3z2hJnOa+NNTYWnOrRasqUslLh 45SMJCJOAkZir2QQR4zxMjgB2IvlcCjTyKajk9ZJ/yE5TQevthQtg1bqVFtZpsF/o5zh0Vaf9 X-Received: by 2002:a05:620a:2916:b0:7a1:ec82:5fb8 with SMTP id af79cd13be357-7a50693aa1amr850723285a.3.1724086371324; Mon, 19 Aug 2024 09:52:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZa/FD9N9XMYe6vZgYz+o23a4NN1SRn7d1y7DUQ2BvFX9aygcJIaTQ2PovPIikQclvdS1AXw== X-Received: by 2002:a05:620a:2916:b0:7a1:ec82:5fb8 with SMTP id af79cd13be357-7a50693aa1amr850720485a.3.1724086370809; Mon, 19 Aug 2024 09:52:50 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:50 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 4/9] block: mtip32xx: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:44 +0200 Message-ID: <20240819165148.58201-6-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175303_696798_351EE4CE X-CRM114-Status: GOOD ( 15.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). In mtip32xx, these functions can easily be replaced by their respective successors, pcim_request_region() and pcim_iomap(). Moreover, the driver's call to pcim_iounmap_regions() is not necessary, because it's invoked in the remove() function. Cleanup can, hence, be performed by PCI devres automatically. Replace pcim_iomap_regions() and pcim_iomap_table(). Remove the call to pcim_iounmap_regions(). Signed-off-by: Philipp Stanner --- drivers/block/mtip32xx/mtip32xx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index c6ef0546ffc9..c7da6090954e 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -2716,7 +2716,9 @@ static int mtip_hw_init(struct driver_data *dd) int rv; unsigned long timeout, timetaken; - dd->mmio = pcim_iomap_table(dd->pdev)[MTIP_ABAR]; + dd->mmio = pcim_iomap(dd->pdev, MTIP_ABAR, 0); + if (!dd->mmio) + return -ENOMEM; mtip_detect_product(dd); if (dd->product_type == MTIP_PRODUCT_UNKNOWN) { @@ -3726,9 +3728,9 @@ static int mtip_pci_probe(struct pci_dev *pdev, } /* Map BAR5 to memory. */ - rv = pcim_iomap_regions(pdev, 1 << MTIP_ABAR, MTIP_DRV_NAME); + rv = pcim_request_region(pdev, 1, MTIP_DRV_NAME); if (rv < 0) { - dev_err(&pdev->dev, "Unable to map regions\n"); + dev_err(&pdev->dev, "Unable to request regions\n"); goto iomap_err; } @@ -3849,7 +3851,7 @@ static int mtip_pci_probe(struct pci_dev *pdev, drop_cpu(dd->work[2].cpu_binding); } setmask_err: - pcim_iounmap_regions(pdev, 1 << MTIP_ABAR); + pcim_release_region(pdev, MTIP_ABAR); iomap_err: kfree(dd); @@ -3925,7 +3927,6 @@ static void mtip_pci_remove(struct pci_dev *pdev) pci_disable_msi(pdev); - pcim_iounmap_regions(pdev, 1 << MTIP_ABAR); pci_set_drvdata(pdev, NULL); put_disk(dd->disk); From patchwork Mon Aug 19 16:51:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768730 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D70D5C52D7C for ; Mon, 19 Aug 2024 17:03:57 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=mMqyqgTjuW7jJ3PHlbocvcFjhX Cv3uD71bN+ca/qjouuxdwPV3x3fi2UlX8xj+e028zQSrsiBMoqTjRM++V5ejt6YfxMpjzxhywtwjQ D2jHW1X5jQNE0WAqRr/ykFS2LBlSICrODFaBXgIjs/pbfvu2Pkgeb42+kTEocQQZ6YzSluth5Z0mI zUNQ0nLxDnfzIieerXXnrICjF3OXfgdazjaGY7wffWVhN3dwiYhpG/vl58hAwgz2/fdcC4fItcc6P TllkDRAHShLwuBENDZgj7ijzhXhOrudtD5VJNScYc1UWPDLj+rjuvLuNuCokY8Sff2JRNQDCOHPl/ Ykv5mcFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5nE-00000002J5x-46pC; Mon, 19 Aug 2024 17:03:44 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5d1-00000002Fk5-3HSl for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=Skp4MBtzANehSc3xwk3jIZNUwK Y9a3TRjh9A/1upntodc1CHODTfZagNt4+gHs+LGGbvinNtzmXW5a9clxpyvhbTdZ1PYCxaloWIEzn CtvaoIWheA70OCqNcXCpfsJXRq4szRUDkZF6ohEhypn0VHFn4zq6rYu1fROr/p0RuB8sRnxGvmyPr CVXRAWaIi/AhHp8mQQEqFaHYn0hmYfm9qZRfTGrSof2r1A99HvMbaQ6TyeG+fnM+3zYOOu1o/uPYu eS/EpGktTcsXRp/xdXp1uar3O/aVnmssS5qQtJZHv9voHp0oqyjq2VSKlVUYw4gS8VZW6oj6n5+B+ NxoiQ+NA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5cy-00000009AxB-2SKo for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=hiLheg1k8cZl6XX8/rkov5loX8nwBs9XF1YEiihV9lU45OkWp6i7l6NzzMqK+vnjkLHCCq c75WzBkHWoWL49RM4XcJEf/r9rkst+a9ckFl3xobPraaH5ed07dJ2vxLSYtknj64NN41jY c1A7iLOWRsdixk25C2n6nZ10TOe7y4I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=UHy0gcuubErs70p+LixVsVURrCz1kc/IwRIRI/MwMjwlW1QHEdT3a0mqTeTUSeFRMW/arO e/E5WLT+cqgPXMgbGuvN5nPl3xrl3IOnzKrlB2BKIK0hOlOgzcJhcGGfm2VAEqMAMV0RJC F3CM5DzzFWF0t1ARKMwn4t/0/vPOSt4= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-583-U8WDxatbPO-FCu2EpefPmQ-1; Mon, 19 Aug 2024 12:52:57 -0400 X-MC-Unique: U8WDxatbPO-FCu2EpefPmQ-1 Received: by mail-ot1-f72.google.com with SMTP id 46e09a7af769-70954de6142so891645a34.0 for ; Mon, 19 Aug 2024 09:52:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086376; x=1724691176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CY9vOmK/BQyCj3xBb0Ms143MMS/6lF8CP2tePbnpXiU=; b=q4XKn0xEEcqIccBvBkM5okCOYrkRwa9glCkUk8ZGRSl4+inFa5PW+XM6vqAvoNzGP+ Zx8cMkxIvxEcrrCgSaS7Y+qMU6vfmsmxcs0wOLAwGnDI1H6Y9pEqS7EBhJC39b+B1P/c CXgU3jmTgOI/xoUafknSqeCpRSkDyW9/em2rt5G2NNYAZIoB/OugLb0G4NaHIpsTRne5 WTu0fQ3S7rUeDz61E/Ruf1KdA5q4N7qmUtlQHztW+MpH9FY3jaexlAA6Hz8qtp9LVU16 Y0C85deime1R8hrxmvD+9fIqboYG4uZDPl0Ek2CvvaxrLovQmC7QHzZrL9Cji1dspzDl aCbg== X-Forwarded-Encrypted: i=1; AJvYcCVW7TzBjifoZmuWZZZ/oL/3XTH8eXYINWEtkymCyRfoSa20hkvvHlo6iimXx+0uCjgZeQKp16HqXanEXq+ghtWH@lists.infradead.org X-Gm-Message-State: AOJu0YzmfvI+dqZsby16jJGaXqhiOhMxXNM9Q0CFnPM60WA7lA/1rJK6 9jsjQRueDaBJXUTLdcfMKm+N+h1JzHm98vacEqOQFnTtsgvtMB2P1aNt7/V2GXC8Veh3RR1Nd05 Ed3In9K7nFZpcojmU+i8JVkSIKcls24SkpzM7rkZrM/smNxHWLmhYz80z1Vk5u8vXHAPAQ84r X-Received: by 2002:a05:6870:41d4:b0:25e:c0b:82c5 with SMTP id 586e51a60fabf-2701c380dc5mr6625338fac.3.1724086376412; Mon, 19 Aug 2024 09:52:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEXYRQHubDVB9l/Z5ACuWzvup4NaPaNsF9PV71SRQNM7kqNduzsiPOCl4z6zHTU6tKe3mmKcw== X-Received: by 2002:a05:6870:41d4:b0:25e:c0b:82c5 with SMTP id 586e51a60fabf-2701c380dc5mr6625317fac.3.1724086376107; Mon, 19 Aug 2024 09:52:56 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:52:55 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 5/9] gpio: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:45 +0200 Message-ID: <20240819165148.58201-7-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175309_028167_550EFF07 X-CRM114-Status: GOOD ( 13.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace those functions with calls to pcim_iomap_region(). Signed-off-by: Philipp Stanner Reviewed-by: Andy Shevchenko Acked-by: Bartosz Golaszewski --- drivers/gpio/gpio-merrifield.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c index 421d7e3a6c66..274afcba31e6 100644 --- a/drivers/gpio/gpio-merrifield.c +++ b/drivers/gpio/gpio-merrifield.c @@ -78,24 +78,24 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id if (retval) return retval; - retval = pcim_iomap_regions(pdev, BIT(1) | BIT(0), pci_name(pdev)); - if (retval) - return dev_err_probe(dev, retval, "I/O memory mapping error\n"); - - base = pcim_iomap_table(pdev)[1]; + base = pcim_iomap_region(pdev, 1, pci_name(pdev)); + if (IS_ERR(base)) + return dev_err_probe(dev, PTR_ERR(base), "I/O memory mapping error\n"); irq_base = readl(base + 0 * sizeof(u32)); gpio_base = readl(base + 1 * sizeof(u32)); /* Release the IO mapping, since we already get the info from BAR1 */ - pcim_iounmap_regions(pdev, BIT(1)); + pcim_iounmap_region(pdev, 1); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; priv->dev = dev; - priv->reg_base = pcim_iomap_table(pdev)[0]; + priv->reg_base = pcim_iomap_region(pdev, 0, pci_name(pdev)); + if (IS_ERR(priv->reg_base)) + return dev_err_probe(dev, PTR_ERR(base), "I/O memory mapping error\n"); priv->pin_info.pin_ranges = mrfld_gpio_ranges; priv->pin_info.nranges = ARRAY_SIZE(mrfld_gpio_ranges); From patchwork Mon Aug 19 16:51:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768731 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC547C52D6F for ; Mon, 19 Aug 2024 17:04:35 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=Fk+OBrB7xhwVXk3fJfXCLhZ6LK JOzHZv+H7bOSNG+I6lK1KS5TDTiQSsmFYUGLTav0aSJ324JuQ7zp0VKiZKiG2QE0x9FsNBmNuMqMJ adW59H7dNK8+FB2MF3PiRf31QNgaXC0eoyKe2htpzZNAQptAziT+oHt4bp+yynnihraQZmgXkbCe6 egGSTCpjXa40Sb0WTK4/kHag5KVi0b9SVQeQvUK4j6nvEs0ixBc+2DXKNWvruyZNQaaVgNY6V+aIQ 00VHKhyFtoCZBmXaFXSIJmvbddlHjHge+AoHmo0KxYkzVmUryIem3IKWWRBklp50OwnmmzMus0mAj 3UE6iuXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5ns-00000002JIA-3He3; Mon, 19 Aug 2024 17:04:24 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5d9-00000002Fmn-2Mfh for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=KZyi1d19vMWFey4Off17xqFjDk Z+kSq+9wEfZDyv4uS2hdT0ydboX/p719BA9F5m/XqQXZAQgYAKxgaDot5x2OaCWK84UC6KGy23I0L NGCLbsqEqfGmopQkLrmi2f1Br6fRX4bQGhXr16PuWb65SdtCw6gs8chrlrcoqmVbtkyhYmZYNsZ1V VQpV0MdmTXdzylfRSzbUgK1anxi/4wKlU+jN3fdsRs1WsGFcC1Aokadl6q+YrTZ4wHSLeQHLhuJeS uRzsFkq9NSrzSSNMaFc5Lcr+e6lUwZ0iME3s1hZdDv0F4BMs0zz/99V946sEQrbhYAAkjDqWoziAJ oVkatheg==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5d5-00000009Axk-2nQS for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=NzAor+PGnf5+WT5iIc0xg+OQgtqnYC3NpKboFMK4u6nRXoaH3lYfZ/xi2zaFNls9F8Vkcf m1Mo7zQWoWenwQPJOvyi/TB1ehcsQKPwvGnW52BAjn8gC8tca+787Tmo3EAx5kXy+nRMZY tmziglT62CVx9N9SbrSZa1ymZgZEdBU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=cPt+reKj/gzahOH2p/g3jvrJfUWAhPIRhPiMpppbTq0Z9kGoHALvMvI5zoI3A0f+EfWoc+ oIaMahQd+xGmniq7mVqWFDpWt4DdTHsp6COCc3NkpyTZw+hcar7gilsWI4lXKwaS5eiJOE wzhhCH4rOO72iUCvGMRrZ7xwFFonKNU= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-61UdRns7OReRnlNdcwvHDw-1; Mon, 19 Aug 2024 12:53:02 -0400 X-MC-Unique: 61UdRns7OReRnlNdcwvHDw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-7a1d6c57f9fso9258685a.3 for ; Mon, 19 Aug 2024 09:53:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086382; x=1724691182; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AJtm3uYD4inmsDECmrMxkvS6gTo4VXXtBuq4LxNQ/Aw=; b=qTcX8HBYeflvSxdcfZqtExwEPVVXfAd9qqWC2x0ABlOBCTxcV4C6QmZwqEUYzBdWrn 04sSWgcvKvmaQSCRt13R2j+5euaeRnrx2UiEHS/nvhUUcOFtXRktO/Y55R+mtP91LHGb 28XIgzMMglnxm/ccvHgrrX4JBWqtH/M6KWxyG/sZYVqZVfuK7NgG488HzU0QJpX+aVwm lspVGvmBuhUta9Wd3BsvzA8HgEA+t3Q7K/96aQhERjZ79wQUbzu0+jyJ76XQHnxHZTdq vVeV2xjqhaUJ3dMVl+sntOLsXDN/ZwiDBZMFZiWHi4yeLXBK7vLo1CKp2X6GtCCI84i3 aZCQ== X-Forwarded-Encrypted: i=1; AJvYcCXgF/kRo7VmQYfsjWSQV2KxHjLW5BNhE848Uf2tQpOZL9YejFpdLXnkYDJoqWhF+hOBC5vvn3dqB5UkyOEAcfLH@lists.infradead.org X-Gm-Message-State: AOJu0YwQi5Bc5hH+iaRVvGtzUd7zCYvh0sUleehlXBpqYm+nzckdVL2i hSWT6s9kaPY9VmSIhqLTCYksqIx4TvSQzyBqDjMGv5M2wnyPZW2k/q0MA9fEuLND1EAswXtEwbK y4CAHE2VH8g9VAL6j5gS+vvqfObzYUH8iLxAQdWJb1IclPSUCkZ3HszyhOiKCPuYEBlj+b/kn X-Received: by 2002:a05:620a:17a6:b0:7a4:ee81:b81 with SMTP id af79cd13be357-7a5069097d7mr907155185a.2.1724086381784; Mon, 19 Aug 2024 09:53:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHM6gYVZPDs45ylp2PC1pdcluR4bdODQrU3S0OZZmC5BxWlFh+hxwevOPD/dWhGJl7MG9Gdkw== X-Received: by 2002:a05:620a:17a6:b0:7a4:ee81:b81 with SMTP id af79cd13be357-7a5069097d7mr907153385a.2.1724086381333; Mon, 19 Aug 2024 09:53:01 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:53:01 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 6/9] ethernet: cavium: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:46 +0200 Message-ID: <20240819165148.58201-8-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175316_138971_DA8B5A6E X-CRM114-Status: GOOD ( 13.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with the function pcim_iomap_region(). Signed-off-by: Philipp Stanner --- drivers/net/ethernet/cavium/common/cavium_ptp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c index 9fd717b9cf69..1849c62cde1d 100644 --- a/drivers/net/ethernet/cavium/common/cavium_ptp.c +++ b/drivers/net/ethernet/cavium/common/cavium_ptp.c @@ -239,11 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev, if (err) goto error_free; - err = pcim_iomap_regions(pdev, 1 << PCI_PTP_BAR_NO, pci_name(pdev)); - if (err) + clock->reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev)); + if (IS_ERR(clock->reg_base)) { + err = PTR_ERR(clock->reg_base); goto error_free; - - clock->reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO]; + } spin_lock_init(&clock->spin_lock); @@ -292,7 +292,7 @@ static int cavium_ptp_probe(struct pci_dev *pdev, clock_cfg = readq(clock->reg_base + PTP_CLOCK_CFG); clock_cfg &= ~PTP_CLOCK_CFG_PTP_EN; writeq(clock_cfg, clock->reg_base + PTP_CLOCK_CFG); - pcim_iounmap_regions(pdev, 1 << PCI_PTP_BAR_NO); + pcim_iounmap_region(pdev, PCI_PTP_BAR_NO); error_free: devm_kfree(dev, clock); From patchwork Mon Aug 19 16:51:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768733 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49F1EC52D6F for ; Mon, 19 Aug 2024 17:05:58 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FEnCsYi4V2PnChy33tc28SWivSiMlK/Z32Tet3XvGFE=; b=Js9YEngm/slndGMhIjUOVXuyeK qA3KcPdewO/0nHfhIU4FUx/l6mpJ0pv9ujWyVRAdA+O5IZC5g/Vz1FBG3lNzpeWTBxB5unr8tMdb+ +ahVExwcksOQ+hQp7NwGzmwincCyZMCvsM/R9WKk8bXWOV0Hx9IzN8dpr4zQUgWPkog1dUfudceWh rOQXlooM1vt70HrCVrc1xkgvvABRKBY7mgREPaFsFBS7SoRiy6zGKNABke+LNAISS8TbwY/esST/m d09tyThJih3Eu9IdNuCZKc7U9MSdBWhJDLzQm8+LTKD1dSz9TjUbQmNyAnxfM3N95IclnxWtELJxq L1S89MZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5pB-00000002Jcb-31hH; Mon, 19 Aug 2024 17:05:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dE-00000002Fod-0vsz for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=FEnCsYi4V2PnChy33tc28SWivSiMlK/Z32Tet3XvGFE=; b=XGdxsK5espgVp1vMtRd6/sJXEv wi22juyW4HwcBsSn8Bg/4o123s7yJmApjuq4VKZM1DfGWqAQNNa9bu3SxK+uBpROcbDhAW4ZU7/xa HoHJ+OCWh8UNxfBjwIYhVmb4D5rO08SqXKR44U/HMBp31Y5W2y1TnHzWo1JAwIlqQAtbA5NeAcZcY 9CuALSamsq4mJbX8pLRBzmGzOnUH1bGLFtISQbNE9vzriOlYbjmys2gJIVAuMg676DoWSI1Wr7NVW gwiDsbX5Z8Om1Au2e6C56QrmT86wIW/YhUwPTntHAbeMNiucJaFrFJ2LOgBsSfmAFZC057RA2di4a ni7WvdoQ==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dB-00000009Ay4-16Bw for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEnCsYi4V2PnChy33tc28SWivSiMlK/Z32Tet3XvGFE=; b=IQKIkNBIprTtPSgK0nXH1ah8qZHgqTHw4MHL/oBqcq57ww0y1OvQkVkjxrOLD2Afn8X9sr wCbEeItB9vEeySgOUt1EVjYszVF1qH0nxsOhj7ALIa4jORY8kWX3QfDVgjnje51osrLpob vAOKGaXPHusXJa/w3RIqfd+nIw4H/ak= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEnCsYi4V2PnChy33tc28SWivSiMlK/Z32Tet3XvGFE=; b=eh2ezmrq4T8j7fNygCa/8937Nst4eDn+SzibvpqpkYpFQp1pyiHIrO4z//FzqekNMmhMLd FTR0KfkglzeGEmL7b1rMAD3qqPg8RwfrpYHDPSq9Jpf1olTEIkrxxn3aMGsWxMJN3p+nPF kaRJvyWO5eN3KuixqPDaZ+287cusQrE= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-384-DclgJVS7OpW64Xa4R6youQ-1; Mon, 19 Aug 2024 12:53:07 -0400 X-MC-Unique: DclgJVS7OpW64Xa4R6youQ-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-44ff44e2f9bso3520891cf.3 for ; Mon, 19 Aug 2024 09:53:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086387; x=1724691187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FEnCsYi4V2PnChy33tc28SWivSiMlK/Z32Tet3XvGFE=; b=pT+LRFuuJJ0fF/v24Yu72x83PZGFcU8uMBwz2Pd+50qz8rZwbF0v1s3hZSdUqZEwE9 nI1Us5KHcdcqZbxpsd3wwRti1GoeiXWp9JQKl0LbUBLVkQ8XDgPTsnJ7ITrIYDDeP7sH 7fxw9irwvI3MW7UainM3w90oyU6HYZ2Rpq0fRLoa2/0RrwRXqic06AswaCQk5VmdzQOj jfWy8ssxGrt/xm88asuL70DOKO1ch/25p9FdPuSM2gjbtyTdqiu64FkPAiC0vTO5r9e5 E+bhUDz7YM4ZDOdRjicgQj3iNIxbCTTsUQkJJRXKSIEdyFyazMHXDUM7qy6MZ6EBf6Bh kMiA== X-Forwarded-Encrypted: i=1; AJvYcCVB845DnFCvGbqeTEyujkWiAjfQgr4jKOpu/kCMO2LPYL4AM8jDlgO550IOoSAzP+vYiIweXYRxzGzcAZXFuJZB@lists.infradead.org X-Gm-Message-State: AOJu0YzFYlv64/MR1w75+4N5mfvbZx/B//o4s0/0HV3k/xmPjqDgoCpF Mr8blr5FWSw9U9pa7WygBDsTTHa8Cn675DYLTnLPMqp4jzIVQsW/mBLiH6D38VbgpSjVoLldZ04 Paev+ww1bmsTR3kSFW1z6/UPwE01WAlv/M24fdXpKNwb0tQ+X9Xnn5gcVSiefLMg1iWkJvZQT X-Received: by 2002:a05:620a:3d08:b0:7a6:63fb:4303 with SMTP id af79cd13be357-7a663fb45efmr80658585a.10.1724086387003; Mon, 19 Aug 2024 09:53:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFwAS0GQz5LBMkiUgj/6m4b5lAyO39MsqxfVGWbhZ8+Xeosey0/oxXphrfuUeFGVc2AzYTAHA== X-Received: by 2002:a05:620a:3d08:b0:7a6:63fb:4303 with SMTP id af79cd13be357-7a663fb45efmr80656985a.10.1724086386639; Mon, 19 Aug 2024 09:53:06 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:53:06 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 7/9] ethernet: stmicro: Simplify PCI devres usage Date: Mon, 19 Aug 2024 18:51:47 +0200 Message-ID: <20240819165148.58201-9-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175321_521551_36BCF7D8 X-CRM114-Status: GOOD ( 19.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org stmicro uses PCI devres in the wrong way. Resources requested through pcim_* functions don't need to be cleaned up manually in the remove() callback or in the error unwind path of a probe() function. Moreover, there is an unnecessary loop which only requests and ioremaps BAR 0, but iterates over all BARs nevertheless. Furthermore, pcim_iomap_regions() and pcim_iomap_table() have been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"). Replace these functions with pcim_iomap_region(). Remove the unnecessary manual pcim_* cleanup calls. Remove the unnecessary loop over all BARs. Signed-off-by: Philipp Stanner --- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 25 +++++-------------- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 18 +++++-------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c index 9e40c28d453a..5d42a9fad672 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c @@ -50,7 +50,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id struct plat_stmmacenet_data *plat; struct stmmac_resources res; struct device_node *np; - int ret, i, phy_mode; + int ret, phy_mode; np = dev_of_node(&pdev->dev); @@ -88,14 +88,11 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id goto err_put_node; } - /* Get the base address of device */ - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) == 0) - continue; - ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev)); - if (ret) - goto err_disable_device; - break; + memset(&res, 0, sizeof(res)); + res.addr = pcim_iomap_region(pdev, 0, pci_name(pdev)); + if (IS_ERR(res.addr)) { + ret = PTR_ERR(res.addr); + goto err_disable_device; } plat->bus_id = of_alias_get_id(np, "ethernet"); @@ -116,8 +113,6 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id loongson_default_data(plat); pci_enable_msi(pdev); - memset(&res, 0, sizeof(res)); - res.addr = pcim_iomap_table(pdev)[0]; res.irq = of_irq_get_byname(np, "macirq"); if (res.irq < 0) { @@ -158,18 +153,10 @@ static void loongson_dwmac_remove(struct pci_dev *pdev) { struct net_device *ndev = dev_get_drvdata(&pdev->dev); struct stmmac_priv *priv = netdev_priv(ndev); - int i; of_node_put(priv->plat->mdio_node); stmmac_dvr_remove(&pdev->dev); - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) == 0) - continue; - pcim_iounmap_regions(pdev, BIT(i)); - break; - } - pci_disable_msi(pdev); pci_disable_device(pdev); } diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 352b01678c22..f89a8a54c4e8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -188,11 +188,11 @@ static int stmmac_pci_probe(struct pci_dev *pdev, return ret; } - /* Get the base address of device */ + /* Request the base address BAR of device */ for (i = 0; i < PCI_STD_NUM_BARS; i++) { if (pci_resource_len(pdev, i) == 0) continue; - ret = pcim_iomap_regions(pdev, BIT(i), pci_name(pdev)); + ret = pcim_request_region(pdev, i, pci_name(pdev)); if (ret) return ret; break; @@ -205,7 +205,10 @@ static int stmmac_pci_probe(struct pci_dev *pdev, return ret; memset(&res, 0, sizeof(res)); - res.addr = pcim_iomap_table(pdev)[i]; + /* Get the base address of device */ + res.addr = pcim_iomap(pdev, i, 0); + if (!res.addr) + return -ENOMEM; res.wol_irq = pdev->irq; res.irq = pdev->irq; @@ -231,16 +234,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev, */ static void stmmac_pci_remove(struct pci_dev *pdev) { - int i; - stmmac_dvr_remove(&pdev->dev); - - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i) == 0) - continue; - pcim_iounmap_regions(pdev, BIT(i)); - break; - } } static int __maybe_unused stmmac_pci_suspend(struct device *dev) From patchwork Mon Aug 19 16:51:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768734 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3854C3DA4A for ; Mon, 19 Aug 2024 17:06:37 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=abZiwvPf4gC19vxFT17Sz8slSRtUXISkEhAwbNUMlrw=; b=PBBHYtF1wdYn7RYb8KuFLw1uYf L+tcCBRkZLV0QXpm9f07x67YMegEYtCVYEIBnnYn+GibpiMLoh/BLp8WyrJuL0I6+wsS9IOzpuHBr 9sTf6TB5Q1GT+EuNCxaZmri5lo5szFl/wJncyOEDXz8PyIER89Q20Yqtbtt4oRfXSVolbG7MWeKqi pE5sT8JcgZa0ZJb2tAuvXGgLpygyYOy+edmffoVfV8jCnKWQ4T3hBx2IaxTPYNrFFyTSAdelBKLOA jM92ES5E6N+qch6tHMzSqfegXzCzRmf/FyzDbfl8qWEWPiCm9NvL9vH4htuN08X9GtSqZ5JCU3OAi MGfEjs8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5pp-00000002Jom-2Huv; Mon, 19 Aug 2024 17:06:25 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dF-00000002FpF-2WSg for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=abZiwvPf4gC19vxFT17Sz8slSRtUXISkEhAwbNUMlrw=; b=kkjWa0ira3jBaB2fsY8QAxK0TG tkcKOZGgj3SCHFqUUJY1vgdUqtSGuAfLN8kWnoP+A6xzK8QQ0jsZiDHFwLBfpBYWrHTcjKKn9BhVI Z17mHxYJbACiNjisdVqND81pEDpN9E46uFh2w9SbNaEkKOKs6bs2T3pVk/bJ8/W9Ov9IFKyPcMBCr 8cvCJp+m3kiUN9namHLiebpSkzKdFW2m4tOXsCLb+wFeJRAYfc65BkQQOf9Zcc5tA2RNh5KSU2yQ2 Ar7+1kPXm6BhUjiwxnSQVzCBkXZc70U1rbDfTNwcyXVL9xVk5hd+lWVzIVyi2lEb3JL9pHYoDW/+V 6YmlIVNA==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dB-00000009Ay5-3WKp for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=abZiwvPf4gC19vxFT17Sz8slSRtUXISkEhAwbNUMlrw=; b=jHEosUDaYifn+Ib8dZE0Kf2u7oL3JJsB3kc9nht8ZBXoqYGpo6wjgxrbWcQmsc8QeqQNWz qaoQJ9qGgxK5QuYalpxO+w75hndqL5VRMJj4hDLOEGcq+wJkWWWGm9uVIrOYePD8Zo2rB2 Z4jJ71/qaXpBrwdCLGvV2woVkTMVDEI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=abZiwvPf4gC19vxFT17Sz8slSRtUXISkEhAwbNUMlrw=; b=E8vZQWYFNZGNoI+phuPVzqZF6X3k5u30Kj4FRqWaEnwWluXoOaAqT2Wo4Da+U0RROlSd+U xTkTQAk7R4n9twZ8gWGddsK393nQv6rTW24RwRiE6OCItas+m4rd1Y1IYiIEdxjEkjH//1 dIpm+mBX84aXydY/gNRr61LLxrlq55w= Received: from mail-vk1-f199.google.com (mail-vk1-f199.google.com [209.85.221.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-PBYGXrP5MZKheQLV3PmPsQ-1; Mon, 19 Aug 2024 12:53:13 -0400 X-MC-Unique: PBYGXrP5MZKheQLV3PmPsQ-1 Received: by mail-vk1-f199.google.com with SMTP id 71dfb90a1353d-4f5111f666fso188781e0c.0 for ; Mon, 19 Aug 2024 09:53:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086392; x=1724691192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=abZiwvPf4gC19vxFT17Sz8slSRtUXISkEhAwbNUMlrw=; b=vLzFXAhiBau8xRiX4y25zCmQP7AC3oIWNJNFsskCEKr5lxmgDp3BxEYqzZdLOnon25 +JcjE5JYMwBO4zpeR+BgYIqWSeZLV75yzMAOU1biW5NNmJ3CBkx/WR45YhQp2ANWAGsF xwlUYnRQe/fWCX21ISy6EaNubBqTn3EpzFQDRuLJNzDcjdyQUsKkl9yEmzP1pHGjazJi wtke8xVS2hTGkvnhorW+CS7BbdVPRS1tZrs5YuSDyOxDsIER0FPKpdRA2FaZ61m13Gfm KxiWg+rXw4ogQP1QhX1+hNyWrfytj0bAhLIXwGKsnLQOAfMXRAxCTN69eLYBuBsIJTa3 Pwow== X-Forwarded-Encrypted: i=1; AJvYcCVSYgYc9zx9SD5YjtQk6QeOL1DtAbqT3g5mqf++kw8uLNXk29tqfZKmTxLMwWzmBMwyuakl2b7kYPZP/eKUp9+k@lists.infradead.org X-Gm-Message-State: AOJu0YztnUcMzPVrjwY0DWASJLeCHmBscFqeT+uD0q6XDKejLgS5imdp lQZKoeF+sWJZsy33SVQ6WlxX08bmymWJm79obW7UQ3dRLM0DPMVP65cbeg7ZGCoV5K9ZSmIALF8 yq8FZ2BZP/VpRo/wV/8vfjbijos3UJFTpkEOfjSn9QJBp4p5vS6srO2zb+BsvZ9WkcthMZSI3 X-Received: by 2002:a05:6102:5127:b0:493:bb70:940 with SMTP id ada2fe7eead31-4977992674fmr7984167137.2.1724086392206; Mon, 19 Aug 2024 09:53:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSFSVYmUjqgNVHiq1+h9E7HGJis8qQ3DMxEZS8Skowa7KMQsueVdBGNDdQuxxSfXwtk0QtBA== X-Received: by 2002:a05:6102:5127:b0:493:bb70:940 with SMTP id ada2fe7eead31-4977992674fmr7984139137.2.1724086391863; Mon, 19 Aug 2024 09:53:11 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:53:11 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 8/9] vdap: solidrun: Replace deprecated PCI functions Date: Mon, 19 Aug 2024 18:51:48 +0200 Message-ID: <20240819165148.58201-10-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175322_115818_B5693963 X-CRM114-Status: GOOD ( 17.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org solidrun utilizes pcim_iomap_regions(), which has been deprecated by the PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate pcim_iomap_table(), pcim_iomap_regions_request_all()"), among other things because it forces usage of quite a complicated bitmask mechanism. The bitmask handling code can entirely be removed by replacing pcim_iomap_regions() and pcim_iomap_table(). Replace pcim_iomap_regions() and pcim_iomap_table() with pci_iomap_region(). Signed-off-by: Philipp Stanner --- drivers/vdpa/solidrun/snet_main.c | 47 +++++++++++-------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet_main.c index 99428a04068d..abf027ca35e1 100644 --- a/drivers/vdpa/solidrun/snet_main.c +++ b/drivers/vdpa/solidrun/snet_main.c @@ -556,33 +556,24 @@ static const struct vdpa_config_ops snet_config_ops = { static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet) { char name[50]; - int ret, i, mask = 0; + int i; + + snprintf(name, sizeof(name), "psnet[%s]-bars", pci_name(pdev)); + /* We don't know which BAR will be used to communicate.. * We will map every bar with len > 0. * * Later, we will discover the BAR and unmap all other BARs. */ for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (pci_resource_len(pdev, i)) - mask |= (1 << i); - } - - /* No BAR can be used.. */ - if (!mask) { - SNET_ERR(pdev, "Failed to find a PCI BAR\n"); - return -ENODEV; - } - - snprintf(name, sizeof(name), "psnet[%s]-bars", pci_name(pdev)); - ret = pcim_iomap_regions(pdev, mask, name); - if (ret) { - SNET_ERR(pdev, "Failed to request and map PCI BARs\n"); - return ret; - } + if (pci_resource_len(pdev, i)) { + psnet->bars[i] = pcim_iomap_region(pdev, i, name); + if (IS_ERR(psnet->bars[i])) { + SNET_ERR(pdev, "Failed to request and map PCI BARs\n"); + return PTR_ERR(psnet->bars[i]); + } + } - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (mask & (1 << i)) - psnet->bars[i] = pcim_iomap_table(pdev)[i]; } return 0; @@ -591,18 +582,15 @@ static int psnet_open_pf_bar(struct pci_dev *pdev, struct psnet *psnet) static int snet_open_vf_bar(struct pci_dev *pdev, struct snet *snet) { char name[50]; - int ret; snprintf(name, sizeof(name), "snet[%s]-bar", pci_name(pdev)); /* Request and map BAR */ - ret = pcim_iomap_regions(pdev, BIT(snet->psnet->cfg.vf_bar), name); - if (ret) { + snet->bar = pcim_iomap_region(pdev, snet->psnet->cfg.vf_bar, name); + if (IS_ERR(snet->bar)) { SNET_ERR(pdev, "Failed to request and map PCI BAR for a VF\n"); - return ret; + return PTR_ERR(snet->bar); } - snet->bar = pcim_iomap_table(pdev)[snet->psnet->cfg.vf_bar]; - return 0; } @@ -650,15 +638,12 @@ static int psnet_detect_bar(struct psnet *psnet, u32 off) static void psnet_unmap_unused_bars(struct pci_dev *pdev, struct psnet *psnet) { - int i, mask = 0; + int i; for (i = 0; i < PCI_STD_NUM_BARS; i++) { if (psnet->bars[i] && i != psnet->barno) - mask |= (1 << i); + pcim_iounmap_region(pdev, i); } - - if (mask) - pcim_iounmap_regions(pdev, mask); } /* Read SNET config from PCI BAR */ From patchwork Mon Aug 19 16:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13768732 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2928C3DA4A for ; Mon, 19 Aug 2024 17:05:17 +0000 (UTC) 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-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RIGjmIxgd4ZYoEGhHZhEaO790wvl9zuuKnu8/dcY7mY=; b=1T1kIv8QgGvzbp4Z/T8ju6eoDS 0vNfobi7lTI7MmHpVawk4MhkYkCkG/YH3SHjPjRSfx4ODEFKezErwednpnVdQBvGvWaEsP/btDkns mw7pDhF1h63n2uoIvSq78z8TeYGzq+hbj9cuD0B8BDyUUbvP6NF4D2UQDWtWfWoBb3ogxVk+HRgOH tGi9kFlS1Ga+p0r+Kip6FhewyZn+lJ1zeUMVlRwWGH/ftYsiTAoj9VkSWtZE2LUtEBTFZbH5/JPlu xQBfIp1yKDrNQf6UNhZN0Jjc1fABJZG6tsfiPyaaHtC1ClPxLCIQJ4L3FgV7Pew4t5ENoCGq89Z7G SAAZE9TA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5oW-00000002JSL-2kIl; Mon, 19 Aug 2024 17:05:04 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dD-00000002FoZ-4AwX for linux-arm-kernel@bombadil.infradead.org; Mon, 19 Aug 2024 16:53:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=RIGjmIxgd4ZYoEGhHZhEaO790wvl9zuuKnu8/dcY7mY=; b=h4GbjgQk+aPKRlbUlOBeRmEkK5 yPRbB3NvKM3QLzElvf3TNFpZ2rMCHeN4evbWAk0YEW80v2w8p4eVmZuIYZVGxXEx+/Fcr0sxMFe9G MdTxIJg03RukN1IkDkOdVPjqzlxvDXYF4wXLY+8tVmskB/PYkrBU2mavZ9ryuciJeNbOU/8JshXC0 zewNlRjf1W+Sh/fuisCeFg2Oeysx98a3WBNZwrupGNCYgtl8QlKIx6674fIlbAYWiQ2FHM5bqugBj 73ZQAlwcUkLlWoXMaM6i9vJdsn+oA6NnJq5a3rkr2NTkfMv4wCMDjLi5S+lC8Y04dAUtzTE+tLFaz vyFT/02A==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sg5dA-00000009Ay2-2szl for linux-arm-kernel@lists.infradead.org; Mon, 19 Aug 2024 16:53:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RIGjmIxgd4ZYoEGhHZhEaO790wvl9zuuKnu8/dcY7mY=; b=KrqH+I+HXDg5g58XI9cNLuI5HSJaZBIxxbaci/hUq6x4JLpUfNzeZExMqcPjLlndvdTO0z 80lZIQ6/Rvr/TaZ/dH7kYAdJaBWU4LaKqpVnHZbUixFQo+v6aiQRXEB+2/JjIgwOfAJiGI TiKbV/FMcybeMMi1zQN0Dkeby1p9Xuw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724086399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RIGjmIxgd4ZYoEGhHZhEaO790wvl9zuuKnu8/dcY7mY=; b=KrqH+I+HXDg5g58XI9cNLuI5HSJaZBIxxbaci/hUq6x4JLpUfNzeZExMqcPjLlndvdTO0z 80lZIQ6/Rvr/TaZ/dH7kYAdJaBWU4LaKqpVnHZbUixFQo+v6aiQRXEB+2/JjIgwOfAJiGI TiKbV/FMcybeMMi1zQN0Dkeby1p9Xuw= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-580--iSw85Y-PAesZTQzMdqgGw-1; Mon, 19 Aug 2024 12:53:18 -0400 X-MC-Unique: -iSw85Y-PAesZTQzMdqgGw-1 Received: by mail-oo1-f71.google.com with SMTP id 006d021491bc7-5d5cef4a643so956622eaf.3 for ; Mon, 19 Aug 2024 09:53:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724086397; x=1724691197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RIGjmIxgd4ZYoEGhHZhEaO790wvl9zuuKnu8/dcY7mY=; b=D2Tb2jD4TzJcSmW8bn2Quh1wAVqooyWgL7IGU5Dm8WgUEQfOvyzKfvis7TrkdNPXET z78ugkhV+Nun9ap3nXVspS+v/zuaFo4gFmUuQHOmTOm7fhg9UM/OUU3WWTPu8+3IJLYE 2R6xaLIecrZHi0DxJlazPXkEsYbNv+cqJuM02mqbseCYsUSjOhW7QJH/S4WTqyWeVNKY 0d/saBgpfDT1GonpL6eBuU3hf1KMRPEElILOitPQArFuL3U+mFkNQyDvRIGLn1XGYgHT h5/FCpH2V9xRAr/CtKvIVOOezcSnbL2zPwneNf4amFMdGCrJrVPxPGqL+MDVdFj6DPPM RUew== X-Forwarded-Encrypted: i=1; AJvYcCVjzyjqpXNH7lY4JaDUQP7XGUoy0GAbQAY9cvO4V0yAd5MrlTBxVhGBETc3aNLgbKW5CInKqIpBDsdfDmlSICci@lists.infradead.org X-Gm-Message-State: AOJu0Yzgor0LBU47Ik4RMHd/BoG4TY1Tree/dr3iVlp7STayzcb2D57y iOQgYcahpZrhNEv3q5AJ+VvrNuaK18dUJ8sCn47ygZ8ISw5WjRgGEuDub1G0keWGiGIsX29VdVE IicgqDVpHMLf6NXBpd7UPw13SqNIyB0RQX2MF73Vlmk3bDIEcxsXPjGGAtTgKEhDJmai8BFVL X-Received: by 2002:a05:6358:6f15:b0:1ac:a26c:a617 with SMTP id e5c5f4694b2df-1b3933a2ef4mr724904055d.5.1724086397485; Mon, 19 Aug 2024 09:53:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGT/mWFQ9yoQUfbebPKob1DsZxH+iTK/HwcCt5JWpV0k06WRkWCd30wgdmfipghSMnyk6p9TQ== X-Received: by 2002:a05:6358:6f15:b0:1ac:a26c:a617 with SMTP id e5c5f4694b2df-1b3933a2ef4mr724898255d.5.1724086397091; Mon, 19 Aug 2024 09:53:17 -0700 (PDT) Received: from eisenberg.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4ff01e293sm446579885a.26.2024.08.19.09.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2024 09:53:16 -0700 (PDT) From: Philipp Stanner To: onathan Corbet , Jens Axboe , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Bjorn Helgaas , Alvaro Karsz , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Richard Cochran , Mark Brown , David Lechner , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Jonathan Cameron , Philipp Stanner , Hannes Reinecke , Damien Le Moal , Chaitanya Kulkarni , "Martin K. Petersen" Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fpga@vger.kernel.org, linux-gpio@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev Subject: [PATCH 9/9] PCI: Remove pcim_iounmap_regions() Date: Mon, 19 Aug 2024 18:51:49 +0200 Message-ID: <20240819165148.58201-11-pstanner@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240819165148.58201-2-pstanner@redhat.com> References: <20240819165148.58201-2-pstanner@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240819_175321_149040_2155FF26 X-CRM114-Status: GOOD ( 13.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org All users of pcim_iounmap_regions() have been removed by now. Remove pcim_iounmap_regions(). Signed-off-by: Philipp Stanner Reviewed-by: Andy Shevchenko Reviewed-by: Damien Le Moal --- .../driver-api/driver-model/devres.rst | 1 - drivers/pci/devres.c | 21 ------------------- include/linux/pci.h | 1 - 3 files changed, 23 deletions(-) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index ac9ee7441887..525f08694984 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -397,7 +397,6 @@ PCI pcim_iomap_regions_request_all() : do request_region() on all and iomap() on multiple BARs pcim_iomap_table() : array of mapped addresses indexed by BAR pcim_iounmap() : do iounmap() on a single BAR - pcim_iounmap_regions() : do iounmap() and release_region() on multiple BARs pcim_pin_device() : keep PCI device enabled after release pcim_set_mwi() : enable Memory-Write-Invalidate PCI transaction diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index 30c813766e8b..a1689100a535 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -1014,27 +1014,6 @@ int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, } EXPORT_SYMBOL(pcim_iomap_regions_request_all); -/** - * pcim_iounmap_regions - Unmap and release PCI BARs - * @pdev: PCI device to map IO resources for - * @mask: Mask of BARs to unmap and release - * - * Unmap and release regions specified by @mask. - */ -void pcim_iounmap_regions(struct pci_dev *pdev, int mask) -{ - int i; - - for (i = 0; i < PCI_STD_NUM_BARS; i++) { - if (!mask_contains_bar(mask, i)) - continue; - - pcim_iounmap_region(pdev, i); - pcim_remove_bar_from_legacy_table(pdev, i); - } -} -EXPORT_SYMBOL(pcim_iounmap_regions); - /** * pcim_iomap_range - Create a ranged __iomap mapping within a PCI BAR * @pdev: PCI device to map IO resources for diff --git a/include/linux/pci.h b/include/linux/pci.h index 7de75900854a..4eee09624932 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2302,7 +2302,6 @@ void pcim_iounmap_region(struct pci_dev *pdev, int bar); int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name); int pcim_iomap_regions_request_all(struct pci_dev *pdev, int mask, const char *name); -void pcim_iounmap_regions(struct pci_dev *pdev, int mask); void __iomem *pcim_iomap_range(struct pci_dev *pdev, int bar, unsigned long offset, unsigned long len);