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 3F25EC6FA89 for ; Mon, 5 Sep 2022 19:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231995AbiIETZW (ORCPT ); Mon, 5 Sep 2022 15:25:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229456AbiIETZR (ORCPT ); Mon, 5 Sep 2022 15:25:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 969FD1A814; Mon, 5 Sep 2022 12:25:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 32C8B6130A; Mon, 5 Sep 2022 19:25:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69D98C43470; Mon, 5 Sep 2022 19:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662405914; bh=tnlQt8uAhD9MRbuUnIAmbky2iGpTR1k2zzQd6YiZe4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M6UNZUzL/kVaqNPtX59YFKzyhhy2UBOEwYlujhIpmWIoZyT4Bc2uYKh6a2Ivke5S0 194cZjBKV7JDTZEc/qiDxPXCY8Yr4dKQIz6MtPSaFnr4Ap5v5XWxY92m6zxuKbTcne r3GoyMk6CsyzrBHZGJ05t1FjY3phIwvLrwD8E9/Le8V7GN9tP1CwwRP9zoomIjikM7 Lkmn9tPkQAJt3OKSni5GT8LrAFxHQ3u++LTEv9Qk/tJxtWhjlbHOY8t+ZzugujlVSx HZyfMDvSmuEuJz1abagB/P7c6G7fHT9TQVsprpZULz8u+Lzhw/wn5BkZU1DETLaXZA 27AanXc0LL1Aw== Received: by pali.im (Postfix) id 1145C20B1; Mon, 5 Sep 2022 21:25:12 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , Krzysztof Kozlowski , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Russell King , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Thomas Petazzoni , Mauri Sandberg Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 1/7] ARM: orion: Move PCIe mbus window mapping from orion5x_setup_wins() to pcie_setup() Date: Mon, 5 Sep 2022 21:23:04 +0200 Message-Id: <20220905192310.22786-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220905192310.22786-1-pali@kernel.org> References: <20220718202843.6766-1-maukka@ext.kapsi.fi> <20220905192310.22786-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 This would allow to migrate Orion PCIe code to pci-mvebu.c driver as this driver reads mapping information from device tree files and does not relay on static mappings. Signed-off-by: Pali Rohár --- Changes in v3: * Split it from pci-mvebu.c change to separate patch --- arch/arm/mach-orion5x/common.c | 13 ------------- arch/arm/mach-orion5x/pci.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 2e711b7252c6..df5e7b237946 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c @@ -228,19 +228,6 @@ void __init orion5x_init_early(void) void orion5x_setup_wins(void) { - /* - * The PCIe windows will no longer be statically allocated - * here once Orion5x is migrated to the pci-mvebu driver. - */ - mvebu_mbus_add_window_remap_by_id(ORION_MBUS_PCIE_IO_TARGET, - ORION_MBUS_PCIE_IO_ATTR, - ORION5X_PCIE_IO_PHYS_BASE, - ORION5X_PCIE_IO_SIZE, - ORION5X_PCIE_IO_BUS_BASE); - mvebu_mbus_add_window_by_id(ORION_MBUS_PCIE_MEM_TARGET, - ORION_MBUS_PCIE_MEM_ATTR, - ORION5X_PCIE_MEM_PHYS_BASE, - ORION5X_PCIE_MEM_SIZE); mvebu_mbus_add_window_remap_by_id(ORION_MBUS_PCI_IO_TARGET, ORION_MBUS_PCI_IO_ATTR, ORION5X_PCI_IO_PHYS_BASE, diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 888fdc9099c5..e0836be92f3f 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -147,6 +147,20 @@ static int __init pcie_setup(struct pci_sys_data *sys) */ orion_pcie_setup(PCIE_BASE); + /* + * The PCIe windows will no longer be statically allocated + * here once Orion5x is migrated to the pci-mvebu driver. + */ + mvebu_mbus_add_window_remap_by_id(ORION_MBUS_PCIE_IO_TARGET, + ORION_MBUS_PCIE_IO_ATTR, + ORION5X_PCIE_IO_PHYS_BASE, + ORION5X_PCIE_IO_SIZE, + ORION5X_PCIE_IO_BUS_BASE); + mvebu_mbus_add_window_by_id(ORION_MBUS_PCIE_MEM_TARGET, + ORION_MBUS_PCIE_MEM_ATTR, + ORION5X_PCIE_MEM_PHYS_BASE, + ORION5X_PCIE_MEM_SIZE); + /* * Check whether to apply Orion-1/Orion-NAS PCIe config * read transaction workaround. -- 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 F1298ECAAD5 for ; Mon, 5 Sep 2022 19:48:49 +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=niMEEdGrrVKFgwg2dPLo/qpCmiPIoD1Un7XrZ+uTvNs=; b=VJ0mOSAmAN5635 8epG2jgFKx0xkq+gGmfBQNjW1A2dg43OESBoJ9pMXHbtwDNTI9hFwYoebR0KLd6z/Art2ibbUlJTm o70EB4pbQszGCKRrZcrcNoQDBRQqLgCdHAYD7sPe3DNUfhHMpIAiOHep1tz5/zp6vhjets/iOUJLp Ie8v5ojS6FuY/eyu/H3PW5dIOxujdeKliTEq3oeGp5ZITEiOhsYVWIVUJwfIdGxLnsGZ059kctjL5 qPxXOcnL9KUvafzs8XP+btRw8HEaCdcT9vO/VsHr02OWru0be38en/oNv624Ltdv9dx/S7rrC2YOM Sjt/PCmRCvHoGWtH73qw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVI4J-009cyU-8I; Mon, 05 Sep 2022 19:47:40 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVHik-009Fcc-SB for linux-arm-kernel@lists.infradead.org; Mon, 05 Sep 2022 19:25:25 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 30420CE13B4; Mon, 5 Sep 2022 19:25:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69D98C43470; Mon, 5 Sep 2022 19:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662405914; bh=tnlQt8uAhD9MRbuUnIAmbky2iGpTR1k2zzQd6YiZe4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M6UNZUzL/kVaqNPtX59YFKzyhhy2UBOEwYlujhIpmWIoZyT4Bc2uYKh6a2Ivke5S0 194cZjBKV7JDTZEc/qiDxPXCY8Yr4dKQIz6MtPSaFnr4Ap5v5XWxY92m6zxuKbTcne r3GoyMk6CsyzrBHZGJ05t1FjY3phIwvLrwD8E9/Le8V7GN9tP1CwwRP9zoomIjikM7 Lkmn9tPkQAJt3OKSni5GT8LrAFxHQ3u++LTEv9Qk/tJxtWhjlbHOY8t+ZzugujlVSx HZyfMDvSmuEuJz1abagB/P7c6G7fHT9TQVsprpZULz8u+Lzhw/wn5BkZU1DETLaXZA 27AanXc0LL1Aw== Received: by pali.im (Postfix) id 1145C20B1; Mon, 5 Sep 2022 21:25:12 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , Krzysztof Kozlowski , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Russell King , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Thomas Petazzoni , Mauri Sandberg Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 1/7] ARM: orion: Move PCIe mbus window mapping from orion5x_setup_wins() to pcie_setup() Date: Mon, 5 Sep 2022 21:23:04 +0200 Message-Id: <20220905192310.22786-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220905192310.22786-1-pali@kernel.org> References: <20220718202843.6766-1-maukka@ext.kapsi.fi> <20220905192310.22786-1-pali@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220905_122523_294309_3AF6D85E X-CRM114-Status: GOOD ( 16.17 ) 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 VGhpcyB3b3VsZCBhbGxvdyB0byBtaWdyYXRlIE9yaW9uIFBDSWUgY29kZSB0byBwY2ktbXZlYnUu YyBkcml2ZXIgYXMgdGhpcwpkcml2ZXIgcmVhZHMgbWFwcGluZyBpbmZvcm1hdGlvbiBmcm9tIGRl dmljZSB0cmVlIGZpbGVzIGFuZCBkb2VzIG5vdCByZWxheQpvbiBzdGF0aWMgbWFwcGluZ3MuCgpT aWduZWQtb2ZmLWJ5OiBQYWxpIFJvaMOhciA8cGFsaUBrZXJuZWwub3JnPgotLS0KQ2hhbmdlcyBp biB2MzoKKiBTcGxpdCBpdCBmcm9tIHBjaS1tdmVidS5jIGNoYW5nZSB0byBzZXBhcmF0ZSBwYXRj aAotLS0KIGFyY2gvYXJtL21hY2gtb3Jpb241eC9jb21tb24uYyB8IDEzIC0tLS0tLS0tLS0tLS0K IGFyY2gvYXJtL21hY2gtb3Jpb241eC9wY2kuYyAgICB8IDE0ICsrKysrKysrKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2FyY2gvYXJtL21hY2gtb3Jpb241eC9jb21tb24uYyBiL2FyY2gvYXJtL21hY2gtb3Jpb241 eC9jb21tb24uYwppbmRleCAyZTcxMWI3MjUyYzYuLmRmNWU3YjIzNzk0NiAxMDA2NDQKLS0tIGEv YXJjaC9hcm0vbWFjaC1vcmlvbjV4L2NvbW1vbi5jCisrKyBiL2FyY2gvYXJtL21hY2gtb3Jpb241 eC9jb21tb24uYwpAQCAtMjI4LDE5ICsyMjgsNiBAQCB2b2lkIF9faW5pdCBvcmlvbjV4X2luaXRf ZWFybHkodm9pZCkKIAogdm9pZCBvcmlvbjV4X3NldHVwX3dpbnModm9pZCkKIHsKLQkvKgotCSAq IFRoZSBQQ0llIHdpbmRvd3Mgd2lsbCBubyBsb25nZXIgYmUgc3RhdGljYWxseSBhbGxvY2F0ZWQK LQkgKiBoZXJlIG9uY2UgT3Jpb241eCBpcyBtaWdyYXRlZCB0byB0aGUgcGNpLW12ZWJ1IGRyaXZl ci4KLQkgKi8KLQltdmVidV9tYnVzX2FkZF93aW5kb3dfcmVtYXBfYnlfaWQoT1JJT05fTUJVU19Q Q0lFX0lPX1RBUkdFVCwKLQkJCQkJICBPUklPTl9NQlVTX1BDSUVfSU9fQVRUUiwKLQkJCQkJICBP UklPTjVYX1BDSUVfSU9fUEhZU19CQVNFLAotCQkJCQkgIE9SSU9ONVhfUENJRV9JT19TSVpFLAot CQkJCQkgIE9SSU9ONVhfUENJRV9JT19CVVNfQkFTRSk7Ci0JbXZlYnVfbWJ1c19hZGRfd2luZG93 X2J5X2lkKE9SSU9OX01CVVNfUENJRV9NRU1fVEFSR0VULAotCQkJCSAgICBPUklPTl9NQlVTX1BD SUVfTUVNX0FUVFIsCi0JCQkJICAgIE9SSU9ONVhfUENJRV9NRU1fUEhZU19CQVNFLAotCQkJCSAg ICBPUklPTjVYX1BDSUVfTUVNX1NJWkUpOwogCW12ZWJ1X21idXNfYWRkX3dpbmRvd19yZW1hcF9i eV9pZChPUklPTl9NQlVTX1BDSV9JT19UQVJHRVQsCiAJCQkJCSAgT1JJT05fTUJVU19QQ0lfSU9f QVRUUiwKIAkJCQkJICBPUklPTjVYX1BDSV9JT19QSFlTX0JBU0UsCmRpZmYgLS1naXQgYS9hcmNo L2FybS9tYWNoLW9yaW9uNXgvcGNpLmMgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKaW5k ZXggODg4ZmRjOTA5OWM1Li5lMDgzNmJlOTJmM2YgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL21hY2gt b3Jpb241eC9wY2kuYworKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvcGNpLmMKQEAgLTE0Nyw2 ICsxNDcsMjAgQEAgc3RhdGljIGludCBfX2luaXQgcGNpZV9zZXR1cChzdHJ1Y3QgcGNpX3N5c19k YXRhICpzeXMpCiAJICovCiAJb3Jpb25fcGNpZV9zZXR1cChQQ0lFX0JBU0UpOwogCisJLyoKKwkg KiBUaGUgUENJZSB3aW5kb3dzIHdpbGwgbm8gbG9uZ2VyIGJlIHN0YXRpY2FsbHkgYWxsb2NhdGVk CisJICogaGVyZSBvbmNlIE9yaW9uNXggaXMgbWlncmF0ZWQgdG8gdGhlIHBjaS1tdmVidSBkcml2 ZXIuCisJICovCisJbXZlYnVfbWJ1c19hZGRfd2luZG93X3JlbWFwX2J5X2lkKE9SSU9OX01CVVNf UENJRV9JT19UQVJHRVQsCisJCQkJCSAgT1JJT05fTUJVU19QQ0lFX0lPX0FUVFIsCisJCQkJCSAg T1JJT041WF9QQ0lFX0lPX1BIWVNfQkFTRSwKKwkJCQkJICBPUklPTjVYX1BDSUVfSU9fU0laRSwK KwkJCQkJICBPUklPTjVYX1BDSUVfSU9fQlVTX0JBU0UpOworCW12ZWJ1X21idXNfYWRkX3dpbmRv d19ieV9pZChPUklPTl9NQlVTX1BDSUVfTUVNX1RBUkdFVCwKKwkJCQkgICAgT1JJT05fTUJVU19Q Q0lFX01FTV9BVFRSLAorCQkJCSAgICBPUklPTjVYX1BDSUVfTUVNX1BIWVNfQkFTRSwKKwkJCQkg ICAgT1JJT041WF9QQ0lFX01FTV9TSVpFKTsKKwogCS8qCiAJICogQ2hlY2sgd2hldGhlciB0byBh cHBseSBPcmlvbi0xL09yaW9uLU5BUyBQQ0llIGNvbmZpZwogCSAqIHJlYWQgdHJhbnNhY3Rpb24g d29ya2Fyb3VuZC4KLS0gCjIuMjAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1r ZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWls bWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK