From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCBF5C433EF for ; Wed, 24 Nov 2021 15:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344958AbhKXPpO (ORCPT ); Wed, 24 Nov 2021 10:45:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:48632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344472AbhKXPo5 (ORCPT ); Wed, 24 Nov 2021 10:44:57 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0CBC6102A; Wed, 24 Nov 2021 15:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637768508; bh=B4KwqLhItoYGnyJ9ogfHgJBcg/G5wxI+LrCO4toFBSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=smfTHi3C0BGbB+Tqh/ucp+n9eBQJakBTr/g9WyHJT4bHTI+7e7kmHjwDrL3dkZibA kvBCQ7h/VfXzR1L/Fjlb2468A7ADDlt+xz/jAqCG39yQpcgRjJiKBlcyDh0UjjfJ7b 5NcW/WxA1AYwYrsO3rqW6OmI2Dsa2a/gVgDjK6KNl6spgubhlZP1TpbF+Ugp3tInxg Ntw+g+mzL/TD9tqwHddURa2qHoValYWcRNdInuqPKPhWt6o+6g+Z/8dJE8vnerrXXr YYrRnmdMLMOBI2bpC1Yx4fnhqoAph1qPZs9Q4qqT0t9C5GmSuVPWBAAXx2ZYY7R1g4 pt2bs24uzZmDA== Received: by pali.im (Postfix) id 177ECB01; Wed, 24 Nov 2021 16:41:46 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Dominik Brodowski , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] PCI: mvebu: Replace pci_ioremap_io() usage by devm_pci_remap_iospace() Date: Wed, 24 Nov 2021 16:41:13 +0100 Message-Id: <20211124154116.916-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124154116.916-1-pali@kernel.org> References: <20211124154116.916-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now when ARM architecture code also provides standard PCI core function pci_remap_iospace(), use its devm_pci_remap_iospace() variant in pci-mvebu.c driver instead of old ARM-specific pci_ioremap_io() function. Call devm_pci_remap_iospace() before adding IO resource to host bridge structure, at the place where it should be. Signed-off-by: Pali Rohár --- drivers/pci/controller/pci-mvebu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index ed13e81cd691..a55b8bd5eb62 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -992,6 +992,10 @@ static int mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie) resource_size(&pcie->io) - 1); pcie->realio.name = "PCI I/O"; + ret = devm_pci_remap_iospace(dev, &pcie->realio, pcie->io.start); + if (ret) + return ret; + pci_add_resource(&bridge->windows, &pcie->realio); ret = devm_request_resource(dev, &ioport_resource, &pcie->realio); if (ret) @@ -1010,7 +1014,6 @@ static int mvebu_pcie_parse_request_resources(struct mvebu_pcie *pcie) */ static int mvebu_pci_host_probe(struct pci_host_bridge *bridge) { - struct mvebu_pcie *pcie; struct pci_bus *bus, *child; int ret; @@ -1020,14 +1023,6 @@ static int mvebu_pci_host_probe(struct pci_host_bridge *bridge) return ret; } - pcie = pci_host_bridge_priv(bridge); - if (resource_size(&pcie->io) != 0) { - unsigned int i; - - for (i = 0; i < resource_size(&pcie->realio); i += SZ_64K) - pci_ioremap_io(i, pcie->io.start + i); - } - bus = bridge->bus; /* -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from 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 3760FC433EF for ; Wed, 24 Nov 2021 15:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id: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=GxgV2BtJonjXOvYvyzc3ri9vrX+K8uzx3hyhobPQm3E=; b=NTkHASniZ3hBBX NI6p0fUb0y+dGrfBwepWZ/l7USA2Tr4GlbPK+vMnKcICYr7U7+foSCgT+niYogvbt3stL9rO5jFAy oL52iyweSnC+VXJqYRzXsJEI8wAp6AH7cIP9K0qTic+Z5TIR2u9H0xbMga3pP6I3o2+ybTBKQpcEu n8wLkscLBx5skYSCg3hZ+o9ylzB/UrJHx0x9jfCIH+lLlPtthXlpmlEmG0BrpscdCV0RK0B8WHzzN 5G7+nl0WeXjUTUiZw2/eZ7nCbVu9gSSPMAp9gnjvkrGjDnRRY0TntoRQWtvz3xHB7o29zsSn8jV5d riQr2eXRVtpyEBGAz4Lw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpuPi-0057Ko-N9; Wed, 24 Nov 2021 15:42:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpuP6-00579M-Dd for linux-arm-kernel@lists.infradead.org; Wed, 24 Nov 2021 15:41:49 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0CBC6102A; Wed, 24 Nov 2021 15:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637768508; bh=B4KwqLhItoYGnyJ9ogfHgJBcg/G5wxI+LrCO4toFBSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=smfTHi3C0BGbB+Tqh/ucp+n9eBQJakBTr/g9WyHJT4bHTI+7e7kmHjwDrL3dkZibA kvBCQ7h/VfXzR1L/Fjlb2468A7ADDlt+xz/jAqCG39yQpcgRjJiKBlcyDh0UjjfJ7b 5NcW/WxA1AYwYrsO3rqW6OmI2Dsa2a/gVgDjK6KNl6spgubhlZP1TpbF+Ugp3tInxg Ntw+g+mzL/TD9tqwHddURa2qHoValYWcRNdInuqPKPhWt6o+6g+Z/8dJE8vnerrXXr YYrRnmdMLMOBI2bpC1Yx4fnhqoAph1qPZs9Q4qqT0t9C5GmSuVPWBAAXx2ZYY7R1g4 pt2bs24uzZmDA== Received: by pali.im (Postfix) id 177ECB01; Wed, 24 Nov 2021 16:41:46 +0100 (CET) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Petazzoni , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Dominik Brodowski , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , =?UTF-8?q?Marek=20Beh=C3=BAn?= Cc: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] PCI: mvebu: Replace pci_ioremap_io() usage by devm_pci_remap_iospace() Date: Wed, 24 Nov 2021 16:41:13 +0100 Message-Id: <20211124154116.916-3-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211124154116.916-1-pali@kernel.org> References: <20211124154116.916-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211124_074148_500618_2F7ABDA0 X-CRM114-Status: GOOD ( 13.47 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Tm93IHdoZW4gQVJNIGFyY2hpdGVjdHVyZSBjb2RlIGFsc28gcHJvdmlkZXMgc3RhbmRhcmQgUENJ IGNvcmUgZnVuY3Rpb24KcGNpX3JlbWFwX2lvc3BhY2UoKSwgdXNlIGl0cyBkZXZtX3BjaV9yZW1h cF9pb3NwYWNlKCkgdmFyaWFudCBpbgpwY2ktbXZlYnUuYyBkcml2ZXIgaW5zdGVhZCBvZiBvbGQg QVJNLXNwZWNpZmljIHBjaV9pb3JlbWFwX2lvKCkgZnVuY3Rpb24uCgpDYWxsIGRldm1fcGNpX3Jl bWFwX2lvc3BhY2UoKSBiZWZvcmUgYWRkaW5nIElPIHJlc291cmNlIHRvIGhvc3QgYnJpZGdlCnN0 cnVjdHVyZSwgYXQgdGhlIHBsYWNlIHdoZXJlIGl0IHNob3VsZCBiZS4KClNpZ25lZC1vZmYtYnk6 IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9wY2kvY29udHJvbGxl ci9wY2ktbXZlYnUuYyB8IDEzICsrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2Vy dGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvY29udHJv bGxlci9wY2ktbXZlYnUuYyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNpLW12ZWJ1LmMKaW5k ZXggZWQxM2U4MWNkNjkxLi5hNTViOGJkNWViNjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2Nv bnRyb2xsZXIvcGNpLW12ZWJ1LmMKKysrIGIvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktbXZl YnUuYwpAQCAtOTkyLDYgKzk5MiwxMCBAQCBzdGF0aWMgaW50IG12ZWJ1X3BjaWVfcGFyc2VfcmVx dWVzdF9yZXNvdXJjZXMoc3RydWN0IG12ZWJ1X3BjaWUgKnBjaWUpCiAJCQkJCSByZXNvdXJjZV9z aXplKCZwY2llLT5pbykgLSAxKTsKIAkJcGNpZS0+cmVhbGlvLm5hbWUgPSAiUENJIEkvTyI7CiAK KwkJcmV0ID0gZGV2bV9wY2lfcmVtYXBfaW9zcGFjZShkZXYsICZwY2llLT5yZWFsaW8sIHBjaWUt PmlvLnN0YXJ0KTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisKIAkJcGNpX2FkZF9yZXNv dXJjZSgmYnJpZGdlLT53aW5kb3dzLCAmcGNpZS0+cmVhbGlvKTsKIAkJcmV0ID0gZGV2bV9yZXF1 ZXN0X3Jlc291cmNlKGRldiwgJmlvcG9ydF9yZXNvdXJjZSwgJnBjaWUtPnJlYWxpbyk7CiAJCWlm IChyZXQpCkBAIC0xMDEwLDcgKzEwMTQsNiBAQCBzdGF0aWMgaW50IG12ZWJ1X3BjaWVfcGFyc2Vf cmVxdWVzdF9yZXNvdXJjZXMoc3RydWN0IG12ZWJ1X3BjaWUgKnBjaWUpCiAgKi8KIHN0YXRpYyBp bnQgbXZlYnVfcGNpX2hvc3RfcHJvYmUoc3RydWN0IHBjaV9ob3N0X2JyaWRnZSAqYnJpZGdlKQog ewotCXN0cnVjdCBtdmVidV9wY2llICpwY2llOwogCXN0cnVjdCBwY2lfYnVzICpidXMsICpjaGls ZDsKIAlpbnQgcmV0OwogCkBAIC0xMDIwLDE0ICsxMDIzLDYgQEAgc3RhdGljIGludCBtdmVidV9w Y2lfaG9zdF9wcm9iZShzdHJ1Y3QgcGNpX2hvc3RfYnJpZGdlICpicmlkZ2UpCiAJCXJldHVybiBy ZXQ7CiAJfQogCi0JcGNpZSA9IHBjaV9ob3N0X2JyaWRnZV9wcml2KGJyaWRnZSk7Ci0JaWYgKHJl c291cmNlX3NpemUoJnBjaWUtPmlvKSAhPSAwKSB7Ci0JCXVuc2lnbmVkIGludCBpOwotCi0JCWZv ciAoaSA9IDA7IGkgPCByZXNvdXJjZV9zaXplKCZwY2llLT5yZWFsaW8pOyBpICs9IFNaXzY0SykK LQkJCXBjaV9pb3JlbWFwX2lvKGksIHBjaWUtPmlvLnN0YXJ0ICsgaSk7Ci0JfQotCiAJYnVzID0g YnJpZGdlLT5idXM7CiAKIAkvKgotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGlu dXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQu b3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=