| Message ID | 20240823122717.1159133-3-daire.mcnamara@microchip.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix address translations on MPFS PCIe controller | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
> > From: Daire McNamara <daire.mcnamara@microchip.com> > > 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 is 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 Root Port is being used with coherent DMA or > noncoherent DMA. > > Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip Polarfire PCIe controller > driver") > Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> > Acked-by: Conor Dooley <conor.dooley@microchip.com> > --- > .../pci/controller/plda/pcie-microchip-host.c | 93 +++++++++++++++++++ > drivers/pci/controller/plda/pcie-plda-host.c | 17 +++- > drivers/pci/controller/plda/pcie-plda.h | 6 +- > drivers/pci/controller/plda/pcie-starfive.c | 3 + > 4 files changed, 114 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c > b/drivers/pci/controller/plda/pcie-microchip-host.c > index fa4c85be21f0..e06251523560 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 <daire.mcnamara@microchip.com> > */ > > +#include <linux/align.h> > +#include <linux/bits.h> > #include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/irqchip/chained_irq.h> > #include <linux/irqdomain.h> > +#include <linux/log2.h> > #include <linux/module.h> > #include <linux/msi.h> > #include <linux/of_address.h> > #include <linux/of_pci.h> > #include <linux/pci-ecam.h> > #include <linux/platform_device.h> > +#include <linux/wordpart.h> > > #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,89 @@ 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; > +} > + > static int mc_pcie_setup_iomems(struct pci_host_bridge *bridge, > struct plda_pcie_rp *port) > { > @@ -656,6 +745,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 <daire.mcnamara@microchip.com> > */ > > +#include <linux/align.h> > +#include <linux/bitfield.h> > #include <linux/irqchip/chained_irq.h> > #include <linux/irqdomain.h> > #include <linux/msi.h> > #include <linux/pci_regs.h> > #include <linux/pci-ecam.h> > +#include <linux/wordpart.h> > > #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..55e84bc79eca 100644 > --- a/drivers/pci/controller/plda/pcie-starfive.c > +++ b/drivers/pci/controller/plda/pcie-starfive.c > @@ -355,6 +355,9 @@ 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) > -- > 2.34.1 > Hi Daire Could you please CC Kevin to this patch-set e-mail list? Thanks.
On Thu, Sep 12, 2024 at 09:49:38AM +0000, Minda Chen wrote: > > From: Daire McNamara <daire.mcnamara@microchip.com> Please trim unrelated content. > Hi Daire > Could you please CC Kevin to this patch-set e-mail list? Thanks. FWIW, he could get the series at https://lore.kernel.org/all/20240823122717.1159133-1-daire.mcnamara@microchip.com/ and reply (if he sees fit) by downloading the mbox file from there. Cheers, Conor.
> > From: Daire McNamara <daire.mcnamara@microchip.com> > > > > 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 is 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 Root Port is being used with > > coherent DMA or noncoherent DMA. > > > > Fixes: 6f15a9c9f941 ("PCI: microchip: Add Microchip Polarfire PCIe > > controller > > driver") > > Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> > > Acked-by: Conor Dooley <conor.dooley@microchip.com> > > --- > > .../pci/controller/plda/pcie-microchip-host.c | 93 > > +++++++++++++++++++ drivers/pci/controller/plda/pcie-plda-host.c | 17 > +++- > > drivers/pci/controller/plda/pcie-plda.h | 6 +- > > drivers/pci/controller/plda/pcie-starfive.c | 3 + > > 4 files changed, 114 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c > > b/drivers/pci/controller/plda/pcie-microchip-host.c > > index fa4c85be21f0..e06251523560 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 <daire.mcnamara@microchip.com> > > */ > > > > +#include <linux/align.h> > > +#include <linux/bits.h> > > #include <linux/bitfield.h> > > #include <linux/clk.h> > > #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> > > +#include <linux/log2.h> > > #include <linux/module.h> > > #include <linux/msi.h> > > #include <linux/of_address.h> > > #include <linux/of_pci.h> > > #include <linux/pci-ecam.h> > > #include <linux/platform_device.h> > > +#include <linux/wordpart.h> > > > > #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,89 @@ 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; > > +} > > + > > static int mc_pcie_setup_iomems(struct pci_host_bridge *bridge, > > struct plda_pcie_rp *port) > > { > > @@ -656,6 +745,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 <daire.mcnamara@microchip.com> > > */ > > > > +#include <linux/align.h> > > +#include <linux/bitfield.h> > > #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> > > #include <linux/msi.h> #include <linux/pci_regs.h> #include > > <linux/pci-ecam.h> > > +#include <linux/wordpart.h> > > > > #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..55e84bc79eca 100644 > > --- a/drivers/pci/controller/plda/pcie-starfive.c > > +++ b/drivers/pci/controller/plda/pcie-starfive.c > > @@ -355,6 +355,9 @@ static int starfive_pcie_host_init(struct > > plda_pcie_rp > > *plda) > > */ > > plda_pcie_set_pref_win_64bit(plda); > > JH7110 SoC has RTL configuration about the whole range of inbound address translation, so please remove the function below, the setting in the below function will cover our original RTL setting with wrong values. > > + /* 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) > > -- > > 2.34.1 > > > > Hi Daire > Could you please CC Kevin to this patch-set e-mail list? Thanks.
diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c index fa4c85be21f0..e06251523560 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 <daire.mcnamara@microchip.com> */ +#include <linux/align.h> +#include <linux/bits.h> #include <linux/bitfield.h> #include <linux/clk.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> +#include <linux/log2.h> #include <linux/module.h> #include <linux/msi.h> #include <linux/of_address.h> #include <linux/of_pci.h> #include <linux/pci-ecam.h> #include <linux/platform_device.h> +#include <linux/wordpart.h> #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,89 @@ 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; +} + static int mc_pcie_setup_iomems(struct pci_host_bridge *bridge, struct plda_pcie_rp *port) { @@ -656,6 +745,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 <daire.mcnamara@microchip.com> */ +#include <linux/align.h> +#include <linux/bitfield.h> #include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> #include <linux/msi.h> #include <linux/pci_regs.h> #include <linux/pci-ecam.h> +#include <linux/wordpart.h> #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..55e84bc79eca 100644 --- a/drivers/pci/controller/plda/pcie-starfive.c +++ b/drivers/pci/controller/plda/pcie-starfive.c @@ -355,6 +355,9 @@ 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)