From patchwork Wed Aug 21 13:02:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daire McNamara X-Patchwork-Id: 13771674 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 5A8DEC52D6F for ; Wed, 21 Aug 2024 14:15: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=OKSez3CXSQO1kjrpUrXdMYCVub3zooUvP7OjXhWZza4=; b=LKMXtapT/dc4JS JCdyf/PJlT/vRbcAyR5QiBd6TuVF+PTuD+j65pc5ZEkD51cLRG+kg7Wevs+nxcoKzF164q8wVEXpl TqDOo5GBooIEPpgrL9sidtcZUDymfTORKPaoc00itcbB1N/X7pRv2H4Jv0aoIYHYZM8eTcQELjWAU +w1zDla5gDd/h0pKhrE7uDbZFLUhXwFvMr0DunrxFvHWRE4yr4j356LbbD7AT8eBFo0kysn5eRJ8G wqKZlp3WjzzByNhBiqLZKz2qzz0RR47ufUbIzSVamkIQER+Ufu7jf551x1JZZ0fkJKFHYeuvT8zSc +E8US7ATzcxxeQZV7D7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgm7l-00000009Fhe-3RwQ; Wed, 21 Aug 2024 14:15:45 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgkzI-000000091H8-0nHe for linux-riscv@lists.infradead.org; Wed, 21 Aug 2024 13:02:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1724245376; x=1755781376; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ITGSnwUlbEDRh69Ym2WWBpy0Jt4APraANaGuUfDwMiA=; b=pOl0hjYqbXhj5IXkEaH7IF8XidOCzVRrv6RKNDi0k5Ii2tn2V28amTlq 3ereYm7CoTQkNKfIKq9dx7XVZAptpIyMYkS2BgTCcIDCGUiHBENT2oI2y l263NsRkc5IQoDF46vzGS69dx0T/DmfXW8MZLslVDRxiMlbtPKkfgwKcm 2TicUCsmG+AtyEq7VX1iVrEprjiXskxoYOMBk32q1eMAvIkmWPwrdxyrj ocho1DcxJAaxnLhvfhcV/2F9XlFHw8RSkxrRb0i7abB8JBwScmAn/UCWj p40rcu+1n139kAArwNYmLTdmnCiCsZ3logc99I313pStlJA2kHhMi3+Fn A==; X-CSE-ConnectionGUID: hYt9Btb/Rtq04w/yiOUfIw== X-CSE-MsgGUID: cwDKoYQDQBCF1aifJpkXLQ== X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="30743853" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 21 Aug 2024 06:02:52 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 21 Aug 2024 06:02:32 -0700 Received: from daire-X570.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 21 Aug 2024 06:02:30 -0700 From: To: , CC: , , , , , , , , , , Subject: [PATCH v8 1/3] PCI: microchip: Fix outbound address translation tables Date: Wed, 21 Aug 2024 14:02:15 +0100 Message-ID: <20240821130217.957424-2-daire.mcnamara@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240821130217.957424-1-daire.mcnamara@microchip.com> References: <20240821130217.957424-1-daire.mcnamara@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240821_060256_264539_0B5FC531 X-CRM114-Status: GOOD ( 16.84 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Daire McNamara On Microchip PolarFire SoC (MPFS) the PCIe Root Port can be behind one of three general-purpose Fabric Interface Controller (FIC) buses that encapsulate an AXI-M interface. That FIC is responsible for managing the translations of the upper 32-bits of the AXI-M address. On MPFS, the Root Port driver needs to take account of that outbound address translation done by the parent FIC bus before setting up its own outbound address translation tables. In all cases on MPFS, the remaining outbound address translation tables are 32-bit only. Limit the outbound address translation tables to 32-bit only. This necessitates changing a size_t in mc_pcie_setup_window to a u64 to avoid a compile error on 32-bit platforms. Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip Polarfire PCIe controller driver") Signed-off-by: Daire McNamara Acked-by: Conor Dooley Reviewed-by: Ilpo Jarvinen --- .../pci/controller/plda/pcie-microchip-host.c | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c index 48f60a04b740..da766de347bd 100644 --- a/drivers/pci/controller/plda/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -21,6 +21,8 @@ #include "../../pci.h" #include "pcie-plda.h" +#define MC_OUTBOUND_TRANS_TBL_MASK GENMASK(31, 0) + /* PCIe Bridge Phy and Controller Phy offsets */ #define MC_PCIE1_BRIDGE_ADDR 0x00008000u #define MC_PCIE1_CTRL_ADDR 0x0000a000u @@ -612,6 +614,27 @@ static void mc_disable_interrupts(struct mc_pcie *port) writel_relaxed(GENMASK(31, 0), bridge_base_addr + ISTATUS_HOST); } +int mc_pcie_setup_iomems(struct pci_host_bridge *bridge, + struct plda_pcie_rp *port) +{ + void __iomem *bridge_base_addr = port->bridge_addr; + struct resource_entry *entry; + u64 pci_addr; + u32 index = 1; + + resource_list_for_each_entry(entry, &bridge->windows) { + if (resource_type(entry->res) == IORESOURCE_MEM) { + pci_addr = entry->res->start - entry->offset; + plda_pcie_setup_window(bridge_base_addr, index, + entry->res->start & MC_OUTBOUND_TRANS_TBL_MASK, + pci_addr, resource_size(entry->res)); + index++; + } + } + + return 0; +} + static int mc_platform_init(struct pci_config_window *cfg) { struct device *dev = cfg->parent; @@ -622,15 +645,14 @@ static int mc_platform_init(struct pci_config_window *cfg) int ret; /* Configure address translation table 0 for PCIe config space */ - plda_pcie_setup_window(bridge_base_addr, 0, cfg->res.start, - cfg->res.start, - resource_size(&cfg->res)); + plda_pcie_setup_window(bridge_base_addr, 0, cfg->res.start & MC_OUTBOUND_TRANS_TBL_MASK, + 0, resource_size(&cfg->res)); /* Need some fixups in config space */ mc_pcie_enable_msi(port, cfg->win); /* Configure non-config space outbound ranges */ - ret = plda_pcie_setup_iomems(bridge, &port->plda); + ret = mc_pcie_setup_iomems(bridge, &port->plda); if (ret) return ret; From patchwork Wed Aug 21 13:02:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daire McNamara X-Patchwork-Id: 13771440 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 4AFABC52D7C for ; Wed, 21 Aug 2024 13:03:13 +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=LywCejE5HKuwJwNxSybIDMrZyZQ8878KD+szCKwD8to=; b=IvlUr5lYkfL4yK /gJdT1tb3okU4x5+7odbo/ELculVpL5shpAM5BUAcAaVFixkKftfj4xOyRgr2iYR0YTcX120Gvjgm P74ySaMJVptdFTAv7FIHdyvIy0Eku/Vy0F+455jv+68wm8kMqtcGSjtObixzbOu+KMEKBX7xmn8eq xKncBanZ/m73HyXmRW60QVIcZirZQrnrWaFVQU+2zgw9iOHTbAz2rOQOpGFzLlyiquLecMXLQiar3 Cd68+eRpIl67OxUJszWXq6pBjF1DDFJIGvwMMpgq7uW9aI6H5+ZKe0/Em4gDwYi5RIWS3iGdfYj8I 7K4sxa6sW0aOBO8MC+Ug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgkzU-000000091KW-2qB0; Wed, 21 Aug 2024 13:03:08 +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 1sgkzT-000000091K7-2XAs for linux-riscv@bombadil.infradead.org; Wed, 21 Aug 2024 13:03:07 +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=ogD4YrIWotpabWGLLSHZuZ5j8iBSFrWge/5MnsCNnlA=; b=L5Zz2UwWyI2QcGz7b/HWpdCjur eAyfiZ6OJR0O4wUDlA4yWNh+MS3dje+ljci/RJlbwZruaN1FRFHP+rVyRfk0bAYuJXyzthEbVzwrx iaw/NVd4tHh3L9LBGjULQt1l4K3/xXRJPhD+UtYYUGkxCyG+DOiI1SJ8jo7gPiz5gcnGv78VKQoNr 3g+TqFymc9NvSPLWMABUyAMPTuBL1uoqPDAnQIGReiDn9gsleOhDybANSug6gNfEm2Sm4hFsHnXSp 3/r9AAYUZIRIEcOQ9/Dc3ZQ29kZL65s5kGRQKHfoIGEItjGA97K8wxQcHF/TJRAQtf8iddetrKwfX 4rCC1ogA==; Received: from esa.microchip.iphmx.com ([68.232.153.233]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgkzO-00000009X5J-3fXR for linux-riscv@lists.infradead.org; Wed, 21 Aug 2024 13:03:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1724245383; x=1755781383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3tOxpbbZA5ciuSgU83YgsAoyHBL3szfNDXchKaiOH8I=; b=xdJB2lJ+9siYEjAT5jPX8UH9u0bKx5/PQs5+lDrmsbws+RgTSVxGAuCV +TrBHTGyH8jYmenA+FnrlU5b9fYdcBi2wcKmPx4nryk9AqH4Wfv4d1g+N FSSwqb4Ue0mnACXO80Q+58JPswuMGcDnsWPHiW9vaLDoi26w3ThPHE9Ri EjBWLkDilKhmIBEe8DIYzv//vNg1qSscL1mDyT+dM/RkzPFa0HqEa2T/M UKlIu+Cv5OuUNNsnKkoHi7eJ/2OOCSilJ08KYsiI3IWwKJp8GUtHNqjf8 xTLbPEv+Wx/D22nayt3fEyG6tPpPIcwcqW6AL5coDrR/ngffRbxubTahp Q==; X-CSE-ConnectionGUID: hYt9Btb/Rtq04w/yiOUfIw== X-CSE-MsgGUID: nqJdkwd7R8SwtlxKBtRQMg== X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="30743855" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 21 Aug 2024 06:02:53 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 21 Aug 2024 06:02:35 -0700 Received: from daire-X570.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 21 Aug 2024 06:02:32 -0700 From: To: , CC: , , , , , , , , , , Subject: [PATCH v8 2/3] PCI: microchip: Fix inbound address translation tables Date: Wed, 21 Aug 2024 14:02:16 +0100 Message-ID: <20240821130217.957424-3-daire.mcnamara@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240821130217.957424-1-daire.mcnamara@microchip.com> References: <20240821130217.957424-1-daire.mcnamara@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240821_140303_906836_C8A62592 X-CRM114-Status: GOOD ( 24.54 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Daire McNamara On Microchip PolarFire SoC the PCIe Root Port can be behind one of three general purpose Fabric Interface Controller (FIC) buses that encapsulates an AXI-S bus. Depending on which FIC(s) the Root Port is connected through to CPU space, and what address translation is done by that FIC, the Root Port driver's inbound address translation may vary. For all current supported designs and all future expected designs, inbound address translation done by a FIC on PolarFire SoC varies depending on whether PolarFire SoC in operating in coherent DMA mode or noncoherent DMA mode. The setup of the outbound address translation tables in the Root Port driver only needs to handle these two cases. Setup the inbound address translation tables to one of two address translations, depending on whether the rootport is being used with coherent DMA or noncoherent DMA. Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip Polarfire PCIe controller driver") Signed-off-by: Daire McNamara Acked-by: Conor Dooley --- .../pci/controller/plda/pcie-microchip-host.c | 90 +++++++++++++++++++ drivers/pci/controller/plda/pcie-plda-host.c | 17 +++- drivers/pci/controller/plda/pcie-plda.h | 6 +- drivers/pci/controller/plda/pcie-starfive.c | 5 ++ 4 files changed, 113 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c index da766de347bd..fd88331a90f8 100644 --- a/drivers/pci/controller/plda/pcie-microchip-host.c +++ b/drivers/pci/controller/plda/pcie-microchip-host.c @@ -7,21 +7,27 @@ * Author: Daire McNamara */ +#include +#include #include #include #include #include +#include #include #include #include #include #include #include +#include #include "../../pci.h" #include "pcie-plda.h" #define MC_OUTBOUND_TRANS_TBL_MASK GENMASK(31, 0) +#define MC_MAX_NUM_INBOUND_WINDOWS 8 +#define MPFS_NC_BOUNCE_ADDR 0x80000000 /* PCIe Bridge Phy and Controller Phy offsets */ #define MC_PCIE1_BRIDGE_ADDR 0x00008000u @@ -614,6 +620,86 @@ static void mc_disable_interrupts(struct mc_pcie *port) writel_relaxed(GENMASK(31, 0), bridge_base_addr + ISTATUS_HOST); } +static void mc_pcie_setup_inbound_atr(int window_index, u64 axi_addr, u64 pcie_addr, u64 size) +{ + void __iomem *bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; + u32 table_offset = window_index * ATR_ENTRY_SIZE; + void __iomem *table_addr = bridge_base_addr + table_offset; + u32 atr_sz; + u32 val; + + atr_sz = ilog2(size) - 1; + + val = ALIGN_DOWN(lower_32_bits(pcie_addr), SZ_4K); + val |= FIELD_PREP(ATR_SIZE_MASK, atr_sz); + val |= ATR_IMPL_ENABLE; + + writel(val, table_addr + ATR0_PCIE_WIN0_SRCADDR_PARAM); + + writel(upper_32_bits(pcie_addr), table_addr + ATR0_PCIE_WIN0_SRC_ADDR); + + writel(lower_32_bits(axi_addr), table_addr + ATR0_PCIE_WIN0_TRSL_ADDR_LSB); + writel(upper_32_bits(axi_addr), table_addr + ATR0_PCIE_WIN0_TRSL_ADDR_UDW); + + writel(TRSL_ID_AXI4_MASTER_0, table_addr + ATR0_PCIE_WIN0_TRSL_PARAM); +} + +static int mc_pcie_setup_inbound_ranges(struct platform_device *pdev, struct mc_pcie *port) +{ + struct device *dev = &pdev->dev; + struct device_node *dn = dev->of_node; + struct of_range_parser parser; + struct of_range range; + int atr_index = 0; + + /* + * MPFS PCIe Root Port is 32-bit only, behind a Fabric Interface + * Controller FPGA logic block which contains the AXI-S interface. + * + * From the point of view of the PCIe Root Port, there are only + * two supported Root Port configurations: + * + * Configuration 1: for use with fully coherent designs; supports a + * window from 0x0 (CPU space) to specified PCIe space. + * + * Configuration 2: for use with non-coherent designs; supports two + * 1 GB wide windows to CPU space; one mapping CPU space 0 to PCIe + * space 0x80000000 and mapping CPU space 0x40000000 to pcie + * space 0xc0000000. This cfg needs two windows because of how + * the MSI space is allocated in the AXI-S range on MPFS. + * + * The FIC interface outside the PCIe block *must* complete the inbound + * address translation as per MCHP MPFS FPGA design guidelines. + */ + if (device_property_read_bool(dev, "dma-noncoherent")) { + /* + * Always need same two tables in this case. Need two tables + * due to hardware interactions between address and size. + */ + mc_pcie_setup_inbound_atr(0, 0, MPFS_NC_BOUNCE_ADDR, SZ_1G); + mc_pcie_setup_inbound_atr(1, SZ_1G, MPFS_NC_BOUNCE_ADDR + SZ_1G, SZ_1G); + } else { + /* Find any DMA ranges */ + if (of_pci_dma_range_parser_init(&parser, dn)) { + /* No DMA range property - setup default */ + mc_pcie_setup_inbound_atr(0, 0, 0, SZ_4G); + return 0; + } + + for_each_of_range(&parser, &range) { + if (atr_index >= MC_MAX_NUM_INBOUND_WINDOWS) { + dev_err(dev, "too many inbound ranges; %d available tables\n", + MC_MAX_NUM_INBOUND_WINDOWS); + return -EINVAL; + } + mc_pcie_setup_inbound_atr(atr_index, 0, range.pci_addr, range.size); + atr_index++; + } + } + + return 0; +} + int mc_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port) { @@ -656,6 +742,10 @@ static int mc_platform_init(struct pci_config_window *cfg) if (ret) return ret; + ret = mc_pcie_setup_inbound_ranges(pdev, port); + if (ret) + return ret; + port->plda.event_ops = &mc_event_ops; port->plda.event_irq_chip = &mc_event_irq_chip; port->plda.events_bitmap = GENMASK(NUM_EVENTS - 1, 0); diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/controller/plda/pcie-plda-host.c index a18923d7cea6..2a3cc2544200 100644 --- a/drivers/pci/controller/plda/pcie-plda-host.c +++ b/drivers/pci/controller/plda/pcie-plda-host.c @@ -8,11 +8,14 @@ * Author: Daire McNamara */ +#include +#include #include #include #include #include #include +#include #include "pcie-plda.h" @@ -509,8 +512,9 @@ void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, writel(val, bridge_base_addr + (index * ATR_ENTRY_SIZE) + ATR0_AXI4_SLV0_TRSL_PARAM); - val = lower_32_bits(axi_addr) | (atr_sz << ATR_SIZE_SHIFT) | - ATR_IMPL_ENABLE; + val = ALIGN_DOWN(lower_32_bits(axi_addr), SZ_4K); + val |= FIELD_PREP(ATR_SIZE_MASK, atr_sz); + val |= ATR_IMPL_ENABLE; writel(val, bridge_base_addr + (index * ATR_ENTRY_SIZE) + ATR0_AXI4_SLV0_SRCADDR_PARAM); @@ -525,13 +529,20 @@ void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, val = upper_32_bits(pci_addr); writel(val, bridge_base_addr + (index * ATR_ENTRY_SIZE) + ATR0_AXI4_SLV0_TRSL_ADDR_UDW); +} +EXPORT_SYMBOL_GPL(plda_pcie_setup_window); + +void plda_pcie_setup_inbound_address_translation(struct plda_pcie_rp *port) +{ + void __iomem *bridge_base_addr = port->bridge_addr; + u32 val; val = readl(bridge_base_addr + ATR0_PCIE_WIN0_SRCADDR_PARAM); val |= (ATR0_PCIE_ATR_SIZE << ATR0_PCIE_ATR_SIZE_SHIFT); writel(val, bridge_base_addr + ATR0_PCIE_WIN0_SRCADDR_PARAM); writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR); } -EXPORT_SYMBOL_GPL(plda_pcie_setup_window); +EXPORT_SYMBOL_GPL(plda_pcie_setup_inbound_address_translation); int plda_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port) diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h index 0e7dc0d8e5ba..61ece26065ea 100644 --- a/drivers/pci/controller/plda/pcie-plda.h +++ b/drivers/pci/controller/plda/pcie-plda.h @@ -89,14 +89,15 @@ /* PCIe AXI slave table init defines */ #define ATR0_AXI4_SLV0_SRCADDR_PARAM 0x800u -#define ATR_SIZE_SHIFT 1 -#define ATR_IMPL_ENABLE 1 +#define ATR_SIZE_MASK GENMASK(6, 1) +#define ATR_IMPL_ENABLE BIT(0) #define ATR0_AXI4_SLV0_SRC_ADDR 0x804u #define ATR0_AXI4_SLV0_TRSL_ADDR_LSB 0x808u #define ATR0_AXI4_SLV0_TRSL_ADDR_UDW 0x80cu #define ATR0_AXI4_SLV0_TRSL_PARAM 0x810u #define PCIE_TX_RX_INTERFACE 0x00000000u #define PCIE_CONFIG_INTERFACE 0x00000001u +#define TRSL_ID_AXI4_MASTER_0 0x00000004u #define CONFIG_SPACE_ADDR_OFFSET 0x1000u @@ -204,6 +205,7 @@ int plda_init_interrupts(struct platform_device *pdev, void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index, phys_addr_t axi_addr, phys_addr_t pci_addr, size_t size); +void plda_pcie_setup_inbound_address_translation(struct plda_pcie_rp *port); int plda_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port); int plda_pcie_host_init(struct plda_pcie_rp *port, struct pci_ops *ops, diff --git a/drivers/pci/controller/plda/pcie-starfive.c b/drivers/pci/controller/plda/pcie-starfive.c index c9933ecf6833..20cb30580959 100644 --- a/drivers/pci/controller/plda/pcie-starfive.c +++ b/drivers/pci/controller/plda/pcie-starfive.c @@ -355,6 +355,11 @@ static int starfive_pcie_host_init(struct plda_pcie_rp *plda) */ plda_pcie_set_pref_win_64bit(plda); + /* + * Setup the inbound address translation + */ + plda_pcie_setup_inbound_address_translation(plda); + /* * Ensure that PERST has been asserted for at least 100 ms, * the sleep value is T_PVPERL from PCIe CEM spec r2.0 (Table 2-4) From patchwork Wed Aug 21 13:02:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daire McNamara X-Patchwork-Id: 13771676 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 F1052C5321E for ; Wed, 21 Aug 2024 14:15: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=vzuMnl9Djv3PtpHMhrjUqJr+wR5KJzXfd0IlRmKrALo=; b=pqImXurEu4bZle B41/+FihVy6mzTkBX5ims4Hj1hNWPherV8C7F2pOXBNnOVSnqJ1Xx6OEYIKJq4eyXi6cEBFzP42f8 YHWtMSOHVvlGCmyymkENEoUvrf62NsxrVjKv4GQIRMYSLx9uRB249Z5g85fChNtjHHiFIGgXCA/3H jczT7KC63bIhAtLGVYjkmH6Nka/X2s+EQO+PEy7qtooBIKFygDbsZHy7JNNFQQh4O6oQFa0X95QId Z8J5tnr2NWJvfcIOFll6HuwZLQnE5jo7CnH4dLd7Tpk8zVQEWW92v8GoYuR/o/fYWEBBkXx5O3duQ be8h65lKu/VD7xUnAfiw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgm7m-00000009Fhx-2Cpb; Wed, 21 Aug 2024 14:15:46 +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 1sgkzU-000000091K9-0hT0 for linux-riscv@bombadil.infradead.org; Wed, 21 Aug 2024 13:03:08 +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=daoGw4/cHGn/EvMbHNQbfB7jCXtnPLt5EGd/i7Bc11s=; b=MVd5zBC0AIuUsNUZrfahOLav4O DcD5NW5iIvi3iGU9HOKMbeki+VfeN5OX4BkCu3QAEacPAH/1+F3+LbkPJbtU+4wUvxcPnVmAyPCpi ORouPM1eMqkMHrygIrdHhaikSCiHNPsWB70WX6AbwI30EfD+4Z9yM8La0wCzvxYbov7HGKHV+c1rb Me6r+hx+P2m6ILiY3FNI7Aa9n6t7XnemQQEjbEsoIH0kLIYnNAQ+VkSG/VDdZ4Gn7SganfPjU8Ohn +LsEVrHG9BlwxJwZvVEdEWE8xxm1vPccoZJZfN8/xtKahIOdLaKKBInV2hfknRP0HaplO3OareLS7 I87wYyVg==; Received: from esa.microchip.iphmx.com ([68.232.153.233]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sgkzQ-00000009X5T-1Ou7 for linux-riscv@lists.infradead.org; Wed, 21 Aug 2024 13:03:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1724245384; x=1755781384; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AAJU18OBl8o8+iDmdG41Ki05MWpShLtTzqE+u3kWNwI=; b=1kxK3EziZlzlHAKd9K7CP/AzGrj+ixOXH7UjQKwe3TNqM6NIPLmrwi7s vP7xgjhE5ucc4agjj9NYTrRBjNVFzYmhDMbh3ZrN6UAmXZqCZcnvU52ZC uTaj6NvRIVDclfzAft0hEtvrAfo4UDp5YBcXl9u0+HlMJ5NAWEuPtJor9 rXxYWEBXImWbBwliQ5/3iMOA4T5D6pn749cIo6uPvpOkpIz5goW0GYYMB zjBYPdrUwUJaRF1qYn2VEzjtxRElxByVNU9oZCaD1lURmrx55OJklWgjW 1F+q4IL5uhwRwByaufplB0vZy6HDR9GH/2fpjzdv7Tif8HXzrGMYjL3LJ A==; X-CSE-ConnectionGUID: hYt9Btb/Rtq04w/yiOUfIw== X-CSE-MsgGUID: lyWViQzjSR+R7G3o33eTUg== X-IronPort-AV: E=Sophos;i="6.10,164,1719903600"; d="scan'208";a="30743856" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 21 Aug 2024 06:02:53 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 21 Aug 2024 06:02:38 -0700 Received: from daire-X570.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 21 Aug 2024 06:02:35 -0700 From: To: , CC: , , , , , , , , , , Subject: [PATCH v8 3/3] dt-bindings: PCI: microchip,pcie-host: allow dma-noncoherent Date: Wed, 21 Aug 2024 14:02:17 +0100 Message-ID: <20240821130217.957424-4-daire.mcnamara@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240821130217.957424-1-daire.mcnamara@microchip.com> References: <20240821130217.957424-1-daire.mcnamara@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240821_140304_925195_9AF70625 X-CRM114-Status: UNSURE ( 8.33 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley PolarFire SoC may be configured in a way that requires non-coherent DMA handling. On RISC-V, buses are coherent by default & the dma-noncoherent property is required to denote buses or devices that are non-coherent. Signed-off-by: Conor Dooley Signed-off-by: Daire McNamara Acked-by: Rob Herring --- Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml b/Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml index 612633ba59e2..5f5f2b25d797 100644 --- a/Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml +++ b/Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml @@ -44,6 +44,8 @@ properties: items: pattern: '^fic[0-3]$' + dma-coherent: true + ranges: minItems: 1 maxItems: 3