PCI: dwc: Driver clean-ups
Subsystems (21)
Rob Herring
reviewerv2 cover PCI: dwc: Driver clean-ups
This is a series of clean-ups for the Designware PCI driver. The series initially reworks the config space accessors to use the existing pci_ops struct. Then there's removal of various private data that's also present in the pci_host_bridge struct. There's also some duplicated common (PCI and DWC) register defines which I converted to use the common defines. Finally, the initialization for speed/gen, number of lanes, and N_FTS are all moved to the common DWC code.
This is compile tested only as I don't have any DWC based h/w, so any testing would be helpful. A branch is here[1].
Rob
[1] git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git pci-dw-cleanups
Rob Herring (40):
PCI: Allow root and child buses to have different pci_ops
PCI: dwc: Use DBI accessors instead of own config accessors
PCI: dwc: Allow overriding bridge pci_ops
PCI: dwc: Add a default pci_ops.map_bus for root port
PCI: dwc: al: Use pci_ops for child config space accessors
PCI: dwc: keystone: Use pci_ops for config space accessors
PCI: dwc: tegra: Use pci_ops for root config space accessors
PCI: dwc: meson: Use pci_ops for root config space accessors
PCI: dwc: kirin: Use pci_ops for root config space accessors
PCI: dwc: exynos: Use pci_ops for root config space accessors
PCI: dwc: histb: Use pci_ops for root config space accessors
PCI: dwc: Remove dwc specific config accessor ops
PCI: dwc: Use generic config accessors
PCI: Also call .add_bus() callback for root bus
PCI: dwc: keystone: Convert .scan_bus() callback to use add_bus
PCI: dwc: Convert to use pci_host_probe()
PCI: dwc: Remove root_bus pointer
PCI: dwc: Remove storing of PCI resources
PCI: dwc: Simplify config space handling
PCI: dwc/keystone: Drop duplicated 'num-viewport'
PCI: dwc: Check CONFIG_PCI_MSI inside dw_pcie_msi_init()
PCI: dwc/imx6: Remove duplicate define PCIE_LINK_WIDTH_SPEED_CONTROL
PCI: dwc: Add a 'num_lanes' field to struct dw_pcie
PCI: dwc: Ensure FAST_LINK_MODE is cleared
PCI: dwc/meson: Drop the duplicate number of lanes setup
PCI: dwc/meson: Drop unnecessary RC config space initialization
PCI: dwc/meson: Rework PCI config and DW port logic register accesses
PCI: dwc/imx6: Use common PCI register definitions
PCI: dwc/qcom: Use common PCI register definitions
PCI: dwc: Remove hardcoded PCI_CAP_ID_EXP offset
PCI: dwc/tegra: Use common Designware port logic register definitions
PCI: dwc: Remove read_dbi2 code
PCI: dwc: Make ATU accessors private
PCI: dwc: Centralize link gen setting
PCI: dwc: Set PORT_LINK_DLL_LINK_EN in common setup code
PCI: dwc/intel-gw: Drop unnecessary checking of DT 'device_type'
property
PCI: dwc/intel-gw: Move getting PCI_CAP_ID_EXP offset to
intel_pcie_link_setup()
PCI: dwc/intel-gw: Drop unused max_width
PCI: dwc: Move N_FTS setup to common setup
PCI: dwc: Use DBI accessors
drivers/pci/controller/dwc/pci-dra7xx.c | 29 +- drivers/pci/controller/dwc/pci-exynos.c | 45 +-- drivers/pci/controller/dwc/pci-imx6.c | 52 +-- drivers/pci/controller/dwc/pci-keystone.c | 126 ++----- drivers/pci/controller/dwc/pci-meson.c | 156 ++------- drivers/pci/controller/dwc/pcie-al.c | 70 +--- drivers/pci/controller/dwc/pcie-artpec6.c | 48 +-- .../pci/controller/dwc/pcie-designware-ep.c | 11 +- .../pci/controller/dwc/pcie-designware-host.c | 319 ++++++------------ .../pci/controller/dwc/pcie-designware-plat.c | 4 +- drivers/pci/controller/dwc/pcie-designware.c | 104 +++--- drivers/pci/controller/dwc/pcie-designware.h | 54 +-- drivers/pci/controller/dwc/pcie-histb.c | 45 +-- drivers/pci/controller/dwc/pcie-intel-gw.c | 65 +--- drivers/pci/controller/dwc/pcie-kirin.c | 43 +-- drivers/pci/controller/dwc/pcie-qcom.c | 33 +- drivers/pci/controller/dwc/pcie-spear13xx.c | 39 +-- drivers/pci/controller/dwc/pcie-tegra194.c | 120 ++----- drivers/pci/controller/dwc/pcie-uniphier.c | 3 +- drivers/pci/probe.c | 14 +- include/linux/pci.h | 1 + 21 files changed, 443 insertions(+), 938 deletions(-)
--
2.25.1
Rob Herring
reviewerPATCH v2 1/40 PCI: Allow root and child buses to have different pci_ops
PCI host bridges often have different ways to access the root and child bus config spaces. The host bridge drivers have invented their own abstractions to handle this. Let's support having different root and child bus pci_ops so these per driver abstractions can be removed.
--- drivers/pci/probe.c | 8 +++++++- include/linux/pci.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/pci/probe.c +7 -1
@@ -1036,6 +1036,7 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, struct pci_dev *bridge, int busnr) {struct pci_bus *child; +struct pci_host_bridge *host;int i;int ret;
@@ -1045,11 +1046,16 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,return NULL ; child->parent = parent; - child->ops = parent->ops; child->msi = parent->msi; child->sysdata = parent->sysdata; child->bus_flags = parent->bus_flags; + host =pci_find_host_bridge (parent); +if (host->child_ops) + child->ops = host->child_ops; +else + child->ops = parent->ops; +/* * Initialize some portions of the bus device, but don't register * it now as the parent is not properly set up yet.
include/linux/pci.h +1 -0
@@ -523,6 +523,7 @@ struct pci_host_bridge {struct device dev;struct pci_bus *bus;/* Root bus */ struct pci_ops *ops; +struct pci_ops *child_ops;void *sysdata;int busnr;struct list_head windows;/* resource_entry */
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 2/40 PCI: dwc: Use DBI accessors instead of own config accessors
In reply to Rob HerringThe Designware DBI space contains the root bus bridge config space. Platforms needing custom {rd,wr}_own_conf functions are also the ones needing custom {read,write}_dbi ops functions and the access sequences are the same.
Replace all dw_pcie_{rd,wr}_own_conf() calls with the DBI variants in preparation to remove dw_pcie_{rd,wr}_own_conf().
--- .../pci/controller/dwc/pcie-designware-host.c | 55 +++++++------------ 1 file changed, 19 insertions(+), 36 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +19 -36
@@ -82,13 +82,13 @@ irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)unsigned long val;u32 status, num_ctrls;irqreturn_t ret =IRQ_NONE ; +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); num_ctrls = pp->num_vectors /MAX_MSI_IRQS_PER_CTRL ;for (i =0 ; i < num_ctrls; i++) { -dw_pcie_rd_own_conf (pp,PCIE_MSI_INTR0_STATUS + - (i *MSI_REG_CTRL_BLOCK_SIZE ), -4 , &status); + status =dw_pcie_readl_dbi (pci,PCIE_MSI_INTR0_STATUS + + (i *MSI_REG_CTRL_BLOCK_SIZE ));if (!status)continue ;
@@ -148,6 +148,7 @@ static int dw_pci_msi_set_affinity(struct irq_data *d,static void dw_pci_bottom_mask (struct irq_data *d) {struct pcie_port *pp =irq_data_get_irq_chip_data (d); +struct dw_pcie *pci =to_dw_pcie_from_pp (pp);unsigned int res, bit, ctrl;unsigned long flags;
@@ -158,8 +159,7 @@ static void dw_pci_bottom_mask(struct irq_data *d) bit = d->hwirq %MAX_MSI_IRQS_PER_CTRL ; pp->irq_mask[ctrl] |=BIT (bit); -dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_MASK + res,4 , - pp->irq_mask[ctrl]); +dw_pcie_writel_dbi (pci,PCIE_MSI_INTR0_MASK + res, pp->irq_mask[ctrl]);raw_spin_unlock_irqrestore (&pp->lock, flags); }
@@ -167,6 +167,7 @@ static void dw_pci_bottom_mask(struct irq_data *d)static void dw_pci_bottom_unmask (struct irq_data *d) {struct pcie_port *pp =irq_data_get_irq_chip_data (d); +struct dw_pcie *pci =to_dw_pcie_from_pp (pp);unsigned int res, bit, ctrl;unsigned long flags;
@@ -177,8 +178,7 @@ static void dw_pci_bottom_unmask(struct irq_data *d) bit = d->hwirq %MAX_MSI_IRQS_PER_CTRL ; pp->irq_mask[ctrl] &= ~BIT (bit); -dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_MASK + res,4 , - pp->irq_mask[ctrl]); +dw_pcie_writel_dbi (pci,PCIE_MSI_INTR0_MASK + res, pp->irq_mask[ctrl]);raw_spin_unlock_irqrestore (&pp->lock, flags); }
@@ -186,13 +186,14 @@ static void dw_pci_bottom_unmask(struct irq_data *d)static void dw_pci_bottom_ack (struct irq_data *d) {struct pcie_port *pp =irq_data_get_irq_chip_data (d); +struct dw_pcie *pci =to_dw_pcie_from_pp (pp);unsigned int res, bit, ctrl; ctrl = d->hwirq /MAX_MSI_IRQS_PER_CTRL ; res = ctrl *MSI_REG_CTRL_BLOCK_SIZE ; bit = d->hwirq %MAX_MSI_IRQS_PER_CTRL ; -dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_STATUS + res,4 ,BIT (bit)); +dw_pcie_writel_dbi (pci,PCIE_MSI_INTR0_STATUS + res,BIT (bit)); }static struct irq_chip dw_pci_msi_bottom_irq_chip = {
@@ -310,10 +311,8 @@ void dw_pcie_msi_init(struct pcie_port *pp) msi_target = (u64 )pp->msi_data;/* Program the msi_data */ -dw_pcie_wr_own_conf (pp,PCIE_MSI_ADDR_LO ,4 , -lower_32_bits (msi_target)); -dw_pcie_wr_own_conf (pp,PCIE_MSI_ADDR_HI ,4 , -upper_32_bits (msi_target)); +dw_pcie_writel_dbi (pci,PCIE_MSI_ADDR_LO ,lower_32_bits (msi_target)); +dw_pcie_writel_dbi (pci,PCIE_MSI_ADDR_HI ,upper_32_bits (msi_target)); }EXPORT_SYMBOL_GPL (dw_pcie_msi_init);
@@ -327,7 +326,6 @@ int dw_pcie_host_init(struct pcie_port *pp)struct pci_bus *child;struct pci_host_bridge *bridge;struct resource *cfg_res; -u32 hdr_type;int ret;raw_spin_lock_init (&pci->pp.lock);
@@ -453,21 +451,6 @@ int dw_pcie_host_init(struct pcie_port *pp) goto err_free_msi; } - ret =dw_pcie_rd_own_conf (pp,PCI_HEADER_TYPE ,1 , &hdr_type); -if (ret !=PCIBIOS_SUCCESSFUL ) { -dev_err (pci->dev,"Failed reading PCI_HEADER_TYPE cfg space reg (ret: 0x%x)\n" , - ret); - ret =pcibios_err_to_errno (ret); - goto err_free_msi; - } -if (hdr_type !=PCI_HEADER_TYPE_BRIDGE ) { -dev_err (pci->dev, -"PCIe controller is not set to bridge type (hdr_type: 0x%x)!\n" , - hdr_type); - ret = -EIO ; - goto err_free_msi; - } - bridge->sysdata = pp; bridge->ops = &dw_pcie_ops;
@@ -638,12 +621,12 @@ void dw_pcie_setup_rc(struct pcie_port *pp)/* Initialize IRQ Status array */ for (ctrl =0 ; ctrl < num_ctrls; ctrl++) { pp->irq_mask[ctrl] = ~0 ; -dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_MASK + +dw_pcie_writel_dbi (pci,PCIE_MSI_INTR0_MASK + (ctrl *MSI_REG_CTRL_BLOCK_SIZE ), -4 , pp->irq_mask[ctrl]); -dw_pcie_wr_own_conf (pp,PCIE_MSI_INTR0_ENABLE + + pp->irq_mask[ctrl]); +dw_pcie_writel_dbi (pci,PCIE_MSI_INTR0_ENABLE + (ctrl *MSI_REG_CTRL_BLOCK_SIZE ), -4 , ~0 ); + ~0 ); } }
@@ -685,14 +668,14 @@ void dw_pcie_setup_rc(struct pcie_port *pp) pp->io_bus_addr, pp->io_size); } -dw_pcie_wr_own_conf (pp,PCI_BASE_ADDRESS_0 ,4 ,0 ); +dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,0 );/* Program correct class for RC */ -dw_pcie_wr_own_conf (pp,PCI_CLASS_DEVICE ,2 ,PCI_CLASS_BRIDGE_PCI ); +dw_pcie_writew_dbi (pci,PCI_CLASS_DEVICE ,PCI_CLASS_BRIDGE_PCI ); -dw_pcie_rd_own_conf (pp,PCIE_LINK_WIDTH_SPEED_CONTROL ,4 , &val); + val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); val |=PORT_LOGIC_SPEED_CHANGE ; -dw_pcie_wr_own_conf (pp,PCIE_LINK_WIDTH_SPEED_CONTROL ,4 , val); +dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val);dw_pcie_dbi_ro_wr_dis (pci); }
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 3/40 PCI: dwc: Allow overriding bridge pci_ops
In reply to Rob HerringIn preparation to allow drivers to set their own root and child pci_ops instead of using the DWC specific config space ops, we need to make the pci_host_bridge pointer available and move setting the bridge->ops and bridge->child_ops pointer to before the .host_init() hook.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 15 ++++++++++----- drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +10 -5
@@ -344,6 +344,8 @@ int dw_pcie_host_init(struct pcie_port *pp)if (!bridge)return -ENOMEM ; + pp->bridge = bridge; +/* Get the I/O and memory ranges from DT */ resource_list_for_each_entry (win, &bridge->windows) {switch (resource_type (win->res)) {
@@ -445,6 +447,10 @@ int dw_pcie_host_init(struct pcie_port *pp) } } +/* Set default bus ops */ + bridge->ops = &dw_pcie_ops; + bridge->child_ops = &dw_pcie_ops; +if (pp->ops->host_init) { ret = pp->ops->host_init (pp);if (ret)
@@ -452,7 +458,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } bridge->sysdata = pp; - bridge->ops = &dw_pcie_ops; ret =pci_scan_root_bus_bridge (bridge);if (ret)
@@ -654,11 +659,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_COMMAND , val);/* -* If the platform provides ->rd_other_conf, it means the platform -* uses its own address translation component rather than ATU, so -* we should not program the ATU here. +* If the platform provides its own child bus config accesses, it means +* the platform uses its own address translation component rather than +* ATU, so we should not program the ATU here. */ -if (!pp->ops->rd_other_conf) { +if (pp->bridge->child_ops == &dw_pcie_ops && !pp->ops->rd_other_conf) {dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX0 ,PCIE_ATU_TYPE_MEM , pp->mem_base, pp->mem_bus_addr, pp->mem_size);
drivers/pci/controller/dwc/pcie-designware.h +1 -0
@@ -200,6 +200,7 @@ struct pcie_port {u32 num_vectors;u32 irq_mask[MAX_MSI_CTRLS ];struct pci_bus *root_bus; +struct pci_host_bridge *bridge;raw_spinlock_t lock;DECLARE_BITMAP (msi_irq_in_use,MAX_MSI_IRQS ); };
Signature · 1 line
2.25.1
Re: [PATCH v2 03/40] PCI: dwc: Allow overriding bridge pci_ops
Quoted 48 lines · Rob Herring
In preparation to allow drivers to set their own root and child
pci_opsinstead of using the DWC specific config space ops, we need to make thepci_host_bridgepointer available and move setting thebridge->opsandbridge->child_opspointer to before the .host_init() hook.Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 15 ++++++++++----- drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +6
-1@@ -344,6 +344,8 @@ int dw_pcie_host_init(struct pcie_port *pp)if (!bridge)return -ENOMEM ; + pp->bridge = bridge; +/* Get the I/O and memory ranges from DT */ resource_list_for_each_entry (win, &bridge->windows) {switch (resource_type (win->res)) {@@ -445,6 +447,10 @@ int dw_pcie_host_init(struct pcie_port *pp) } } +/* Set default bus ops */ + bridge->ops = &dw_pcie_ops; + bridge->child_ops = &dw_pcie_ops; +if (pp->ops->host_init) { ret = pp->ops->host_init (pp);if (ret)@@ -452,7 +458,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } bridge->sysdata = pp; - bridge->ops = &dw_pcie_ops; ret =pci_scan_root_bus_bridge (bridge);if (ret)
drivers/pci/controller/dwc/pcie-designware-host.c void dw_pcie_setup_rc(struct pcie_port *pp) · line 664
Quoted 9 lines
drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -654,11 +659,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_COMMAND , val);/* -* If the platform provides ->rd_other_conf, it means the platform -* uses its own address translation component rather than ATU, so -* we should not program the ATU here. +* If the platform provides its own child bus config accesses, it means +* the platform uses its own address translation component rather than +* ATU, so we should not program the ATU here.
It is possible that a platform can have its own translation for configuration accesses and use DWC's ATU for memory/IO address translations. IMHO, ATU setup for memory/IO address translations shouldn't be skipped based on platform's '->rd_other_conf' implementation. Ex:- A platform can implement configuration space access through the ECAM mechanism yet choose to use ATU for memory/IO address translations.
Thanks,
Vidya Sagar
Quoted 19 lines
drivers/pci/controller/dwc/pcie-designware-host.c +1
-1*/ -if (!pp->ops->rd_other_conf) { +if (pp->bridge->child_ops == &dw_pcie_ops && !pp->ops->rd_other_conf) {dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX0 ,PCIE_ATU_TYPE_MEM , pp->mem_base, pp->mem_bus_addr, pp->mem_size);drivers/pci/controller/dwc/pcie-designware.h +1
-0@@ -200,6 +200,7 @@ struct pcie_port {u32 num_vectors;u32 irq_mask[MAX_MSI_CTRLS ];struct pci_bus *root_bus; +struct pci_host_bridge *bridge;raw_spinlock_t lock;DECLARE_BITMAP (msi_irq_in_use,MAX_MSI_IRQS ); };
Rob Herring
reviewerRe: [PATCH v2 03/40] PCI: dwc: Allow overriding bridge pci_ops
Quoted 54 lines · Vidya Sagar
Quoted 50 lines · Rob Herring
In preparation to allow drivers to set their own root and child
pci_opsinstead of using the DWC specific config space ops, we need to make thepci_host_bridgepointer available and move setting thebridge->opsandbridge->child_opspointer to before the .host_init() hook.Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 15 ++++++++++----- drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 11 insertions(+), 5 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +6
-1@@ -344,6 +344,8 @@ int dw_pcie_host_init(struct pcie_port *pp)if (!bridge)return -ENOMEM ; + pp->bridge = bridge; +/* Get the I/O and memory ranges from DT */ resource_list_for_each_entry (win, &bridge->windows) {switch (resource_type (win->res)) {@@ -445,6 +447,10 @@ int dw_pcie_host_init(struct pcie_port *pp) } } +/* Set default bus ops */ + bridge->ops = &dw_pcie_ops; + bridge->child_ops = &dw_pcie_ops; +if (pp->ops->host_init) { ret = pp->ops->host_init (pp);if (ret)@@ -452,7 +458,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } bridge->sysdata = pp; - bridge->ops = &dw_pcie_ops; ret =pci_scan_root_bus_bridge (bridge);if (ret)@@ -654,11 +659,11 @@ void dw_pcie_setup_rc(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_COMMAND , val);
Quoted 14 lines
drivers/pci/controller/dwc/pcie-designware-host.c void dw_pcie_setup_rc(struct pcie_port *pp) · line 664
Quoted 7 lines
drivers/pci/controller/dwc/pcie-designware-host.c +3
-3/* -* If the platform provides ->rd_other_conf, it means the platform -* uses its own address translation component rather than ATU, so -* we should not program the ATU here. +* If the platform provides its own child bus config accesses, it means +* the platform uses its own address translation component rather than +* ATU, so we should not program the ATU here. It is possible that a platform can have its own translation for configuration accesses and use DWC's ATU for memory/IO address translations. IMHO, ATU setup for memory/IO address translations shouldn't be skipped based on platform's '->rd_other_conf' implementation. Ex:- A platform can implement configuration space access through the ECAM mechanism yet choose to use ATU for memory/IO address translations.
A platform could, but none of them upstream do that. I'm all for doing ECAM setup (in the kernel) if possible. That could be in the DWC core with a feature flag the platform can set or something to enable it if we do that. It could be based on the config space size as well. I'm not sure what else determines whether ECAM can work besides having enough address space and at least 3 outbound iATU windows.
Rob
Rob Herring
reviewerPATCH v2 4/40 PCI: dwc: Add a default pci_ops.map_bus for root port
In reply to Rob HerringThe Designware root port config space is memory mapped accesses via the DBI space by default. Add a common implementation dw_pcie_own_conf_map_bus() for platforms to use.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 11 +++++++++++ drivers/pci/controller/dwc/pcie-designware.h | 2 ++ 2 files changed, 13 insertions(+)
drivers/pci/controller/dwc/pcie-designware-host.c +11 -0
@@ -602,6 +602,17 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32 devfn,return dw_pcie_wr_other_conf (pp, bus, devfn, where, size, val); } +void __iomem *dw_pcie_own_conf_map_bus (struct pci_bus *bus,unsigned int devfn,int where) +{ +struct pcie_port *pp = bus->sysdata; +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); + +if (PCI_SLOT (devfn) >0 ) +return NULL ; + +return pci->dbi_base + where; +} +static struct pci_ops dw_pcie_ops = { .read = dw_pcie_rd_conf, .write = dw_pcie_wr_conf,
drivers/pci/controller/dwc/pcie-designware.h +2 -0
@@ -377,6 +377,8 @@ void dw_pcie_setup_rc(struct pcie_port *pp);int dw_pcie_host_init (struct pcie_port *pp);void dw_pcie_host_deinit (struct pcie_port *pp);int dw_pcie_allocate_domains (struct pcie_port *pp); +void __iomem *dw_pcie_own_conf_map_bus (struct pci_bus *bus,unsigned int devfn, +int where);#else static inline irqreturn_t dw_handle_msi_irq (struct pcie_port *pp) {
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 5/40 PCI: dwc: al: Use pci_ops for child config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the Amazon driver to use the standard pci_ops for child bus config accesses.
--- drivers/pci/controller/dwc/pcie-al.c | 63 ++++++---------------------- 1 file changed, 13 insertions(+), 50 deletions(-)
drivers/pci/controller/dwc/pcie-al.c +13 -50
@@ -217,14 +217,15 @@ static inline void al_pcie_target_bus_set(struct al_pcie *pcie, reg); } -static void __iomem *al_pcie_conf_addr_map (struct al_pcie *pcie, -unsigned int busnr, -unsigned int devfn) +static void __iomem *al_pcie_conf_addr_map_bus (struct pci_bus *bus, +unsigned int devfn,int where) { +struct pcie_port *pp = bus->sysdata; +struct al_pcie *pcie =to_al_pcie (to_dw_pcie_from_pp (pp)); +unsigned int busnr = bus->number;struct al_pcie_target_bus_cfg *target_bus_cfg = &pcie->target_bus_cfg;unsigned int busnr_ecam = busnr & target_bus_cfg->ecam_mask;unsigned int busnr_reg = busnr & target_bus_cfg->reg_mask; -struct pcie_port *pp = &pcie->pci->pp;void __iomem *pci_base_addr; pci_base_addr = (void __iomem *)((uintptr_t)pp->va_cfg0_base +
@@ -240,52 +241,14 @@ static void __iomem *al_pcie_conf_addr_map(struct al_pcie *pcie, target_bus_cfg->reg_mask); } -return pci_base_addr; -} - -static int al_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 *val) -{ -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct al_pcie *pcie =to_al_pcie (pci); -unsigned int busnr = bus->number; -void __iomem *pci_addr; -int rc; - - pci_addr =al_pcie_conf_addr_map (pcie, busnr, devfn); - - rc =dw_pcie_read (pci_addr + where, size, val); - -dev_dbg (pci->dev,"%d-byte config read from %04x:%02x:%02x.%d offset 0x%x (pci_addr: 0x%px) - val:0x%x\n" , - size,pci_domain_nr (bus), bus->number, -PCI_SLOT (devfn),PCI_FUNC (devfn), where, - (pci_addr + where), *val); - -return rc; +return pci_base_addr + where; } -static int al_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 val) -{ -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct al_pcie *pcie =to_al_pcie (pci); -unsigned int busnr = bus->number; -void __iomem *pci_addr; -int rc; - - pci_addr =al_pcie_conf_addr_map (pcie, busnr, devfn); - - rc =dw_pcie_write (pci_addr + where, size, val); - -dev_dbg (pci->dev,"%d-byte config write to %04x:%02x:%02x.%d offset 0x%x (pci_addr: 0x%px) - val:0x%x\n" , - size,pci_domain_nr (bus), bus->number, -PCI_SLOT (devfn),PCI_FUNC (devfn), where, - (pci_addr + where), val); - -return rc; -} +static struct pci_ops al_child_pci_ops = { + .map_bus = al_pcie_conf_addr_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +};static void al_pcie_config_prepare (struct al_pcie *pcie) {
@@ -339,6 +302,8 @@ static int al_pcie_host_init(struct pcie_port *pp)struct al_pcie *pcie =to_al_pcie (pci);int rc; + pp->bridge->child_ops = &al_child_pci_ops; + rc =al_pcie_rev_id_get (pcie, &pcie->controller_rev_id);if (rc)return rc;
@@ -353,8 +318,6 @@ static int al_pcie_host_init(struct pcie_port *pp) }static const struct dw_pcie_host_ops al_pcie_host_ops = { - .rd_other_conf = al_pcie_rd_other_conf, - .wr_other_conf = al_pcie_wr_other_conf, .host_init = al_pcie_host_init, };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 6/40 PCI: dwc: keystone: Use pci_ops for config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the TI Keystone driver to use the standard pci_ops for config accesses.
--- drivers/pci/controller/dwc/pci-keystone.c | 40 ++++++++++------------- 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +18 -22
@@ -430,10 +430,10 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)ks_pcie_app_writel (ks_pcie,CMD_STATUS , val); } -static int ks_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 *val) +static void __iomem *ks_pcie_other_map_bus (struct pci_bus *bus, +unsigned int devfn,int where) { +struct pcie_port *pp = bus->sysdata;struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci);u32 reg;
@@ -444,25 +444,14 @@ static int ks_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, reg |=CFG_TYPE1 ;ks_pcie_app_writel (ks_pcie,CFG_SETUP , reg); -return dw_pcie_read (pp->va_cfg0_base + where, size, val); +return pp->va_cfg0_base + where; } -static int ks_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 val) -{ -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); -u32 reg; - - reg =CFG_BUS (bus->number) |CFG_DEVICE (PCI_SLOT (devfn)) | -CFG_FUNC (PCI_FUNC (devfn)); -if (!pci_is_root_bus (bus->parent)) - reg |=CFG_TYPE1 ; -ks_pcie_app_writel (ks_pcie,CFG_SETUP , reg); - -return dw_pcie_write (pp->va_cfg0_base + where, size, val); -} +static struct pci_ops ks_child_pcie_ops = { + .map_bus = ks_pcie_other_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +};/** * ks_pcie_v3_65_scan_bus() - keystone scan_bus post initialization
@@ -490,6 +479,12 @@ static void ks_pcie_v3_65_scan_bus(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 , ks_pcie->app.start); } +static struct pci_ops ks_pcie_ops = { + .map_bus = dw_pcie_own_conf_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +}; +/** * ks_pcie_link_up() - Check if link up */
@@ -807,6 +802,9 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)struct keystone_pcie *ks_pcie =to_keystone_pcie (pci);int ret; + pp->bridge->ops = &ks_pcie_ops; + pp->bridge->child_ops = &ks_child_pcie_ops; + ret =ks_pcie_config_legacy_irq (ks_pcie);if (ret)return ret;
@@ -842,8 +840,6 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) }static const struct dw_pcie_host_ops ks_pcie_host_ops = { - .rd_other_conf = ks_pcie_rd_other_conf, - .wr_other_conf = ks_pcie_wr_other_conf, .host_init = ks_pcie_host_init, .msi_host_init = ks_pcie_msi_host_init, .scan_bus = ks_pcie_v3_65_scan_bus,
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 7/40 PCI: dwc: tegra: Use pci_ops for root config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the Tegra driver to use the standard pci_ops for root bus config accesses.
--- drivers/pci/controller/dwc/pcie-tegra194.c | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/pci/controller/dwc/pcie-tegra194.c +16 -14
@@ -568,42 +568,44 @@ static irqreturn_t tegra_pcie_ep_hard_irq(int irq, void *arg)return IRQ_HANDLED ; } -static int tegra_pcie_dw_rd_own_conf (struct pcie_port *pp,int where,int size, -u32 *val) +static int tegra_pcie_dw_rd_own_conf (struct pci_bus *bus,u32 devfn,int where, +int size,u32 *val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -/* * This is an endpoint mode specific register happen to appear even * when controller is operating in root port mode and system hangs * when it is accessed with link being in ASPM-L1 state. * So skip accessing it altogether */ -if (where ==PORT_LOGIC_MSIX_DOORBELL ) { +if (!PCI_SLOT (devfn) && where ==PORT_LOGIC_MSIX_DOORBELL ) { *val =0x00000000 ;return PCIBIOS_SUCCESSFUL ; } -return dw_pcie_read (pci->dbi_base + where, size, val); +return pci_generic_config_read (bus, devfn, where, size, val); } -static int tegra_pcie_dw_wr_own_conf (struct pcie_port *pp,int where,int size, -u32 val) +static int tegra_pcie_dw_wr_own_conf (struct pci_bus *bus,u32 devfn,int where, +int size,u32 val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -/* * This is an endpoint mode specific register happen to appear even * when controller is operating in root port mode and system hangs * when it is accessed with link being in ASPM-L1 state. * So skip accessing it altogether */ -if (where ==PORT_LOGIC_MSIX_DOORBELL ) +if (!PCI_SLOT (devfn) && where ==PORT_LOGIC_MSIX_DOORBELL )return PCIBIOS_SUCCESSFUL ; -return dw_pcie_write (pci->dbi_base + where, size, val); +return pci_generic_config_write (bus, devfn, where, size, val); } +static struct pci_ops tegra_pci_ops = { + .map_bus = dw_pcie_own_conf_map_bus, + .read = tegra_pcie_dw_rd_own_conf, + .write = tegra_pcie_dw_wr_own_conf, +}; +#if defined(CONFIG_PCIEASPM )static void disable_aspm_l11 (struct tegra_pcie_dw *pcie) {
@@ -970,6 +972,8 @@ static int tegra_pcie_dw_host_init(struct pcie_port *pp)struct tegra_pcie_dw *pcie =to_tegra_pcie (pci);u32 val, tmp, offset, speed; + pp->bridge->ops = &tegra_pci_ops; +tegra_pcie_prepare_host (pp);if (dw_pcie_wait_for_link (pci)) {
@@ -1057,8 +1061,6 @@ static const struct dw_pcie_ops tegra_dw_pcie_ops = { };static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = { - .rd_own_conf = tegra_pcie_dw_rd_own_conf, - .wr_own_conf = tegra_pcie_dw_wr_own_conf, .host_init = tegra_pcie_dw_host_init, .set_num_vectors = tegra_pcie_set_msi_vec_num, };
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v2 07/40] PCI: dwc: tegra: Use pci_ops for root config space accessors
I love your patch! Yet something to improve:
Hi Rob,
I love your patch! Yet something to improve:
[auto build test ERROR on pci/next]
[also build test ERROR on v5.9-rc2 next-20200824]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Rob-Herring/PCI-dwc-Driver-clean-ups/20200821-115909 base: https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next config: i386-randconfig-a002-20200824 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/pci/controller/dwc/pcie-tegra194.c:604:13: error: 'dw_pcie_own_conf_map_bus' undeclared here (not in a function)
604 | .map_bus = dw_pcie_own_conf_map_bus,
| ^~~~~~~~~~~~~~~~~~~~~~~~# https://github.com/0day-ci/linux/commit/6e0d4887cd1f9e569afcd7164a6baeb4d70e99b0
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rob-Herring/PCI-dwc-Driver-clean-ups/20200821-115909 git checkout 6e0d4887cd1f9e569afcd7164a6baeb4d70e99b0
vim +/dw_pcie_own_conf_map_bus +604 drivers/pci/controller/dwc/pcie-tegra194.c
602
603 static struct pci_ops tegra_pci_ops = {
> 604 .map_bus = dw_pcie_own_conf_map_bus,
605 .read = tegra_pcie_dw_rd_own_conf,
606 .write = tegra_pcie_dw_wr_own_conf,
607 };
608
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Rob Herring
reviewerPATCH v2 8/40 PCI: dwc: meson: Use pci_ops for root config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the Amlogic meson driver to use the standard pci_ops for root bus config accesses.
--- drivers/pci/controller/dwc/pci-meson.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +10 -13
@@ -383,13 +383,12 @@ static void meson_pcie_enable_interrupts(struct meson_pcie *mp)dw_pcie_msi_init (&mp->pci.pp); } -static int meson_pcie_rd_own_conf (struct pcie_port *pp,int where,int size, -u32 *val) +static int meson_pcie_rd_own_conf (struct pci_bus *bus,u32 devfn, +int where,int size,u32 *val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp);int ret; - ret =dw_pcie_read (pci->dbi_base + where, size, val); + ret =pci_generic_config_read (bus, devfn, where, size, val);if (ret !=PCIBIOS_SUCCESSFUL )return ret;
@@ -410,13 +409,11 @@ static int meson_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,return PCIBIOS_SUCCESSFUL ; } -static int meson_pcie_wr_own_conf (struct pcie_port *pp,int where, -int size,u32 val) -{ -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); - -return dw_pcie_write (pci->dbi_base + where, size, val); -} +static struct pci_ops meson_pci_ops = { + .map_bus = dw_pcie_own_conf_map_bus, + .read = meson_pcie_rd_own_conf, + .write = pci_generic_config_write, +};static int meson_pcie_link_up (struct dw_pcie *pci) {
@@ -463,6 +460,8 @@ static int meson_pcie_host_init(struct pcie_port *pp)struct meson_pcie *mp =to_meson_pcie (pci);int ret; + pp->bridge->ops = &meson_pci_ops; + ret =meson_pcie_establish_link (mp);if (ret)return ret;
@@ -473,8 +472,6 @@ static int meson_pcie_host_init(struct pcie_port *pp) }static const struct dw_pcie_host_ops meson_pcie_host_ops = { - .rd_own_conf = meson_pcie_rd_own_conf, - .wr_own_conf = meson_pcie_wr_own_conf, .host_init = meson_pcie_host_init, };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 9/40 PCI: dwc: kirin: Use pci_ops for root config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the HiSilicon Kirin driver to use the standard pci_ops for root bus config accesses.
--- drivers/pci/controller/dwc/pcie-kirin.c | 39 +++++++++++++------------ 1 file changed, 21 insertions(+), 18 deletions(-)
drivers/pci/controller/dwc/pcie-kirin.c +21 -18
@@ -330,34 +330,37 @@ static void kirin_pcie_sideband_dbi_r_mode(struct kirin_pcie *kirin_pcie,kirin_apb_ctrl_writel (kirin_pcie, val,SOC_PCIECTRL_CTRL1_ADDR ); } -static int kirin_pcie_rd_own_conf (struct pcie_port *pp, +static int kirin_pcie_rd_own_conf (struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct kirin_pcie *kirin_pcie =to_kirin_pcie (pci); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -kirin_pcie_sideband_dbi_r_mode (kirin_pcie, true); - ret =dw_pcie_read (pci->dbi_base + where, size, val); -kirin_pcie_sideband_dbi_r_mode (kirin_pcie, false); +if (PCI_SLOT (devfn)) { + *val = ~0 ; +return PCIBIOS_DEVICE_NOT_FOUND ; + } -return ret; + *val =dw_pcie_read_dbi (pci, where, size); +return PCIBIOS_SUCCESSFUL ; } -static int kirin_pcie_wr_own_conf (struct pcie_port *pp, +static int kirin_pcie_wr_own_conf (struct pci_bus *bus,unsigned int devfn,int where,int size,u32 val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct kirin_pcie *kirin_pcie =to_kirin_pcie (pci); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -kirin_pcie_sideband_dbi_w_mode (kirin_pcie, true); - ret =dw_pcie_write (pci->dbi_base + where, size, val); -kirin_pcie_sideband_dbi_w_mode (kirin_pcie, false); +if (PCI_SLOT (devfn)) +return PCIBIOS_DEVICE_NOT_FOUND ; -return ret; +dw_pcie_write_dbi (pci, where, size, val); +return PCIBIOS_SUCCESSFUL ; } +static struct pci_ops kirin_pci_ops = { + .read = kirin_pcie_rd_own_conf, + .write = kirin_pcie_wr_own_conf, +}; +static u32 kirin_pcie_read_dbi (struct dw_pcie *pci,void __iomem *base,u32 reg,size_t size) {
@@ -423,6 +426,8 @@ static int kirin_pcie_establish_link(struct pcie_port *pp)static int kirin_pcie_host_init (struct pcie_port *pp) { + pp->bridge->ops = &kirin_pci_ops; +kirin_pcie_establish_link (pp);if (IS_ENABLED (CONFIG_PCI_MSI ))
@@ -438,8 +443,6 @@ static const struct dw_pcie_ops kirin_dw_pcie_ops = { };static const struct dw_pcie_host_ops kirin_pcie_host_ops = { - .rd_own_conf = kirin_pcie_rd_own_conf, - .wr_own_conf = kirin_pcie_wr_own_conf, .host_init = kirin_pcie_host_init, };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 10/40 PCI: dwc: exynos: Use pci_ops for root config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the Samsung Exynos driver to use the standard pci_ops for root bus config accesses.
--- drivers/pci/controller/dwc/pci-exynos.c | 45 ++++++++++++++----------- 1 file changed, 25 insertions(+), 20 deletions(-)
drivers/pci/controller/dwc/pci-exynos.c +25 -20
@@ -336,32 +336,37 @@ static void exynos_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,exynos_pcie_sideband_dbi_w_mode (ep, false); } -static int exynos_pcie_rd_own_conf (struct pcie_port *pp,int where,int size, -u32 *val) +static int exynos_pcie_rd_own_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 *val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct exynos_pcie *ep =to_exynos_pcie (pci); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -exynos_pcie_sideband_dbi_r_mode (ep, true); - ret =dw_pcie_read (pci->dbi_base + where, size, val); -exynos_pcie_sideband_dbi_r_mode (ep, false); -return ret; +if (PCI_SLOT (devfn)) { + *val = ~0 ; +return PCIBIOS_DEVICE_NOT_FOUND ; + } + + *val =dw_pcie_read_dbi (pci, where, size); +return PCIBIOS_SUCCESSFUL ; } -static int exynos_pcie_wr_own_conf (struct pcie_port *pp,int where,int size, -u32 val) +static int exynos_pcie_wr_own_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -struct exynos_pcie *ep =to_exynos_pcie (pci); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -exynos_pcie_sideband_dbi_w_mode (ep, true); - ret =dw_pcie_write (pci->dbi_base + where, size, val); -exynos_pcie_sideband_dbi_w_mode (ep, false); -return ret; +if (PCI_SLOT (devfn)) +return PCIBIOS_DEVICE_NOT_FOUND ; + +dw_pcie_write_dbi (pci, where, size, val); +return PCIBIOS_SUCCESSFUL ; } +static struct pci_ops exynos_pci_ops = { + .read = exynos_pcie_rd_own_conf, + .write = exynos_pcie_wr_own_conf, +}; +static int exynos_pcie_link_up (struct dw_pcie *pci) {struct exynos_pcie *ep =to_exynos_pcie (pci);
@@ -379,6 +384,8 @@ static int exynos_pcie_host_init(struct pcie_port *pp)struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct exynos_pcie *ep =to_exynos_pcie (pci); + pp->bridge->ops = &exynos_pci_ops; +exynos_pcie_establish_link (ep);exynos_pcie_enable_interrupts (ep);
@@ -386,8 +393,6 @@ static int exynos_pcie_host_init(struct pcie_port *pp) }static const struct dw_pcie_host_ops exynos_pcie_host_ops = { - .rd_own_conf = exynos_pcie_rd_own_conf, - .wr_own_conf = exynos_pcie_wr_own_conf, .host_init = exynos_pcie_host_init, };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 11/40 PCI: dwc: histb: Use pci_ops for root config space accessors
In reply to Rob HerringNow that DWC drivers can setup their own pci_ops for the root and child buses, convert the HiSilicon histb driver to use the standard pci_ops for root bus config accesses.
--- drivers/pci/controller/dwc/pcie-histb.c | 41 ++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-)
drivers/pci/controller/dwc/pcie-histb.c +23 -18
@@ -122,32 +122,37 @@ static void histb_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,histb_pcie_dbi_w_mode (&pci->pp, false); } -static int histb_pcie_rd_own_conf (struct pcie_port *pp,int where, -int size,u32 *val) +static int histb_pcie_rd_own_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 *val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -histb_pcie_dbi_r_mode (pp, true); - ret =dw_pcie_read (pci->dbi_base + where, size, val); -histb_pcie_dbi_r_mode (pp, false); +if (PCI_SLOT (devfn)) { + *val = ~0 ; +return PCIBIOS_DEVICE_NOT_FOUND ; + } -return ret; + *val =dw_pcie_read_dbi (pci, where, size); +return PCIBIOS_SUCCESSFUL ; } -static int histb_pcie_wr_own_conf (struct pcie_port *pp,int where, -int size,u32 val) +static int histb_pcie_wr_own_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 val) { -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -int ret; +struct dw_pcie *pci =to_dw_pcie_from_pp (bus->sysdata); -histb_pcie_dbi_w_mode (pp, true); - ret =dw_pcie_write (pci->dbi_base + where, size, val); -histb_pcie_dbi_w_mode (pp, false); +if (PCI_SLOT (devfn)) +return PCIBIOS_DEVICE_NOT_FOUND ; -return ret; +dw_pcie_write_dbi (pci, where, size, val); +return PCIBIOS_SUCCESSFUL ; } +static struct pci_ops histb_pci_ops = { + .read = histb_pcie_rd_own_conf, + .write = histb_pcie_wr_own_conf, +}; +static int histb_pcie_link_up (struct dw_pcie *pci) {struct histb_pcie *hipcie =to_histb_pcie (pci);
@@ -194,6 +199,8 @@ static int histb_pcie_establish_link(struct pcie_port *pp)static int histb_pcie_host_init (struct pcie_port *pp) { + pp->bridge->ops = &histb_pci_ops; +histb_pcie_establish_link (pp);if (IS_ENABLED (CONFIG_PCI_MSI ))
@@ -203,8 +210,6 @@ static int histb_pcie_host_init(struct pcie_port *pp) }static const struct dw_pcie_host_ops histb_pcie_host_ops = { - .rd_own_conf = histb_pcie_rd_own_conf, - .wr_own_conf = histb_pcie_wr_own_conf, .host_init = histb_pcie_host_init, };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 12/40 PCI: dwc: Remove dwc specific config accessor ops
In reply to Rob HerringNow that all the drivers needing custom config accessors have been converted to define their own pci_ops, we can remove the DWC specific function callbacks {rd,wr}_{own,other}_conf.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 14 -------------- drivers/pci/controller/dwc/pcie-designware.h | 6 ------ 2 files changed, 20 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +0 -14
@@ -26,9 +26,6 @@ static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, {struct dw_pcie *pci; -if (pp->ops->rd_own_conf) -return pp->ops->rd_own_conf (pp, where, size, val); - pci =to_dw_pcie_from_pp (pp);return dw_pcie_read (pci->dbi_base + where, size, val); }
@@ -38,9 +35,6 @@ static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size, {struct dw_pcie *pci; -if (pp->ops->wr_own_conf) -return pp->ops->wr_own_conf (pp, where, size, val); - pci =to_dw_pcie_from_pp (pp);return dw_pcie_write (pci->dbi_base + where, size, val); }
@@ -537,10 +531,6 @@ static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus,static int dw_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus,u32 devfn,int where,int size,u32 *val) { -if (pp->ops->rd_other_conf) -return pp->ops->rd_other_conf (pp, bus, devfn, where, - size, val); -return dw_pcie_access_other_conf (pp, bus, devfn, where, size, val, false); }
@@ -548,10 +538,6 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,static int dw_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus,u32 devfn,int where,int size,u32 val) { -if (pp->ops->wr_other_conf) -return pp->ops->wr_other_conf (pp, bus, devfn, where, - size, val); -return dw_pcie_access_other_conf (pp, bus, devfn, where, size, &val, true); }
drivers/pci/controller/dwc/pcie-designware.h +0 -6
@@ -160,12 +160,6 @@ enum dw_pcie_device_mode { };struct dw_pcie_host_ops { -int (*rd_own_conf)(struct pcie_port *pp,int where,int size,u32 *val); -int (*wr_own_conf)(struct pcie_port *pp,int where,int size,u32 val); -int (*rd_other_conf)(struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size,u32 *val); -int (*wr_other_conf)(struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size,u32 val);int (*host_init)(struct pcie_port *pp);void (*scan_bus)(struct pcie_port *pp);void (*set_num_vectors)(struct pcie_port *pp);
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 13/40 PCI: dwc: Use generic config accessors
In reply to Rob HerringNow that all the platforms with custom config access handling define their own pci_ops, let's split the default config accessors to use different pci_ops for root and child buses. With this, we can use the generic config accessors. The child bus accesses mainly require a .map_bus() hook to reconfigure the iATU on each config space access.
--- .../pci/controller/dwc/pcie-designware-host.c | 119 ++++++------------ 1 file changed, 37 insertions(+), 82 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +37 -82
@@ -20,24 +20,7 @@#include "pcie-designware.h" static struct pci_ops dw_pcie_ops; - -static int dw_pcie_rd_own_conf (struct pcie_port *pp,int where,int size, -u32 *val) -{ -struct dw_pcie *pci; - - pci =to_dw_pcie_from_pp (pp); -return dw_pcie_read (pci->dbi_base + where, size, val); -} - -static int dw_pcie_wr_own_conf (struct pcie_port *pp,int where,int size, -u32 val) -{ -struct dw_pcie *pci; - - pci =to_dw_pcie_from_pp (pp); -return dw_pcie_write (pci->dbi_base + where, size, val); -} +static struct pci_ops dw_child_pcie_ops;static void dw_msi_ack_irq (struct irq_data *d) {
@@ -443,7 +426,7 @@ int dw_pcie_host_init(struct pcie_port *pp)/* Set default bus ops */ bridge->ops = &dw_pcie_ops; - bridge->child_ops = &dw_pcie_ops; + bridge->child_ops = &dw_child_pcie_ops;if (pp->ops->host_init) { ret = pp->ops->host_init (pp);
@@ -487,14 +470,14 @@ void dw_pcie_host_deinit(struct pcie_port *pp) }EXPORT_SYMBOL_GPL (dw_pcie_host_deinit); -static int dw_pcie_access_other_conf (struct pcie_port *pp,struct pci_bus *bus, -u32 devfn,int where,int size,u32 *val, -bool write) +static void __iomem *dw_pcie_other_conf_map_bus (struct pci_bus *bus, +unsigned int devfn,int where) { -int ret, type; +int type;u32 busdev, cfg_size;u64 cpu_addr;void __iomem *va_cfg_base; +struct pcie_port *pp = bus->sysdata;struct dw_pcie *pci =to_dw_pcie_from_pp (pp); busdev = PCIE_ATU_BUS(bus->number) | PCIE_ATU_DEV(PCI_SLOT(devfn)) |
@@ -515,79 +498,50 @@ static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus,dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX1 , type, cpu_addr, busdev, cfg_size); -if (write) - ret =dw_pcie_write (va_cfg_base + where, size, *val); -else - ret =dw_pcie_read (va_cfg_base + where, size, val); -if (pci->num_viewport <=2 ) -dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX1 , -PCIE_ATU_TYPE_IO , pp->io_base, - pp->io_bus_addr, pp->io_size); - -return ret; -} - -static int dw_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, -u32 devfn,int where,int size,u32 *val) -{ -return dw_pcie_access_other_conf (pp, bus, devfn, where, size, val, - false); +return va_cfg_base + where; } -static int dw_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, -u32 devfn,int where,int size,u32 val) -{ -return dw_pcie_access_other_conf (pp, bus, devfn, where, size, &val, - true); -} - -static int dw_pcie_valid_device (struct pcie_port *pp,struct pci_bus *bus, -int dev) -{ -struct dw_pcie *pci =to_dw_pcie_from_pp (pp); - -/* If there is no link, then there is no device */ -if (!pci_is_root_bus (bus)) { -if (!dw_pcie_link_up (pci)) -return 0 ; - }else if (dev >0 ) -/* Access only one slot on each root port */ -return 0 ; - -return 1 ; -} - -static int dw_pcie_rd_conf (struct pci_bus *bus,u32 devfn,int where, -int size,u32 *val) +static int dw_pcie_rd_other_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 *val) { +int ret;struct pcie_port *pp = bus->sysdata; +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -if (!dw_pcie_valid_device (pp, bus,PCI_SLOT (devfn))) { - *val =0xffffffff ; -return PCIBIOS_DEVICE_NOT_FOUND ; - } + ret =pci_generic_config_read (bus, devfn, where, size, val); -if (pci_is_root_bus (bus)) -return dw_pcie_rd_own_conf (pp, where, size, val); +if (!ret && pci->num_viewport <=2 ) +dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , pp->io_base, + pp->io_bus_addr, pp->io_size); -return dw_pcie_rd_other_conf (pp, bus, devfn, where, size, val); +return ret; } -static int dw_pcie_wr_conf (struct pci_bus *bus,u32 devfn, -int where,int size,u32 val) +static int dw_pcie_wr_other_conf (struct pci_bus *bus,unsigned int devfn, +int where,int size,u32 val) { +int ret;struct pcie_port *pp = bus->sysdata; +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); -if (!dw_pcie_valid_device (pp, bus,PCI_SLOT (devfn))) -return PCIBIOS_DEVICE_NOT_FOUND ; + ret =pci_generic_config_write (bus, devfn, where, size, val); -if (pci_is_root_bus (bus)) -return dw_pcie_wr_own_conf (pp, where, size, val); +if (!ret && pci->num_viewport <=2 ) +dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , pp->io_base, + pp->io_bus_addr, pp->io_size); -return dw_pcie_wr_other_conf (pp, bus, devfn, where, size, val); +return ret; } +static struct pci_ops dw_child_pcie_ops = { + .map_bus = dw_pcie_other_conf_map_bus, + .read = dw_pcie_rd_other_conf, + .write = dw_pcie_wr_other_conf, +}; +void __iomem *dw_pcie_own_conf_map_bus (struct pci_bus *bus,unsigned int devfn,int where) {struct pcie_port *pp = bus->sysdata;
@@ -600,8 +554,9 @@ void __iomem *dw_pcie_own_conf_map_bus(struct pci_bus *bus, unsigned int devfn, }static struct pci_ops dw_pcie_ops = { - .read = dw_pcie_rd_conf, - .write = dw_pcie_wr_conf, + .map_bus = dw_pcie_own_conf_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, };void dw_pcie_setup_rc (struct pcie_port *pp)
@@ -660,7 +615,7 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* the platform uses its own address translation component rather than * ATU, so we should not program the ATU here. */ -if (pp->bridge->child_ops == &dw_pcie_ops && !pp->ops->rd_other_conf) { +if (pp->bridge->child_ops == &dw_child_pcie_ops) {dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX0 ,PCIE_ATU_TYPE_MEM , pp->mem_base, pp->mem_bus_addr, pp->mem_size);
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 14/40 PCI: Also call .add_bus() callback for root bus
In reply to Rob HerringSimilar to pcibios_add_bus(), call pci_ops.add_bus() when the root bus is added. This allows host bridge drivers to do any setup requiring a bus pointer.
There are currently no .add_bus() callbacks, so this is safe to do.
--- drivers/pci/probe.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pci/probe.c +6 -0
@@ -941,6 +941,12 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)pcibios_add_bus (bus); +if (bus->ops->add_bus) { + err = bus->ops->add_bus (bus); +if (WARN_ON (err <0 )) +dev_err (&bus->dev,"failed to add bus: %d\n" , err); + } +/* Create legacy_io and legacy_mem files for this bus */ pci_create_legacy_files (bus);
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 15/40 PCI: dwc: keystone: Convert .scan_bus() callback to use add_bus
In reply to Rob HerringTI keystone is the only Designware driver using .scan_bus(). This function pointer is the only thing preventing the Designware driver from using pci_host_probe(). Let's use the pci_ops.add_bus hook instead.
--- drivers/pci/controller/dwc/pci-keystone.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +9 -3
@@ -454,15 +454,19 @@ static struct pci_ops ks_child_pcie_ops = { };/** -* ks_pcie_v3_65_scan_bus() - keystone scan_bus post initialization +* ks_pcie_v3_65_add_bus() - keystone add_bus post initialization * * This sets BAR0 to enable inbound access for MSI_IRQ register */ -static void ks_pcie_v3_65_scan_bus (struct pcie_port *pp) +static int ks_pcie_v3_65_add_bus (struct pci_bus *bus) { +struct pcie_port *pp = bus->sysdata;struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); +if (!pci_is_root_bus (bus)) +return 0 ; +/* Configure and set up BAR0 */ ks_pcie_set_dbi_mode (ks_pcie);
@@ -477,12 +481,15 @@ static void ks_pcie_v3_65_scan_bus(struct pcie_port *pp)* be sufficient. Use physical address to avoid any conflicts. */ dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 , ks_pcie->app.start); + +return 0 ; }static struct pci_ops ks_pcie_ops = { .map_bus = dw_pcie_own_conf_map_bus, .read = pci_generic_config_read, .write = pci_generic_config_write, + .add_bus = ks_pcie_v3_65_add_bus, };/**
@@ -842,7 +849,6 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)static const struct dw_pcie_host_ops ks_pcie_host_ops = { .host_init = ks_pcie_host_init, .msi_host_init = ks_pcie_msi_host_init, - .scan_bus = ks_pcie_v3_65_scan_bus, };static const struct dw_pcie_host_ops ks_pcie_am654_host_ops = {
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 16/40 PCI: dwc: Convert to use pci_host_probe()
In reply to Rob HerringNow that there are no more .scan_bus() callbacks, we can remove it and just use pci_host_probe().
--- .../pci/controller/dwc/pcie-designware-host.c | 21 +++---------------- drivers/pci/controller/dwc/pcie-designware.h | 1 - 2 files changed, 3 insertions(+), 19 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +3 -18
@@ -300,7 +300,6 @@ int dw_pcie_host_init(struct pcie_port *pp)struct device_node *np = dev->of_node;struct platform_device *pdev =to_platform_device (dev);struct resource_entry *win; -struct pci_bus *child;struct pci_host_bridge *bridge;struct resource *cfg_res;int ret;
@@ -436,23 +435,9 @@ int dw_pcie_host_init(struct pcie_port *pp) bridge->sysdata = pp; - ret =pci_scan_root_bus_bridge (bridge); -if (ret) - goto err_free_msi; - - pp->root_bus = bridge->bus; - -if (pp->ops->scan_bus) - pp->ops->scan_bus (pp); - -pci_bus_size_bridges (pp->root_bus); -pci_bus_assign_resources (pp->root_bus); - -list_for_each_entry (child, &pp->root_bus->children, node) -pcie_bus_configure_settings (child); - -pci_bus_add_devices (pp->root_bus); -return 0 ; + ret =pci_host_probe (bridge); +if (!ret) +return 0 ; err_free_msi:if (pci_msi_enabled () && !pp->ops->msi_host_init)
drivers/pci/controller/dwc/pcie-designware.h +0 -1
@@ -161,7 +161,6 @@ enum dw_pcie_device_mode {struct dw_pcie_host_ops {int (*host_init)(struct pcie_port *pp); -void (*scan_bus)(struct pcie_port *pp);void (*set_num_vectors)(struct pcie_port *pp);int (*msi_host_init)(struct pcie_port *pp); };
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 17/40 PCI: dwc: Remove root_bus pointer
In reply to Rob HerringThe pci_host_bridge struct already has a pointer to its pci_bus, so let's convert the one user to use the bridge struct and remove the private 'root_bus' pointer.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 4 ++-- drivers/pci/controller/dwc/pcie-designware.h | 1 - drivers/pci/controller/dwc/pcie-tegra194.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +2 -2
@@ -448,8 +448,8 @@ EXPORT_SYMBOL_GPL(dw_pcie_host_init);void dw_pcie_host_deinit (struct pcie_port *pp) { -pci_stop_root_bus (pp->root_bus); -pci_remove_root_bus (pp->root_bus); +pci_stop_root_bus (pp->bridge->bus); +pci_remove_root_bus (pp->bridge->bus);if (pci_msi_enabled () && !pp->ops->msi_host_init)dw_pcie_free_msi (pp); }
drivers/pci/controller/dwc/pcie-designware.h +0 -1
@@ -192,7 +192,6 @@ struct pcie_port {struct irq_chip *msi_irq_chip;u32 num_vectors;u32 irq_mask[MAX_MSI_CTRLS ]; -struct pci_bus *root_bus;struct pci_host_bridge *bridge;raw_spinlock_t lock;DECLARE_BITMAP (msi_irq_in_use,MAX_MSI_IRQS );
drivers/pci/controller/dwc/pcie-tegra194.c +2 -2
@@ -1264,9 +1264,9 @@ static void tegra_pcie_downstream_dev_to_D0(struct tegra_pcie_dw *pcie)* 5.2 Link State Power Management (Page #428). */ -list_for_each_entry (child, &pp->root_bus->children, node) { +list_for_each_entry (child, &pp->bridge->bus->children, node) {/* Bring downstream devices to D0 if they are not already in */ -if (child->parent == pp->root_bus) { +if (child->parent == pp->bridge->bus) { root_bus = child;break ; }
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 18/40 PCI: dwc: Remove storing of PCI resources
In reply to Rob HerringThe PCI bridge resources are stored in pci_host_bridge.windows, so there's no need to store them in a DWC specific struct. There's also no need to parse the resources and store them a 2nd time as they are mainly used for one time setup of iATU windows.
--- drivers/pci/controller/dwc/pci-keystone.c | 8 ++++-- drivers/pci/controller/dwc/pcie-al.c | 7 ++--- .../pci/controller/dwc/pcie-designware-host.c | 27 +++++++------------ drivers/pci/controller/dwc/pcie-designware.h | 6 ----- 4 files changed, 19 insertions(+), 29 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +6 -2
@@ -400,10 +400,14 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)u32 num_viewport = ks_pcie->num_viewport;struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp; -u64 start = pp->mem->start; -u64 end = pp->mem->end; +u64 start, end; +struct resource *mem;int i; + mem =resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM )->res; + start = mem->start; + end = mem->end; +/* Disable BARs for inbound access */ ks_pcie_set_dbi_mode (ks_pcie);dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,0 );
drivers/pci/controller/dwc/pcie-al.c +4 -3
@@ -260,6 +260,7 @@ static void al_pcie_config_prepare(struct al_pcie *pcie)u8 secondary_bus;u32 cfg_control;u32 reg; +struct resource *bus =resource_list_first_type (&pp->bridge->windows,IORESOURCE_BUS )->res; target_bus_cfg = &pcie->target_bus_cfg;
@@ -273,13 +274,13 @@ static void al_pcie_config_prepare(struct al_pcie *pcie) target_bus_cfg->ecam_mask = ecam_bus_mask;/* This portion is taken from the cfg_target_bus reg */ target_bus_cfg->reg_mask = ~target_bus_cfg->ecam_mask; - target_bus_cfg->reg_val = pp->busn->start & target_bus_cfg->reg_mask; + target_bus_cfg->reg_val = bus->start & target_bus_cfg->reg_mask;al_pcie_target_bus_set (pcie, target_bus_cfg->reg_val, target_bus_cfg->reg_mask); - secondary_bus = pp->busn->start +1 ; - subordinate_bus = pp->busn->end; + secondary_bus = bus->start +1 ; + subordinate_bus = bus->end;/* Set the valid values of secondary and subordinate buses */ cfg_control_offset = AXI_BASE_OFFSET + pcie->reg_offsets.ob_ctrl +
drivers/pci/controller/dwc/pcie-designware-host.c +9 -18
@@ -326,17 +326,9 @@ int dw_pcie_host_init(struct pcie_port *pp)resource_list_for_each_entry (win, &bridge->windows) {switch (resource_type (win->res)) {case IORESOURCE_IO : - pp->io = win->res; - pp->io->name ="I/O" ; - pp->io_size =resource_size (pp->io); - pp->io_bus_addr = pp->io->start - win->offset; - pp->io_base =pci_pio_to_address (pp->io->start); -break ; -case IORESOURCE_MEM : - pp->mem = win->res; - pp->mem->name ="MEM" ; - pp->mem_size =resource_size (pp->mem); - pp->mem_bus_addr = pp->mem->start - win->offset; + pp->io_size =resource_size (win->res); + pp->io_bus_addr = win->res->start - win->offset; + pp->io_base =pci_pio_to_address (win->res->start);break ;case 0 : pp->cfg = win->res;
@@ -345,9 +337,6 @@ int dw_pcie_host_init(struct pcie_port *pp) pp->cfg0_base = pp->cfg->start; pp->cfg1_base = pp->cfg->start + pp->cfg0_size;break ; -case IORESOURCE_BUS : - pp->busn = win->res; -break ; } }
@@ -361,8 +350,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } } - pp->mem_base = pp->mem->start; -if (!pp->va_cfg0_base) { pp->va_cfg0_base =devm_pci_remap_cfgspace (dev, pp->cfg0_base, pp->cfg0_size);
@@ -601,9 +588,13 @@ void dw_pcie_setup_rc(struct pcie_port *pp)* ATU, so we should not program the ATU here. */ if (pp->bridge->child_ops == &dw_child_pcie_ops) { +struct resource_entry *entry = +resource_list_first_type (&pp->bridge->windows,IORESOURCE_MEM ); +dw_pcie_prog_outbound_atu (pci,PCIE_ATU_REGION_INDEX0 , -PCIE_ATU_TYPE_MEM , pp->mem_base, - pp->mem_bus_addr, pp->mem_size); +PCIE_ATU_TYPE_MEM , entry->res->start, + entry->res->start - entry->offset, +resource_size (entry->res));if (pci->num_viewport >2 ) dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX2, PCIE_ATU_TYPE_IO, pp->io_base,
drivers/pci/controller/dwc/pcie-designware.h +0 -6
@@ -175,13 +175,7 @@ struct pcie_port {resource_size_t io_base;phys_addr_t io_bus_addr;u32 io_size; -u64 mem_base; -phys_addr_t mem_bus_addr; -u32 mem_size;struct resource *cfg; -struct resource *io; -struct resource *mem; -struct resource *busn;int irq;const struct dw_pcie_host_ops *ops;int msi_irq;
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 19/40 PCI: dwc: Simplify config space handling
In reply to Rob HerringThe config space is divided in half for type 0 and type 1 accesses, but this is pointless as there's only one iATU window which is reconfigured on each access.
The only platform doing something custom is TI Keystone (surprise!). It does its own mapping of the config space to avoid spliting the config space and never actually uses va_cfg1_base as it has its own config space accessors. With the splitting removed, Keystone can use the default mapping of config space.
---
v2:
- Fix passing cfg0_base in dw_pcie_other_conf_map_bus
--- drivers/pci/controller/dwc/pci-keystone.c | 8 --- .../pci/controller/dwc/pcie-designware-host.c | 63 ++++++------------- drivers/pci/controller/dwc/pcie-designware.h | 4 -- 3 files changed, 20 insertions(+), 55 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +0 -8
@@ -873,16 +873,8 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie,struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;struct device *dev = &pdev->dev; -struct resource *res;int ret; - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"config" ); - pp->va_cfg0_base =devm_pci_remap_cfg_resource (dev, res); -if (IS_ERR (pp->va_cfg0_base)) -return PTR_ERR (pp->va_cfg0_base); - - pp->va_cfg1_base = pp->va_cfg0_base; - ret =dw_pcie_host_init (pp);if (ret) {dev_err (dev,"failed to initialize host\n" );
drivers/pci/controller/dwc/pcie-designware-host.c +20 -43
103 lines not on this page · raw message
drivers/pci/controller/dwc/pcie-designware.h +0 -4
@@ -169,13 +169,9 @@ struct pcie_port {u64 cfg0_base;void __iomem *va_cfg0_base;u32 cfg0_size; -u64 cfg1_base; -void __iomem *va_cfg1_base; -u32 cfg1_size;resource_size_t io_base;phys_addr_t io_bus_addr;u32 io_size; -struct resource *cfg;int irq;const struct dw_pcie_host_ops *ops;int msi_irq;
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 20/40 PCI: dwc/keystone: Drop duplicated 'num-viewport'
In reply to Rob HerringThe DWC core driver already parses and stores the 'num-viewport' DT property, so there is no need for the Keystone driver to store it.
--- drivers/pci/controller/dwc/pci-keystone.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +1 -10
@@ -123,7 +123,6 @@ struct keystone_pcie {int msi_host_irq;int num_lanes; -u32 num_viewport;struct phy **phy;struct device_link **link;struct device_node *msi_intc_np;
@@ -397,9 +396,9 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) {u32 val; -u32 num_viewport = ks_pcie->num_viewport;struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp; +u32 num_viewport = pci->num_viewport;u64 start, end;struct resource *mem;int i;
@@ -1199,7 +1198,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)struct resource *res;unsigned int version;void __iomem *base; -u32 num_viewport;struct phy **phy;int link_speed;u32 num_lanes;
@@ -1349,12 +1347,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - ret =of_property_read_u32 (np,"num-viewport" , &num_viewport); -if (ret <0 ) { -dev_err (dev,"unable to read *num-viewport* property\n" ); - goto err_get_sync; - } -/* * "Power Sequencing and Reset Signal Timings" table in * PCI EXPRESS CARD ELECTROMECHANICAL SPECIFICATION, REV. 2.0
@@ -1368,7 +1360,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)gpiod_set_value_cansleep (gpiod,1 ); } - ks_pcie->num_viewport = num_viewport; pci->pp.ops = host_ops; ret =ks_pcie_add_pcie_port (ks_pcie, pdev);if (ret <0 )
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 21/40 PCI: dwc: Check CONFIG_PCI_MSI inside dw_pcie_msi_init()
In reply to Rob HerringMove the IS_ENABLED(CONFIG_PCI_MSI) check into dw_pcie_msi_init() instead of duplicating it in all the drivers.
--- drivers/pci/controller/dwc/pci-imx6.c | 4 +--- drivers/pci/controller/dwc/pci-meson.c | 8 +------- drivers/pci/controller/dwc/pcie-artpec6.c | 11 +---------- drivers/pci/controller/dwc/pcie-designware-host.c | 3 +++ drivers/pci/controller/dwc/pcie-designware-plat.c | 4 +--- drivers/pci/controller/dwc/pcie-histb.c | 4 +--- drivers/pci/controller/dwc/pcie-kirin.c | 4 +--- drivers/pci/controller/dwc/pcie-qcom.c | 4 +--- drivers/pci/controller/dwc/pcie-uniphier.c | 3 +-- 9 files changed, 11 insertions(+), 34 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +1 -3
@@ -847,9 +847,7 @@ static int imx6_pcie_host_init(struct pcie_port *pp)imx6_setup_phy_mpll (imx6_pcie);dw_pcie_setup_rc (pp);imx6_pcie_establish_link (imx6_pcie); - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pci-meson.c +1 -7
@@ -377,12 +377,6 @@ static int meson_pcie_establish_link(struct meson_pcie *mp)return dw_pcie_wait_for_link (pci); } -static void meson_pcie_enable_interrupts (struct meson_pcie *mp) -{ -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (&mp->pci.pp); -} -static int meson_pcie_rd_own_conf (struct pci_bus *bus,u32 devfn,int where,int size,u32 *val) {
@@ -466,7 +460,7 @@ static int meson_pcie_host_init(struct pcie_port *pp)if (ret)return ret; -meson_pcie_enable_interrupts (mp); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pcie-artpec6.c +1 -10
@@ -346,15 +346,6 @@ static void artpec6_pcie_deassert_core_reset(struct artpec6_pcie *artpec6_pcie)usleep_range (100 ,200 ); } -static void artpec6_pcie_enable_interrupts (struct artpec6_pcie *artpec6_pcie) -{ -struct dw_pcie *pci = artpec6_pcie->pci; -struct pcie_port *pp = &pci->pp; - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); -} -static int artpec6_pcie_host_init (struct pcie_port *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);
@@ -368,7 +359,7 @@ static int artpec6_pcie_host_init(struct pcie_port *pp)dw_pcie_setup_rc (pp);artpec6_pcie_establish_link (pci);dw_pcie_wait_for_link (pci); -artpec6_pcie_enable_interrupts (artpec6_pcie); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pcie-designware-host.c +3 -0
@@ -276,6 +276,9 @@ void dw_pcie_msi_init(struct pcie_port *pp)struct device *dev = pci->dev;u64 msi_target; +if (!IS_ENABLED (CONFIG_PCI_MSI )) +return ; + pp->msi_page =alloc_page (GFP_KERNEL ); pp->msi_data =dma_map_page (dev, pp->msi_page,0 ,PAGE_SIZE ,DMA_FROM_DEVICE );
drivers/pci/controller/dwc/pcie-designware-plat.c +1 -3
@@ -39,9 +39,7 @@ static int dw_plat_pcie_host_init(struct pcie_port *pp)dw_pcie_setup_rc (pp);dw_pcie_wait_for_link (pci); - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pcie-histb.c +1 -3
@@ -202,9 +202,7 @@ static int histb_pcie_host_init(struct pcie_port *pp) pp->bridge->ops = &histb_pci_ops;histb_pcie_establish_link (pp); - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pcie-kirin.c +1 -3
@@ -429,9 +429,7 @@ static int kirin_pcie_host_init(struct pcie_port *pp) pp->bridge->ops = &kirin_pci_ops;kirin_pcie_establish_link (pp); - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);return 0 ; }
drivers/pci/controller/dwc/pcie-qcom.c +1 -3
@@ -1280,9 +1280,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp) }dw_pcie_setup_rc (pp); - -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);qcom_ep_reset_deassert (pcie);
drivers/pci/controller/dwc/pcie-uniphier.c +1 -2
@@ -322,8 +322,7 @@ static int uniphier_pcie_host_init(struct pcie_port *pp)if (ret)return ret; -if (IS_ENABLED (CONFIG_PCI_MSI )) -dw_pcie_msi_init (pp); +dw_pcie_msi_init (pp);return 0 ; }
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 22/40 PCI: dwc/imx6: Remove duplicate define PCIE_LINK_WIDTH_SPEED_CONTROL
In reply to Rob HerringPCIE_LINK_WIDTH_SPEED_CONTROL is already defined in pcie-designware.h, so remove it from the i.MX6 driver.
--- drivers/pci/controller/dwc/pci-imx6.c | 2 -- 1 file changed, 2 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +0 -2
@@ -116,8 +116,6 @@ struct imx6_pcie {#define PCIE_PHY_STAT (PL_OFFSET + 0x110)#define PCIE_PHY_STAT_ACK BIT(16) -#define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C -/* PHY registers (not memory-mapped) */ #define PCIE_PHY_ATEOVRD 0x10#define PCIE_PHY_ATEOVRD_EN BIT(2)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 23/40 PCI: dwc: Add a 'num_lanes' field to struct dw_pcie
In reply to Rob HerringAdd a 'num_lanes' field to allow drivers to provide a the number of lanes if not in DT or using a custom DT property. A driver can provide a non-zero value which is used if the DT doesn't have a 'num-lanes' property.
--- drivers/pci/controller/dwc/pcie-designware.c | 13 ++++++------- drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/pci/controller/dwc/pcie-designware.c +6 -7
@@ -548,7 +548,6 @@ void dw_pcie_setup(struct dw_pcie *pci) {int ret;u32 val; -u32 lanes;struct device *dev = pci->dev;struct device_node *np = dev->of_node;
@@ -562,16 +561,16 @@ void dw_pcie_setup(struct dw_pcie *pci) "enabled" : "disabled"); - ret =of_property_read_u32 (np,"num-lanes" , &lanes); -if (ret) { -dev_dbg (pci->dev,"property num-lanes isn't found\n" ); + ret =of_property_read_u32 (np,"num-lanes" , &pci->num_lanes); +if (!pci->num_lanes) { +dev_dbg (pci->dev,"Using h/w default number of lanes\n" );return ; }/* Set the number of lanes */ val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_MODE_MASK ; -switch (lanes) { +switch (pci->num_lanes) {case 1 : val |=PORT_LINK_MODE_1_LANES ;break ;
@@ -585,7 +584,7 @@ void dw_pcie_setup(struct dw_pcie *pci) val |=PORT_LINK_MODE_8_LANES ;break ;default : -dev_err (pci->dev,"num-lanes %u: invalid value\n" , lanes); +dev_err (pci->dev,"num-lanes %u: invalid value\n" , pci->num_lanes);return ; }dw_pcie_writel_dbi (pci,PCIE_PORT_LINK_CONTROL , val);
@@ -593,7 +592,7 @@ void dw_pcie_setup(struct dw_pcie *pci)/* Set link width speed control register */ val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); val &= ~PORT_LOGIC_LINK_WIDTH_MASK ; -switch (lanes) { +switch (pci->num_lanes) {case 1 : val |=PORT_LOGIC_LINK_WIDTH_1_LANES ;break ;
drivers/pci/controller/dwc/pcie-designware.h +1 -0
@@ -246,6 +246,7 @@ struct dw_pcie {struct dw_pcie_ep ep;const struct dw_pcie_ops *ops;unsigned int version; +int num_lanes; };#define to_dw_pcie_from_pp (port) container_of((port), struct dw_pcie, pp)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 24/40 PCI: dwc: Ensure FAST_LINK_MODE is cleared
In reply to Rob Herring"Fast Link Mode" is a simulation environment speed up setting which should never be set and the default is not set. However some Amlogic platforms have it set (by firmware presumably). See commit 87dccf09323f ("PCI:
amlogic: meson: Don't use FAST_LINK_MODE to set up link") for more information. Let's clear it in core DWC code so we can drop some vendor specific code.
--- drivers/pci/controller/dwc/pcie-designware.c | 5 ++++- drivers/pci/controller/dwc/pcie-designware.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware.c +4 -1
@@ -560,6 +560,9 @@ void dw_pcie_setup(struct dw_pcie *pci)dev_dbg (pci->dev,"iATU unroll: %s\n" , pci->iatu_unroll_enabled ?"enabled" :"disabled" ); + val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); + val &= ~PORT_LINK_FAST_LINK_MODE ; +dw_pcie_writel_dbi (pci,PCIE_PORT_LINK_CONTROL , val); ret =of_property_read_u32 (np,"num-lanes" , &pci->num_lanes);if (!pci->num_lanes) {
@@ -568,7 +571,7 @@ void dw_pcie_setup(struct dw_pcie *pci) }/* Set the number of lanes */ - val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); + val &= ~PORT_LINK_FAST_LINK_MODE ; val &= ~PORT_LINK_MODE_MASK ;switch (pci->num_lanes) {case 1 :
drivers/pci/controller/dwc/pcie-designware.h +1 -0
@@ -36,6 +36,7 @@#define PCIE_PORT_LINK_CONTROL 0x710#define PORT_LINK_DLL_LINK_EN BIT(5) +#define PORT_LINK_FAST_LINK_MODE BIT(7)#define PORT_LINK_MODE_MASK GENMASK(21, 16)#define PORT_LINK_MODE (n) FIELD_PREP(PORT_LINK_MODE_MASK, n)#define PORT_LINK_MODE_1_LANES PORT_LINK_MODE(0x1)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 25/40 PCI: dwc/meson: Drop the duplicate number of lanes setup
In reply to Rob HerringThe meson lanes initialization is the same DWC port logic registers as in dw_pcie_setup(). We just need to initialize 'num_lanes' to 1 to do the same init.
dw_pcie_setup_rc() sets the PORT_LOGIC_SPEED_CHANGE bit, so setting it can be dropped.
--- drivers/pci/controller/dwc/pci-meson.c | 29 +------------------------- 1 file changed, 1 insertion(+), 28 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +1 -28
@@ -22,18 +22,6 @@#define to_meson_pcie (x) dev_get_drvdata((x)->dev) -/* External local bus interface registers */ -#define PLR_OFFSET 0x700 -#define PCIE_PORT_LINK_CTRL_OFF (PLR_OFFSET + 0x10) -#define FAST_LINK_MODE BIT(7) -#define LINK_CAPABLE_MASK GENMASK(21, 16) -#define LINK_CAPABLE_X1 BIT(16) - -#define PCIE_GEN2_CTRL_OFF (PLR_OFFSET + 0x10c) -#define NUM_OF_LANES_MASK GENMASK(12, 8) -#define NUM_OF_LANES_X1 BIT(8) -#define DIRECT_SPEED_CHANGE BIT(17) -#define TYPE1_HDR_OFFSET 0x0#define PCIE_STATUS_COMMAND (TYPE1_HDR_OFFSET + 0x04)#define PCI_IO_EN BIT(0)
@@ -288,22 +276,6 @@ static void meson_pcie_init_dw(struct meson_pcie *mp) val |=APP_LTSSM_ENABLE ;meson_cfg_writel (mp, val,PCIE_CFG0 ); - val =meson_elb_readl (mp,PCIE_PORT_LINK_CTRL_OFF ); - val &= ~(LINK_CAPABLE_MASK |FAST_LINK_MODE ); -meson_elb_writel (mp, val,PCIE_PORT_LINK_CTRL_OFF ); - - val =meson_elb_readl (mp,PCIE_PORT_LINK_CTRL_OFF ); - val |=LINK_CAPABLE_X1 ; -meson_elb_writel (mp, val,PCIE_PORT_LINK_CTRL_OFF ); - - val =meson_elb_readl (mp,PCIE_GEN2_CTRL_OFF ); - val &= ~NUM_OF_LANES_MASK ; -meson_elb_writel (mp, val,PCIE_GEN2_CTRL_OFF ); - - val =meson_elb_readl (mp,PCIE_GEN2_CTRL_OFF ); - val |=NUM_OF_LANES_X1 |DIRECT_SPEED_CHANGE ; -meson_elb_writel (mp, val,PCIE_GEN2_CTRL_OFF ); -meson_elb_writel (mp,0x0 ,PCIE_BASE_ADDR0 );meson_elb_writel (mp,0x0 ,PCIE_BASE_ADDR1 ); }
@@ -513,6 +485,7 @@ static int meson_pcie_probe(struct platform_device *pdev) pci = &mp->pci; pci->dev = dev; pci->ops = &dw_pcie_ops; + pci->num_lanes =1 ; mp->phy =devm_phy_get (dev,"pcie" );if (IS_ERR (mp->phy)) {
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 26/40 PCI: dwc/meson: Drop unnecessary RC config space initialization
In reply to Rob HerringThe common Designware init already initializes the RC PCI_COMMAND, BAR0 and BAR1 registers.
The only difference here is the common code sets SERR. If clearing SERR is what's desired, then the Meson driver should do that instead.
--- drivers/pci/controller/dwc/pci-meson.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +0 -20
@@ -22,15 +22,6 @@#define to_meson_pcie (x) dev_get_drvdata((x)->dev) -#define TYPE1_HDR_OFFSET 0x0 -#define PCIE_STATUS_COMMAND (TYPE1_HDR_OFFSET + 0x04) -#define PCI_IO_EN BIT(0) -#define PCI_MEM_SPACE_EN BIT(1) -#define PCI_BUS_MASTER_EN BIT(2) - -#define PCIE_BASE_ADDR0 (TYPE1_HDR_OFFSET + 0x10) -#define PCIE_BASE_ADDR1 (TYPE1_HDR_OFFSET + 0x14) -#define PCIE_CAP_OFFSET 0x70#define PCIE_DEV_CTRL_DEV_STUS (PCIE_CAP_OFFSET + 0x08)#define PCIE_CAP_MAX_PAYLOAD_MASK GENMASK(7, 5)
@@ -275,9 +266,6 @@ static void meson_pcie_init_dw(struct meson_pcie *mp) val =meson_cfg_readl (mp,PCIE_CFG0 ); val |=APP_LTSSM_ENABLE ;meson_cfg_writel (mp, val,PCIE_CFG0 ); - -meson_elb_writel (mp,0x0 ,PCIE_BASE_ADDR0 ); -meson_elb_writel (mp,0x0 ,PCIE_BASE_ADDR1 ); }static int meson_size_to_payload (struct meson_pcie *mp,int size)
@@ -325,13 +313,6 @@ static void meson_set_max_rd_req_size(struct meson_pcie *mp, int size)meson_elb_writel (mp, val,PCIE_DEV_CTRL_DEV_STUS ); } -static inline void meson_enable_memory_space (struct meson_pcie *mp) -{ -/* Set the RC Bus Master, Memory Space and I/O Space enables */ -meson_elb_writel (mp,PCI_IO_EN |PCI_MEM_SPACE_EN |PCI_BUS_MASTER_EN , -PCIE_STATUS_COMMAND ); -} -static int meson_pcie_establish_link (struct meson_pcie *mp) {struct dw_pcie *pci = &mp->pci;
@@ -342,7 +323,6 @@ static int meson_pcie_establish_link(struct meson_pcie *mp)meson_set_max_rd_req_size (mp,MAX_READ_REQ_SIZE );dw_pcie_setup_rc (pp); -meson_enable_memory_space (mp);meson_pcie_assert_reset (mp);
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 27/40 PCI: dwc/meson: Rework PCI config and DW port logic register accesses
In reply to Rob HerringThe meson 'elbi' registers are just the Designware 'dbi' space and all the registers accessed are either standard PCI config space or DWC port logic registers. Convert the accesses to use the common defines and register accessors.
--- drivers/pci/controller/dwc/pci-meson.c | 76 +++++++++----------------- 1 file changed, 25 insertions(+), 51 deletions(-)
drivers/pci/controller/dwc/pci-meson.c +25 -51
@@ -22,11 +22,7 @@#define to_meson_pcie (x) dev_get_drvdata((x)->dev) -#define PCIE_CAP_OFFSET 0x70 -#define PCIE_DEV_CTRL_DEV_STUS (PCIE_CAP_OFFSET + 0x08) -#define PCIE_CAP_MAX_PAYLOAD_MASK GENMASK(7, 5)#define PCIE_CAP_MAX_PAYLOAD_SIZE (x) ((x) << 5) -#define PCIE_CAP_MAX_READ_REQ_MASK GENMASK(14, 12)#define PCIE_CAP_MAX_READ_REQ_SIZE (x) ((x) << 12)/* PCIe specific config registers */
@@ -56,11 +52,6 @@ enum pcie_data_rate {PCIE_GEN4 }; -struct meson_pcie_mem_res { -void __iomem *elbi_base; -void __iomem *cfg_base; -}; -struct meson_pcie_clk_res {struct clk *clk;struct clk *port_clk;
@@ -74,7 +65,7 @@ struct meson_pcie_rc_reset {struct meson_pcie {struct dw_pcie pci; -struct meson_pcie_mem_res mem_res; +void __iomem *cfg_base;struct meson_pcie_clk_res clk_res;struct meson_pcie_rc_reset mrst;struct gpio_desc *reset_gpio;
@@ -113,28 +104,18 @@ static int meson_pcie_get_resets(struct meson_pcie *mp)return 0 ; } -static void __iomem *meson_pcie_get_mem (struct platform_device *pdev, -struct meson_pcie *mp, -const char *id) -{ -struct device *dev = mp->pci.dev; -struct resource *res; - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , id); - -return devm_ioremap_resource (dev, res); -} -static int meson_pcie_get_mems (struct platform_device *pdev,struct meson_pcie *mp) { - mp->mem_res.elbi_base =meson_pcie_get_mem (pdev, mp,"elbi" ); -if (IS_ERR (mp->mem_res.elbi_base)) -return PTR_ERR (mp->mem_res.elbi_base); +struct dw_pcie *pci = &mp->pci; + + pci->dbi_base =devm_platform_ioremap_resource_byname (pdev,"elbi" ); +if (IS_ERR (pci->dbi_base)) +return PTR_ERR (pci->dbi_base); - mp->mem_res.cfg_base =meson_pcie_get_mem (pdev, mp,"cfg" ); -if (IS_ERR (mp->mem_res.cfg_base)) -return PTR_ERR (mp->mem_res.cfg_base); + mp->cfg_base =devm_platform_ioremap_resource_byname (pdev,"cfg" ); +if (IS_ERR (mp->cfg_base)) +return PTR_ERR (mp->cfg_base);return 0 ; }
@@ -232,24 +213,14 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp)return 0 ; } -static inline void meson_elb_writel (struct meson_pcie *mp,u32 val,u32 reg) -{ -writel (val, mp->mem_res.elbi_base + reg); -} - -static inline u32 meson_elb_readl (struct meson_pcie *mp,u32 reg) -{ -return readl (mp->mem_res.elbi_base + reg); -} -static inline u32 meson_cfg_readl (struct meson_pcie *mp,u32 reg) { -return readl (mp->mem_res.cfg_base + reg); +return readl (mp->cfg_base + reg); }static inline void meson_cfg_writel (struct meson_pcie *mp,u32 val,u32 reg) { -writel (val, mp->mem_res.cfg_base + reg); +writel (val, mp->cfg_base + reg); }static void meson_pcie_assert_reset (struct meson_pcie *mp)
@@ -287,30 +258,34 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size)static void meson_set_max_payload (struct meson_pcie *mp,int size) { +struct dw_pcie *pci = &mp->pci;u32 val; +u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );int max_payload_size =meson_size_to_payload (mp, size); - val =meson_elb_readl (mp,PCIE_DEV_CTRL_DEV_STUS ); - val &= ~PCIE_CAP_MAX_PAYLOAD_MASK ; -meson_elb_writel (mp, val,PCIE_DEV_CTRL_DEV_STUS ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_DEVCTL ); + val &= ~PCI_EXP_DEVCTL_PAYLOAD ; +dw_pcie_writel_dbi (pci, offset +PCI_EXP_DEVCTL , val); - val =meson_elb_readl (mp,PCIE_DEV_CTRL_DEV_STUS ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_DEVCTL ); val |=PCIE_CAP_MAX_PAYLOAD_SIZE (max_payload_size); -meson_elb_writel (mp, val,PCIE_DEV_CTRL_DEV_STUS ); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_DEVCTL , val); }static void meson_set_max_rd_req_size (struct meson_pcie *mp,int size) { +struct dw_pcie *pci = &mp->pci;u32 val; +u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );int max_rd_req_size =meson_size_to_payload (mp, size); - val =meson_elb_readl (mp,PCIE_DEV_CTRL_DEV_STUS ); - val &= ~PCIE_CAP_MAX_READ_REQ_MASK ; -meson_elb_writel (mp, val,PCIE_DEV_CTRL_DEV_STUS ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_DEVCTL ); + val &= ~PCI_EXP_DEVCTL_READRQ ; +dw_pcie_writel_dbi (pci, offset +PCI_EXP_DEVCTL , val); - val =meson_elb_readl (mp,PCIE_DEV_CTRL_DEV_STUS ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_DEVCTL ); val |=PCIE_CAP_MAX_READ_REQ_SIZE (max_rd_req_size); -meson_elb_writel (mp, val,PCIE_DEV_CTRL_DEV_STUS ); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_DEVCTL , val); }static int meson_pcie_establish_link (struct meson_pcie *mp)
@@ -436,7 +411,6 @@ static int meson_add_pcie_port(struct meson_pcie *mp, } pp->ops = &meson_pcie_host_ops; - pci->dbi_base = mp->mem_res.elbi_base; ret =dw_pcie_host_init (pp);if (ret) {
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 28/40 PCI: dwc/imx6: Use common PCI register definitions
In reply to Rob HerringThe i.MX6 driver has its own defines for common PCI config space registers. It also hard codes the capability register offsets which are discoverable. Convert it to use the standard register definitions.
--- drivers/pci/controller/dwc/pci-imx6.c | 37 ++++++++++----------------- 1 file changed, 14 insertions(+), 23 deletions(-)
drivers/pci/controller/dwc/pci-imx6.c +14 -23
@@ -94,15 +94,6 @@ struct imx6_pcie {#define PHY_PLL_LOCK_WAIT_USLEEP_MAX 200#define PHY_PLL_LOCK_WAIT_TIMEOUT (2000 * PHY_PLL_LOCK_WAIT_USLEEP_MAX) -/* PCIe Root Complex registers (memory-mapped) */ -#define PCIE_RC_IMX6_MSI_CAP 0x50 -#define PCIE_RC_LCR 0x7c -#define PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1 0x1 -#define PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2 0x2 -#define PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK 0xf - -#define PCIE_RC_LCSR 0x80 -/* PCIe Port Logic registers (memory-mapped) */ #define PL_OFFSET 0x700
@@ -759,6 +750,7 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) {struct dw_pcie *pci = imx6_pcie->pci;struct device *dev = pci->dev; +u8 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );u32 tmp;int ret;
@@ -767,10 +759,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)* started in Gen2 mode, there is a possibility the devices on the * bus will not be detected at all. This happens with PCIe switches. */ - tmp =dw_pcie_readl_dbi (pci,PCIE_RC_LCR ); - tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK ; - tmp |=PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1 ; -dw_pcie_writel_dbi (pci,PCIE_RC_LCR , tmp); + tmp =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); + tmp &= ~PCI_EXP_LNKCAP_SLS ; + tmp |=PCI_EXP_LNKCAP_SLS_2_5GB ; +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , tmp);/* Start LTSSM. */ imx6_pcie_ltssm_enable (dev);
@@ -781,10 +773,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)if (imx6_pcie->link_gen ==2 ) {/* Allow Gen2 mode after the link is up. */ - tmp =dw_pcie_readl_dbi (pci,PCIE_RC_LCR ); - tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK ; - tmp |=PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2 ; -dw_pcie_writel_dbi (pci,PCIE_RC_LCR , tmp); + tmp =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); + tmp &= ~PCI_EXP_LNKCAP_SLS ; + tmp |=PCI_EXP_LNKCAP_SLS_5_0GB ; +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , tmp);/* * Start Directed Speed Change so the best possible
@@ -822,8 +814,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)dev_info (dev,"Link: Gen2 disabled\n" ); } - tmp =dw_pcie_readl_dbi (pci,PCIE_RC_LCSR ); -dev_info (dev,"Link up, Gen%i\n" , (tmp >>16 ) &0xf ); + tmp =dw_pcie_readw_dbi (pci, offset +PCI_EXP_LNKSTA ); +dev_info (dev,"Link up, Gen%i\n" , tmp &PCI_EXP_LNKSTA_CLS );return 0 ; err_reset_phy:
@@ -1184,11 +1176,10 @@ static int imx6_pcie_probe(struct platform_device *pdev)return ret;if (pci_msi_enabled ()) { - val =dw_pcie_readw_dbi (pci,PCIE_RC_IMX6_MSI_CAP + -PCI_MSI_FLAGS ); +u8 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_MSI ); + val =dw_pcie_readw_dbi (pci, offset +PCI_MSI_FLAGS ); val |=PCI_MSI_FLAGS_ENABLE ; -dw_pcie_writew_dbi (pci,PCIE_RC_IMX6_MSI_CAP +PCI_MSI_FLAGS , - val); +dw_pcie_writew_dbi (pci, offset +PCI_MSI_FLAGS , val); }return 0 ;
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 29/40 PCI: dwc/qcom: Use common PCI register definitions
In reply to Rob HerringThe QCom driver has its own defines for common PCI config space registers. It also hard codes the capability register offsets which are discoverable. Convert it to use the standard register definitions.
--- drivers/pci/controller/dwc/pcie-qcom.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +8 -10
@@ -67,10 +67,6 @@#define PCIE20_AXI_MSTR_RESP_COMP_CTRL1 0x81c#define CFG_BRIDGE_SB_INIT BIT(0) -#define PCIE20_CAP 0x70 -#define PCIE20_DEVICE_CONTROL2_STATUS2 (PCIE20_CAP + PCI_EXP_DEVCTL2) -#define PCIE20_CAP_LINK_CAPABILITIES (PCIE20_CAP + PCI_EXP_LNKCAP) -#define PCIE20_CAP_LINK_1 (PCIE20_CAP + 0x14)#define PCIE_CAP_LINK1_VAL 0x2FD7F#define PCIE20_PARF_Q2A_FLUSH 0x1AC
@@ -1017,6 +1013,7 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)struct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3;struct dw_pcie *pci = pcie->pci;struct device *dev = pci->dev; +u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );int i, ret;u32 val;
@@ -1092,14 +1089,14 @@ static int qcom_pcie_init_2_3_3(struct qcom_pcie *pcie)writel (PCI_COMMAND_MASTER , pci->dbi_base +PCI_COMMAND );writel (DBI_RO_WR_EN , pci->dbi_base +PCIE20_MISC_CONTROL_1_REG ); -writel (PCIE_CAP_LINK1_VAL , pci->dbi_base +PCIE20_CAP_LINK_1 ); +writel (PCIE_CAP_LINK1_VAL , pci->dbi_base + offset +PCI_EXP_SLTCAP ); - val =readl (pci->dbi_base +PCIE20_CAP_LINK_CAPABILITIES ); + val =readl (pci->dbi_base + offset +PCI_EXP_LNKCAP ); val &= ~PCI_EXP_LNKCAP_ASPMS ; -writel (val, pci->dbi_base +PCIE20_CAP_LINK_CAPABILITIES ); +writel (val, pci->dbi_base + offset +PCI_EXP_LNKCAP ); -writel (PCI_EXP_DEVCTL2_COMP_TMOUT_DIS , pci->dbi_base + -PCIE20_DEVICE_CONTROL2_STATUS2 ); +writel (PCI_EXP_DEVCTL2_COMP_TMOUT_DIS , pci->dbi_base + offset + +PCI_EXP_DEVCTL2 );return 0 ;
@@ -1252,7 +1249,8 @@ static void qcom_pcie_post_deinit_2_7_0(struct qcom_pcie *pcie)static int qcom_pcie_link_up (struct dw_pcie *pci) { -u16 val =readw (pci->dbi_base +PCIE20_CAP +PCI_EXP_LNKSTA ); +u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); +u16 val =readw (pci->dbi_base + offset +PCI_EXP_LNKSTA );return !!(val &PCI_EXP_LNKSTA_DLLLA ); }
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 30/40 PCI: dwc: Remove hardcoded PCI_CAP_ID_EXP offset
In reply to Rob HerringWhile the Designware controller appears to hard code the PCI_CAP_ID_EXP capability register at 0x70, there's no need to hard code this in the driver as it is discoverable.
--- drivers/pci/controller/dwc/pci-dra7xx.c | 4 +--- drivers/pci/controller/dwc/pci-keystone.c | 11 +++++------ drivers/pci/controller/dwc/pcie-spear13xx.c | 4 +--- 3 files changed, 7 insertions(+), 12 deletions(-)
drivers/pci/controller/dwc/pci-dra7xx.c +1 -3
@@ -73,8 +73,6 @@#define LINK_UP BIT(16)#define DRA7XX_CPU_TO_BUS_ADDR 0x0FFFFFFF -#define EXP_CAP_ID_OFFSET 0x70 -#define PCIECTRL_TI_CONF_INTX_ASSERT 0x0124#define PCIECTRL_TI_CONF_INTX_DEASSERT 0x0128
@@ -142,7 +140,7 @@ static int dra7xx_pcie_establish_link(struct dw_pcie *pci)struct dra7xx_pcie *dra7xx =to_dra7xx_pcie (pci);struct device *dev = pci->dev;u32 reg; -u32 exp_cap_off =EXP_CAP_ID_OFFSET ; +u32 exp_cap_off =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );if (dw_pcie_link_up (pci)) {dev_err (dev,"link is already up\n" );
drivers/pci/controller/dwc/pci-keystone.c +5 -6
@@ -96,8 +96,6 @@#define LEG_EP 0x1#define RC 0x2 -#define EXP_CAP_ID_OFFSET 0x70 -#define KS_PCIE_SYSCLOCKOUTEN BIT(0)#define AM654_PCIE_DEV_TYPE_MASK 0x3
@@ -1125,22 +1123,23 @@ static int ks_pcie_am654_set_mode(struct device *dev,static void ks_pcie_set_link_speed (struct dw_pcie *pci,int link_speed) {u32 val; +u32 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );dw_pcie_dbi_ro_wr_en (pci); - val =dw_pcie_readl_dbi (pci,EXP_CAP_ID_OFFSET +PCI_EXP_LNKCAP ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP );if ((val &PCI_EXP_LNKCAP_SLS ) != link_speed) { val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); val |= link_speed; -dw_pcie_writel_dbi (pci,EXP_CAP_ID_OFFSET +PCI_EXP_LNKCAP , +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , val); } - val =dw_pcie_readl_dbi (pci,EXP_CAP_ID_OFFSET +PCI_EXP_LNKCTL2 ); + val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCTL2 );if ((val &PCI_EXP_LNKCAP_SLS ) != link_speed) { val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); val |= link_speed; -dw_pcie_writel_dbi (pci,EXP_CAP_ID_OFFSET +PCI_EXP_LNKCTL2 , +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCTL2 , val); }
drivers/pci/controller/dwc/pcie-spear13xx.c +1 -3
@@ -65,8 +65,6 @@ struct pcie_app_reg {/* CR6 */ #define MSI_CTRL_INT (1 << 26) -#define EXP_CAP_ID_OFFSET 0x70 -#define to_spear13xx_pcie (x) dev_get_drvdata((x)->dev)static int spear13xx_pcie_establish_link (struct spear13xx_pcie *spear13xx_pcie)
@@ -75,7 +73,7 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)struct pcie_port *pp = &pci->pp;struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;u32 val; -u32 exp_cap_off =EXP_CAP_ID_OFFSET ; +u32 exp_cap_off =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );if (dw_pcie_link_up (pci)) {dev_err (pci->dev,"link already up\n" );
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 31/40 PCI: dwc/tegra: Use common Designware port logic register definitions
In reply to Rob HerringThe Tegra driver has its own defines for common Designware Port Logic registers. Convert it to use the standard register definitions.
--- drivers/pci/controller/dwc/pcie-designware.h | 6 +++ drivers/pci/controller/dwc/pcie-tegra194.c | 56 ++++++++------------ 2 files changed, 28 insertions(+), 34 deletions(-)
drivers/pci/controller/dwc/pcie-designware.h +6 -0
@@ -32,7 +32,13 @@/* Synopsys-specific PCIe configuration registers */ #define PCIE_PORT_AFR 0x70C#define PORT_AFR_N_FTS_MASK GENMASK(15, 8) +#define PORT_AFR_N_FTS (n) FIELD_PREP(PORT_AFR_N_FTS_MASK, n)#define PORT_AFR_CC_N_FTS_MASK GENMASK(23, 16) +#define PORT_AFR_ENTER_ASPM BIT(30) +#define PORT_AFR_L0S_ENTRANCE_LAT_SHIFT 24 +#define PORT_AFR_L0S_ENTRANCE_LAT_MASK GENMASK(26, 24) +#define PORT_AFR_L1_ENTRANCE_LAT_SHIFT 27 +#define PORT_AFR_L1_ENTRANCE_LAT_MASK GENMASK(29, 27)#define PCIE_PORT_LINK_CONTROL 0x710#define PORT_LINK_DLL_LINK_EN BIT(5)
drivers/pci/controller/dwc/pcie-tegra194.c +22 -34
91 lines not on this page · raw message
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 32/40 PCI: dwc: Remove read_dbi2 code
In reply to Rob HerringThe DBI2 appears to be write-only and there's no read accesses in the code anyways, so let's remove all the read_dbi2 related code.
--- drivers/pci/controller/dwc/pci-keystone.c | 13 ------------- drivers/pci/controller/dwc/pcie-designware.c | 15 --------------- drivers/pci/controller/dwc/pcie-designware.h | 8 -------- 3 files changed, 36 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +0 -13
@@ -881,18 +881,6 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie,return 0 ; } -static u32 ks_pcie_am654_read_dbi2 (struct dw_pcie *pci,void __iomem *base, -u32 reg,size_t size) -{ -struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); -u32 val; - -ks_pcie_set_dbi_mode (ks_pcie); -dw_pcie_read (base + reg, size, &val); -ks_pcie_clear_dbi_mode (ks_pcie); -return val; -} -static void ks_pcie_am654_write_dbi2 (struct dw_pcie *pci,void __iomem *base,u32 reg,size_t size,u32 val) {
@@ -907,7 +895,6 @@ static const struct dw_pcie_ops ks_pcie_dw_pcie_ops = { .start_link = ks_pcie_start_link, .stop_link = ks_pcie_stop_link, .link_up = ks_pcie_link_up, - .read_dbi2 = ks_pcie_am654_read_dbi2, .write_dbi2 = ks_pcie_am654_write_dbi2, };
drivers/pci/controller/dwc/pcie-designware.c +0 -15
@@ -166,21 +166,6 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val) }EXPORT_SYMBOL_GPL (dw_pcie_write_dbi); -u32 dw_pcie_read_dbi2 (struct dw_pcie *pci,u32 reg,size_t size) -{ -int ret; -u32 val; - -if (pci->ops->read_dbi2) -return pci->ops->read_dbi2 (pci, pci->dbi_base2, reg, size); - - ret =dw_pcie_read (pci->dbi_base2 + reg, size, &val); -if (ret) -dev_err (pci->dev,"read DBI address failed\n" ); - -return val; -} -void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val) {int ret;
drivers/pci/controller/dwc/pcie-designware.h +0 -8
@@ -232,8 +232,6 @@ struct dw_pcie_ops { size_t size);void (*write_dbi)(struct dw_pcie *pcie,void __iomem *base,u32 reg,size_t size,u32 val); -u32 (*read_dbi2)(struct dw_pcie *pcie,void __iomem *base,u32 reg, -size_t size);void (*write_dbi2)(struct dw_pcie *pcie,void __iomem *base,u32 reg,size_t size,u32 val);int (*link_up)(struct dw_pcie *pcie);
@@ -269,7 +267,6 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val);u32 dw_pcie_read_dbi (struct dw_pcie *pci,u32 reg,size_t size);void dw_pcie_write_dbi (struct dw_pcie *pci,u32 reg,size_t size,u32 val); -u32 dw_pcie_read_dbi2 (struct dw_pcie *pci,u32 reg,size_t size);void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val);u32 dw_pcie_read_atu (struct dw_pcie *pci,u32 reg,size_t size);void dw_pcie_write_atu (struct dw_pcie *pci,u32 reg,size_t size,u32 val);
@@ -322,11 +319,6 @@ static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val)dw_pcie_write_dbi2 (pci, reg,0x4 , val); } -static inline u32 dw_pcie_readl_dbi2 (struct dw_pcie *pci,u32 reg) -{ -return dw_pcie_read_dbi2 (pci, reg,0x4 ); -} -static inline void dw_pcie_writel_atu (struct dw_pcie *pci,u32 reg,u32 val) {dw_pcie_write_atu (pci, reg,0x4 , val);
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 33/40 PCI: dwc: Make ATU accessors private
In reply to Rob HerringThe ATU registers are only accessed in pcie-designware.c and can be private to it.
--- drivers/pci/controller/dwc/pcie-designware.c | 12 ++++++------ drivers/pci/controller/dwc/pcie-designware.h | 12 ------------ 2 files changed, 6 insertions(+), 18 deletions(-)
drivers/pci/controller/dwc/pcie-designware.c +6 -6
@@ -180,31 +180,31 @@ void dw_pcie_write_dbi2(struct dw_pcie *pci, u32 reg, size_t size, u32 val)dev_err (pci->dev,"write DBI address failed\n" ); } -u32 dw_pcie_read_atu (struct dw_pcie *pci,u32 reg,size_t size) +static u32 dw_pcie_readl_atu (struct dw_pcie *pci,u32 reg) {int ret;u32 val;if (pci->ops->read_dbi) -return pci->ops->read_dbi (pci, pci->atu_base, reg, size); +return pci->ops->read_dbi (pci, pci->atu_base, reg,4 ); - ret =dw_pcie_read (pci->atu_base + reg, size, &val); + ret =dw_pcie_read (pci->atu_base + reg,4 , &val);if (ret)dev_err (pci->dev,"Read ATU address failed\n" );return val; } -void dw_pcie_write_atu (struct dw_pcie *pci,u32 reg,size_t size,u32 val) +static void dw_pcie_writel_atu (struct dw_pcie *pci,u32 reg,u32 val) {int ret;if (pci->ops->write_dbi) { - pci->ops->write_dbi (pci, pci->atu_base, reg, size, val); + pci->ops->write_dbi (pci, pci->atu_base, reg,4 , val);return ; } - ret =dw_pcie_write (pci->atu_base + reg, size, val); + ret =dw_pcie_write (pci->atu_base + reg,4 , val);if (ret)dev_err (pci->dev,"Write ATU address failed\n" ); }
drivers/pci/controller/dwc/pcie-designware.h +0 -12
@@ -268,8 +268,6 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val);u32 dw_pcie_read_dbi (struct dw_pcie *pci,u32 reg,size_t size);void dw_pcie_write_dbi (struct dw_pcie *pci,u32 reg,size_t size,u32 val);void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val); -u32 dw_pcie_read_atu (struct dw_pcie *pci,u32 reg,size_t size); -void dw_pcie_write_atu (struct dw_pcie *pci,u32 reg,size_t size,u32 val);int dw_pcie_link_up (struct dw_pcie *pci);void dw_pcie_upconfig_setup (struct dw_pcie *pci);void dw_pcie_link_set_max_speed (struct dw_pcie *pci,u32 link_gen);
@@ -319,16 +317,6 @@ static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val)dw_pcie_write_dbi2 (pci, reg,0x4 , val); } -static inline void dw_pcie_writel_atu (struct dw_pcie *pci,u32 reg,u32 val) -{ -dw_pcie_write_atu (pci, reg,0x4 , val); -} - -static inline u32 dw_pcie_readl_atu (struct dw_pcie *pci,u32 reg) -{ -return dw_pcie_read_atu (pci, reg,0x4 ); -} -static inline void dw_pcie_dbi_ro_wr_en (struct dw_pcie *pci) {u32 reg;
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 34/40 PCI: dwc: Centralize link gen setting
In reply to Rob Herringkeystone would force gen2 if no DT property. Now it relies on the PCI_EXP_LNKCAP value.
--- drivers/pci/controller/dwc/pci-dra7xx.c | 25 -------------- drivers/pci/controller/dwc/pci-imx6.c | 9 ++--- drivers/pci/controller/dwc/pci-keystone.c | 33 ------------------- .../pci/controller/dwc/pcie-designware-ep.c | 11 +++++-- .../pci/controller/dwc/pcie-designware-host.c | 3 ++ drivers/pci/controller/dwc/pcie-designware.c | 32 ++++++++++-------- drivers/pci/controller/dwc/pcie-designware.h | 2 +- drivers/pci/controller/dwc/pcie-intel-gw.c | 13 +++----- drivers/pci/controller/dwc/pcie-qcom.c | 11 ------- drivers/pci/controller/dwc/pcie-spear13xx.c | 27 +-------------- drivers/pci/controller/dwc/pcie-tegra194.c | 23 ------------- 11 files changed, 40 insertions(+), 149 deletions(-)
drivers/pci/controller/dwc/pci-dra7xx.c +0 -25
@@ -89,7 +89,6 @@ struct dra7xx_pcie {void __iomem *base;/* DT ti_conf */ int phy_count;/* DT phy-names count */ struct phy **phy; -int link_gen;struct irq_domain *irq_domain;enum dw_pcie_device_mode mode; };
@@ -147,26 +146,6 @@ static int dra7xx_pcie_establish_link(struct dw_pcie *pci)return 0 ; } -if (dra7xx->link_gen ==1 ) { -dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , -4 , ®); -if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { - reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pci->dbi_base + exp_cap_off + -PCI_EXP_LNKCAP ,4 , reg); - } - -dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , -2 , ®); -if ((reg &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { - reg &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - reg |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pci->dbi_base + exp_cap_off + -PCI_EXP_LNKCTL2 ,2 , reg); - } - } - reg =dra7xx_pcie_readl (dra7xx,PCIECTRL_DRA7XX_CONF_DEVICE_CMD ); reg |=LTSSM_EN ;dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_DEVICE_CMD , reg);
@@ -935,10 +914,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) reg &= ~LTSSM_EN ;dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_DEVICE_CMD , reg); - dra7xx->link_gen =of_pci_get_max_link_speed (np); -if (dra7xx->link_gen <0 || dra7xx->link_gen >2 ) - dra7xx->link_gen =2 ; -switch (mode) {case DW_PCIE_RC_TYPE :if (!IS_ENABLED (CONFIG_PCI_DRA7XX_HOST )) {
drivers/pci/controller/dwc/pci-imx6.c +3 -6
@@ -79,7 +79,6 @@ struct imx6_pcie {u32 tx_deemph_gen2_6db;u32 tx_swing_full;u32 tx_swing_low; -int link_gen;struct regulator *vpcie;void __iomem *phy_base;
@@ -771,7 +770,7 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)if (ret) goto err_reset_phy; -if (imx6_pcie->link_gen ==2 ) { +if (pci->link_gen ==2 ) {/* Allow Gen2 mode after the link is up. */ tmp =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); tmp &= ~PCI_EXP_LNKCAP_SLS ;
@@ -1153,10 +1152,8 @@ static int imx6_pcie_probe(struct platform_device *pdev) imx6_pcie->tx_swing_low =127 ;/* Limit link speed */ - ret =of_property_read_u32 (node,"fsl,max-link-speed" , - &imx6_pcie->link_gen); -if (ret) - imx6_pcie->link_gen =1 ; + pci->link_gen =1 ; + ret =of_property_read_u32 (node,"fsl,max-link-speed" , &pci->link_gen); imx6_pcie->vpcie =devm_regulator_get_optional (&pdev->dev,"vpcie" );if (IS_ERR (imx6_pcie->vpcie)) {
drivers/pci/controller/dwc/pci-keystone.c +0 -33
@@ -1107,32 +1107,6 @@ static int ks_pcie_am654_set_mode(struct device *dev,return 0 ; } -static void ks_pcie_set_link_speed (struct dw_pcie *pci,int link_speed) -{ -u32 val; -u32 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); - -dw_pcie_dbi_ro_wr_en (pci); - - val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); -if ((val &PCI_EXP_LNKCAP_SLS ) != link_speed) { - val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - val |= link_speed; -dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , - val); - } - - val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCTL2 ); -if ((val &PCI_EXP_LNKCAP_SLS ) != link_speed) { - val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - val |= link_speed; -dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCTL2 , - val); - } - -dw_pcie_dbi_ro_wr_dis (pci); -} -static const struct ks_pcie_of_data ks_pcie_rc_of_data = { .host_ops = &ks_pcie_host_ops, .version =0x365A ,
@@ -1185,7 +1159,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)unsigned int version;void __iomem *base;struct phy **phy; -int link_speed;u32 num_lanes;char name[10 ];int ret;
@@ -1320,12 +1293,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) goto err_get_sync; } - link_speed =of_pci_get_max_link_speed (np); -if (link_speed <0 ) - link_speed =2 ; - -ks_pcie_set_link_speed (pci, link_speed); -switch (mode) {case DW_PCIE_RC_TYPE :if (!IS_ENABLED (CONFIG_PCI_KEYSTONE_HOST )) {
drivers/pci/controller/dwc/pcie-designware-ep.c +9 -2
@@ -12,6 +12,8 @@#include <linux/pci-epc.h> #include <linux/pci-epf.h> +#include "../../pci.h" +void dw_pcie_ep_linkup (struct dw_pcie_ep *ep) {struct pci_epc *epc = ep->epc;
@@ -518,18 +520,20 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) ep->msix_cap =dw_pcie_find_capability (pci,PCI_CAP_ID_MSIX ); offset =dw_pcie_ep_find_ext_capability (pci,PCI_EXT_CAP_ID_REBAR ); + +dw_pcie_dbi_ro_wr_en (pci); +if (offset) { reg =dw_pcie_readl_dbi (pci, offset +PCI_REBAR_CTRL ); nbars = (reg &PCI_REBAR_CTRL_NBAR_MASK ) >>PCI_REBAR_CTRL_NBAR_SHIFT ; -dw_pcie_dbi_ro_wr_en (pci);for (i =0 ; i < nbars; i++, offset +=PCI_REBAR_CTRL )dw_pcie_writel_dbi (pci, offset +PCI_REBAR_CAP ,0x0 ); -dw_pcie_dbi_ro_wr_dis (pci); }dw_pcie_setup (pci); +dw_pcie_dbi_ro_wr_dis (pci);return 0 ; }
@@ -590,6 +594,9 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)return -ENOMEM ; ep->outbound_addr = addr; +if (pci->link_gen <1 ) + pci->link_gen =of_pci_get_max_link_speed (np); + epc =devm_pci_epc_create (dev, &epc_ops);if (IS_ERR (epc)) {dev_err (dev,"Failed to create epc device\n" );
drivers/pci/controller/dwc/pcie-designware-host.c +3 -0
@@ -361,6 +361,9 @@ int dw_pcie_host_init(struct pcie_port *pp)if (ret) pci->num_viewport =2 ; +if (pci->link_gen <1 ) + pci->link_gen =of_pci_get_max_link_speed (np); +if (pci_msi_enabled ()) {/* * If a specific SoC driver needs to change the
drivers/pci/controller/dwc/pcie-designware.c +19 -13
@@ -473,37 +473,40 @@ void dw_pcie_upconfig_setup(struct dw_pcie *pci) }EXPORT_SYMBOL_GPL (dw_pcie_upconfig_setup); -void dw_pcie_link_set_max_speed (struct dw_pcie *pci,u32 link_gen) +static void dw_pcie_link_set_max_speed (struct dw_pcie *pci,u32 link_gen) { -u32 reg, val; +u32 cap, ctrl2, link_speed;u8 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); - reg =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCTL2 ); - reg &= ~PCI_EXP_LNKCTL2_TLS ; + cap =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); + ctrl2 =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCTL2 ); + ctrl2 &= ~PCI_EXP_LNKCTL2_TLS ;switch (pcie_link_speed[link_gen]) {case PCIE_SPEED_2_5GT : - reg |=PCI_EXP_LNKCTL2_TLS_2_5GT ; + link_speed =PCI_EXP_LNKCTL2_TLS_2_5GT ;break ;case PCIE_SPEED_5_0GT : - reg |=PCI_EXP_LNKCTL2_TLS_5_0GT ; + link_speed =PCI_EXP_LNKCTL2_TLS_5_0GT ;break ;case PCIE_SPEED_8_0GT : - reg |=PCI_EXP_LNKCTL2_TLS_8_0GT ; + link_speed =PCI_EXP_LNKCTL2_TLS_8_0GT ;break ;case PCIE_SPEED_16_0GT : - reg |=PCI_EXP_LNKCTL2_TLS_16_0GT ; + link_speed =PCI_EXP_LNKCTL2_TLS_16_0GT ;break ;default :/* Use hardware capability */ - val =dw_pcie_readl_dbi (pci, offset +PCI_EXP_LNKCAP ); - val =FIELD_GET (PCI_EXP_LNKCAP_SLS , val); - reg &= ~PCI_EXP_LNKCTL2_HASD ; - reg |=FIELD_PREP (PCI_EXP_LNKCTL2_TLS , val); + link_speed =FIELD_GET (PCI_EXP_LNKCAP_SLS , cap); + ctrl2 &= ~PCI_EXP_LNKCTL2_HASD ;break ; } -dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCTL2 , reg); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCTL2 , ctrl2 | link_speed); + + cap &= ~((u32 )PCI_EXP_LNKCAP_SLS ); +dw_pcie_writel_dbi (pci, offset +PCI_EXP_LNKCAP , cap | link_speed); + }EXPORT_SYMBOL_GPL (dw_pcie_link_set_max_speed);
@@ -545,6 +548,9 @@ void dw_pcie_setup(struct dw_pcie *pci)dev_dbg (pci->dev,"iATU unroll: %s\n" , pci->iatu_unroll_enabled ?"enabled" :"disabled" ); +if (pci->link_gen >0 ) +dw_pcie_link_set_max_speed (pci, pci->link_gen); + val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_FAST_LINK_MODE ;dw_pcie_writel_dbi (pci,PCIE_PORT_LINK_CONTROL , val);
drivers/pci/controller/dwc/pcie-designware.h +1 -1
@@ -252,6 +252,7 @@ struct dw_pcie {const struct dw_pcie_ops *ops;unsigned int version;int num_lanes; +int link_gen; };#define to_dw_pcie_from_pp (port) container_of((port), struct dw_pcie, pp)
@@ -270,7 +271,6 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val);void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val);int dw_pcie_link_up (struct dw_pcie *pci);void dw_pcie_upconfig_setup (struct dw_pcie *pci); -void dw_pcie_link_set_max_speed (struct dw_pcie *pci,u32 link_gen);void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts);int dw_pcie_wait_for_link (struct dw_pcie *pci); void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,
drivers/pci/controller/dwc/pcie-intel-gw.c +4 -9
@@ -67,8 +67,6 @@ struct intel_pcie_port {void __iomem *app_base;struct gpio_desc *reset_gpio;u32 rst_intrvl; -u32 max_speed; -u32 link_gen;u32 max_width;u32 n_fts;struct clk *core_clk;
@@ -137,7 +135,6 @@ static void intel_pcie_link_setup(struct intel_pcie_port *lpp)u8 offset = lpp->pcie_cap_ofst; val =pcie_rc_cfg_rd (lpp, offset +PCI_EXP_LNKCAP ); - lpp->max_speed =FIELD_GET (PCI_EXP_LNKCAP_SLS , val); lpp->max_width =FIELD_GET (PCI_EXP_LNKCAP_MLW , val); val =pcie_rc_cfg_rd (lpp, offset +PCI_EXP_LNKCTL );
@@ -149,8 +146,9 @@ static void intel_pcie_link_setup(struct intel_pcie_port *lpp)static void intel_pcie_port_logic_setup (struct intel_pcie_port *lpp) {u32 val, mask; +struct dw_pcie *pci = &lpp->pci; -switch (pcie_link_speed[lpp->max_speed]) { +switch (pcie_link_speed[pci->link_gen]) {case PCIE_SPEED_8_0GT : lpp->n_fts =PORT_AFR_N_FTS_GEN3 ;break ;
@@ -179,7 +177,6 @@ static void intel_pcie_rc_setup(struct intel_pcie_port *lpp)dw_pcie_setup_rc (&lpp->pci.pp);dw_pcie_upconfig_setup (&lpp->pci);intel_pcie_port_logic_setup (lpp); -dw_pcie_link_set_max_speed (&lpp->pci, lpp->link_gen);dw_pcie_link_set_n_fts (&lpp->pci, lpp->n_fts); }
@@ -286,9 +283,6 @@ static int intel_pcie_get_resources(struct platform_device *pdev)if (ret) lpp->rst_intrvl =RESET_INTERVAL_MS ; - ret =of_pci_get_max_link_speed (dev->of_node); - lpp->link_gen = ret <0 ?0 : ret; - lpp->app_base =devm_platform_ioremap_resource_byname (pdev,"app" );if (IS_ERR (lpp->app_base))return PTR_ERR (lpp->app_base);
@@ -313,8 +307,9 @@ static int intel_pcie_wait_l2(struct intel_pcie_port *lpp) {u32 value;int ret; +struct dw_pcie *pci = &lpp->pci; -if (pcie_link_speed[lpp->max_speed] <PCIE_SPEED_8_0GT ) +if (pci->link_gen <3 )return 0 ;/* Send PME_TURN_OFF message */
drivers/pci/controller/dwc/pcie-qcom.c +0 -11
@@ -189,7 +189,6 @@ struct qcom_pcie {struct phy *phy;struct gpio_desc *reset;const struct qcom_pcie_ops *ops; -int gen; };#define to_qcom_pcie (x) dev_get_drvdata((x)->dev)
@@ -390,12 +389,6 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)/* wait for clock acquisition */ usleep_range (1000 ,1500 ); -if (pcie->gen ==1 ) { - val =readl (pci->dbi_base +PCIE20_LNK_CONTROL2_LINK_STATUS2 ); - val |=PCI_EXP_LNKSTA_CLS_2_5GB ; -writel (val, pci->dbi_base +PCIE20_LNK_CONTROL2_LINK_STATUS2 ); - } -/* Set the Max TLP size to 2K, instead of using default of 4K */ writel (CFG_REMOTE_RD_REQ_BRIDGE_SIZE_2K , pci->dbi_base +PCIE20_AXI_MSTR_RESP_COMP_CTRL0 );
@@ -1395,10 +1388,6 @@ static int qcom_pcie_probe(struct platform_device *pdev) goto err_pm_runtime_put; } - pcie->gen =of_pci_get_max_link_speed (pdev->dev.of_node); -if (pcie->gen <0 ) - pcie->gen =2 ; - pcie->parf =devm_platform_ioremap_resource_byname (pdev,"parf" );if (IS_ERR (pcie->parf)) { ret =PTR_ERR (pcie->parf);
drivers/pci/controller/dwc/pcie-spear13xx.c +1 -26
@@ -26,7 +26,6 @@ struct spear13xx_pcie {void __iomem *app_base;struct phy *phy;struct clk *clk; -bool is_gen1; };struct pcie_app_reg {
@@ -94,30 +93,6 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)dw_pcie_write (pci->dbi_base +PCI_VENDOR_ID ,2 ,0x104A );dw_pcie_write (pci->dbi_base +PCI_DEVICE_ID ,2 ,0xCD80 ); -/* -* if is_gen1 is set then handle it, so that some buggy card -* also works -*/ -if (spear13xx_pcie->is_gen1) { -dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCAP , -4 , &val); -if ((val &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { - val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - val |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pci->dbi_base + exp_cap_off + -PCI_EXP_LNKCAP ,4 , val); - } - -dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_LNKCTL2 , -2 , &val); -if ((val &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_2_5GB ) { - val &= ~((u32 )PCI_EXP_LNKCAP_SLS ); - val |=PCI_EXP_LNKCAP_SLS_2_5GB ; -dw_pcie_write (pci->dbi_base + exp_cap_off + -PCI_EXP_LNKCTL2 ,2 , val); - } - } -/* enable ltssm */ writel (DEVICE_TYPE_RC | (1 <<MISCTRL_EN_ID ) | (1 << APP_LTSSM_ENABLE_ID)
@@ -276,7 +251,7 @@ static int spear13xx_pcie_probe(struct platform_device *pdev) spear13xx_pcie->app_base = pci->dbi_base +0x2000 ;if (of_property_read_bool (np,"st,pcie-is-gen1" )) - spear13xx_pcie->is_gen1 = true; + pci->link_gen =1 ;platform_set_drvdata (pdev, spear13xx_pcie);
drivers/pci/controller/dwc/pcie-tegra194.c +0 -23
@@ -284,7 +284,6 @@ struct tegra_pcie_dw {u8 init_link_width;u32 msi_ctrl_int;u32 num_lanes; -u32 max_speed;u32 cid;u32 cfg_link_cap_l1sub;u32 pcie_cap_base;
@@ -900,16 +899,6 @@ static void tegra_pcie_prepare_host(struct pcie_port *pp) AMBA_ERROR_RESPONSE_CRS_SHIFT);dw_pcie_writel_dbi (pci,PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT , val); -/* Configure Max Speed from DT */ -if (pcie->max_speed && pcie->max_speed != -EINVAL ) { - val =dw_pcie_readl_dbi (pci, pcie->pcie_cap_base + -PCI_EXP_LNKCAP ); - val &= ~PCI_EXP_LNKCAP_SLS ; - val |= pcie->max_speed; -dw_pcie_writel_dbi (pci, pcie->pcie_cap_base +PCI_EXP_LNKCAP , - val); - } -/* Configure Max lane width from DT */ val =dw_pcie_readl_dbi (pci, pcie->pcie_cap_base +PCI_EXP_LNKCAP ); val &= ~PCI_EXP_LNKCAP_MLW ;
@@ -1119,8 +1108,6 @@ static int tegra_pcie_dw_parse_dt(struct tegra_pcie_dw *pcie)return ret; } - pcie->max_speed =of_pci_get_max_link_speed (np); - ret =of_property_read_u32_index (np,"nvidia,bpmp" ,1 , &pcie->cid);if (ret) {dev_err (pcie->dev,"Failed to read Controller-ID: %d\n" , ret);
@@ -1818,16 +1805,6 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie) val |=FTS_VAL ;dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -/* Configure Max Speed from DT */ -if (pcie->max_speed && pcie->max_speed != -EINVAL ) { - val =dw_pcie_readl_dbi (pci, pcie->pcie_cap_base + -PCI_EXP_LNKCAP ); - val &= ~PCI_EXP_LNKCAP_SLS ; - val |= pcie->max_speed; -dw_pcie_writel_dbi (pci, pcie->pcie_cap_base +PCI_EXP_LNKCAP , - val); - } - pcie->pcie_cap_base =dw_pcie_find_capability (&pcie->pci,PCI_CAP_ID_EXP );clk_set_rate (pcie->core_clk,GEN4_CORE_CLK_FREQ );
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 35/40 PCI: dwc: Set PORT_LINK_DLL_LINK_EN in common setup code
In reply to Rob HerringThe Intel driver is the only one to set PORT_LINK_DLL_LINK_EN. The default value is set and it seems pretty certain that enabling link initialization is always required. Maybe it could just be dropped from the Intel driver, but lets move setting it into the common code to be sure.
--- drivers/pci/controller/dwc/pcie-designware.c | 1 + drivers/pci/controller/dwc/pcie-intel-gw.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/pci/controller/dwc/pcie-designware.c +1 -0
@@ -553,6 +553,7 @@ void dw_pcie_setup(struct dw_pcie *pci) val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_FAST_LINK_MODE ; + val |=PORT_LINK_DLL_LINK_EN ;dw_pcie_writel_dbi (pci,PCIE_PORT_LINK_CONTROL , val); ret =of_property_read_u32 (np,"num-lanes" , &pci->num_lanes);
drivers/pci/controller/dwc/pcie-intel-gw.c +0 -4
@@ -164,10 +164,6 @@ static void intel_pcie_port_logic_setup(struct intel_pcie_port *lpp) val =FIELD_PREP (PORT_AFR_N_FTS_MASK , lpp->n_fts) |FIELD_PREP (PORT_AFR_CC_N_FTS_MASK , lpp->n_fts);pcie_rc_cfg_wr_mask (lpp,PCIE_PORT_AFR , mask, val); - -/* Port Link Control Register */ -pcie_rc_cfg_wr_mask (lpp,PCIE_PORT_LINK_CONTROL ,PORT_LINK_DLL_LINK_EN , -PORT_LINK_DLL_LINK_EN ); }static void intel_pcie_rc_setup (struct intel_pcie_port *lpp)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 36/40 PCI: dwc/intel-gw: Drop unnecessary checking of DT 'device_type' property
In reply to Rob HerringA driver doesn't need to check for DT 'device_type' property, so let's remove the check.
--- drivers/pci/controller/dwc/pcie-intel-gw.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/pci/controller/dwc/pcie-intel-gw.c +0 -6
@@ -268,12 +268,6 @@ static int intel_pcie_get_resources(struct platform_device *pdev)return ret; } - ret =device_property_match_string (dev,"device_type" ,"pci" ); -if (ret) { -dev_err (dev,"Failed to find pci device type: %d\n" , ret); -return ret; - } - ret =device_property_read_u32 (dev,"reset-assert-ms" , &lpp->rst_intrvl);if (ret)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 37/40 PCI: dwc/intel-gw: Move getting PCI_CAP_ID_EXP offset to intel_pcie_link_setup()
In reply to Rob HerringThe PCI_CAP_ID_EXP offset is only needed by intel_pcie_link_setup(), so let's retrieve it there and avoid storing the offset.
--- drivers/pci/controller/dwc/pcie-intel-gw.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/pci/controller/dwc/pcie-intel-gw.c +1 -14
@@ -72,7 +72,6 @@ struct intel_pcie_port {struct clk *core_clk;struct reset_control *core_rst;struct phy *phy; -u8 pcie_cap_ofst; };static void pcie_update_bits (void __iomem *base,u32 ofs,u32 mask,u32 val)
@@ -132,7 +131,7 @@ static void intel_pcie_ltssm_disable(struct intel_pcie_port *lpp)static void intel_pcie_link_setup (struct intel_pcie_port *lpp) {u32 val; -u8 offset = lpp->pcie_cap_ofst; +u8 offset =dw_pcie_find_capability (&lpp->pci,PCI_CAP_ID_EXP ); val =pcie_rc_cfg_rd (lpp, offset +PCI_EXP_LNKCAP ); lpp->max_width =FIELD_GET (PCI_EXP_LNKCAP_MLW , val);
@@ -328,7 +327,6 @@ static void intel_pcie_turn_off(struct intel_pcie_port *lpp)static int intel_pcie_host_setup (struct intel_pcie_port *lpp) { -struct device *dev = lpp->pci.dev;int ret;intel_pcie_core_rst_assert (lpp);
@@ -346,17 +344,6 @@ static int intel_pcie_host_setup(struct intel_pcie_port *lpp) goto clk_err; } -if (!lpp->pcie_cap_ofst) { - ret =dw_pcie_find_capability (&lpp->pci,PCI_CAP_ID_EXP ); -if (!ret) { - ret = -ENXIO ; -dev_err (dev,"Invalid PCIe capability offset\n" ); - goto app_init_err; - } - - lpp->pcie_cap_ofst = ret; - } -intel_pcie_rc_setup (lpp); ret =intel_pcie_app_logic_setup (lpp);if (ret)
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 38/40 PCI: dwc/intel-gw: Drop unused max_width
In reply to Rob Herring'max_width' is read, but never used, so let's remove it.
--- drivers/pci/controller/dwc/pcie-intel-gw.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/pci/controller/dwc/pcie-intel-gw.c +0 -4
@@ -67,7 +67,6 @@ struct intel_pcie_port {void __iomem *app_base;struct gpio_desc *reset_gpio;u32 rst_intrvl; -u32 max_width;u32 n_fts;struct clk *core_clk;struct reset_control *core_rst;
@@ -133,9 +132,6 @@ static void intel_pcie_link_setup(struct intel_pcie_port *lpp)u32 val;u8 offset =dw_pcie_find_capability (&lpp->pci,PCI_CAP_ID_EXP ); - val =pcie_rc_cfg_rd (lpp, offset +PCI_EXP_LNKCAP ); - lpp->max_width =FIELD_GET (PCI_EXP_LNKCAP_MLW , val); - val =pcie_rc_cfg_rd (lpp, offset +PCI_EXP_LNKCTL ); val &= ~(PCI_EXP_LNKCTL_LD |PCI_EXP_LNKCTL_ASPMC );
Signature · 1 line
2.25.1
Rob Herring
reviewerPATCH v2 39/40 PCI: dwc: Move N_FTS setup to common setup
In reply to Rob HerringThe Designware controller has common registers to set number of fast training sequence ordered sets. The Artpec6, Intel, and Tegra driver initialize these register fields. Let's move the initialization to the common setup code and drivers just have to provide the value.
There's a slight change in that the common clock mode N_FTS field is now initialized. Previously only the Intel driver set this. It's not clear from the code if common clock mode is used in the Artpec6 or Tegra driver. It depends on the DWC configuration. Given the field is not initialized while the others are, it seems unlikely common clock mode is used.
--- drivers/pci/controller/dwc/pcie-artpec6.c | 37 +++----------------- drivers/pci/controller/dwc/pcie-designware.c | 28 +++++++++------ drivers/pci/controller/dwc/pcie-designware.h | 3 +- drivers/pci/controller/dwc/pcie-intel-gw.c | 27 +++++--------- drivers/pci/controller/dwc/pcie-tegra194.c | 25 ++----------- 5 files changed, 35 insertions(+), 85 deletions(-)
drivers/pci/controller/dwc/pcie-artpec6.c +4 -33
@@ -44,13 +44,6 @@ struct artpec_pcie_of_data {static const struct of_device_id artpec6_pcie_of_match[]; -/* PCIe Port Logic registers (memory-mapped) */ -#define PL_OFFSET 0x700 - -#define ACK_F_ASPM_CTRL_OFF (PL_OFFSET + 0xc) -#define ACK_N_FTS_MASK GENMASK(15, 8) -#define ACK_N_FTS (x) (((x) << 8) & ACK_N_FTS_MASK) -/* ARTPEC-6 specific registers */ #define PCIECFG 0x18#define PCIECFG_DBG_OEN BIT(24)
@@ -289,30 +282,6 @@ static void artpec6_pcie_init_phy(struct artpec6_pcie *artpec6_pcie) } } -static void artpec6_pcie_set_nfts (struct artpec6_pcie *artpec6_pcie) -{ -struct dw_pcie *pci = artpec6_pcie->pci; -u32 val; - -if (artpec6_pcie->variant !=ARTPEC7 ) -return ; - -/* -* Increase the N_FTS (Number of Fast Training Sequences) -* to be transmitted when transitioning from L0s to L0. -*/ - val =dw_pcie_readl_dbi (pci,ACK_F_ASPM_CTRL_OFF ); - val &= ~ACK_N_FTS_MASK ; - val |=ACK_N_FTS (180 ); -dw_pcie_writel_dbi (pci,ACK_F_ASPM_CTRL_OFF , val); - -/* -* Set the Number of Fast Training Sequences that the core -* advertises as its N_FTS during Gen2 or Gen3 link training. -*/ -dw_pcie_link_set_n_fts (pci,180 ); -} -static void artpec6_pcie_assert_core_reset (struct artpec6_pcie *artpec6_pcie) {u32 val;
@@ -351,11 +320,14 @@ static int artpec6_pcie_host_init(struct pcie_port *pp)struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct artpec6_pcie *artpec6_pcie =to_artpec6_pcie (pci); +if (artpec6_pcie->variant ==ARTPEC7 ) { + pci->n_fts[0 ] =180 ; + pci->n_fts[1 ] =180 ; + }artpec6_pcie_assert_core_reset (artpec6_pcie);artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);dw_pcie_setup_rc (pp);artpec6_pcie_establish_link (pci);dw_pcie_wait_for_link (pci);
@@ -403,7 +375,6 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar);
drivers/pci/controller/dwc/pcie-designware.c +17 -11
@@ -510,17 +510,6 @@ static void dw_pcie_link_set_max_speed(struct dw_pcie *pci, u32 link_gen) }EXPORT_SYMBOL_GPL (dw_pcie_link_set_max_speed); -void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts) -{ -u32 val; - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |= n_fts &PORT_LOGIC_N_FTS_MASK ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -} -EXPORT_SYMBOL_GPL (dw_pcie_link_set_n_fts); -static u8 dw_pcie_iatu_unroll_enabled (struct dw_pcie *pci) {u32 val;
@@ -551,6 +540,23 @@ void dw_pcie_setup(struct dw_pcie *pci)if (pci->link_gen >0 )dw_pcie_link_set_max_speed (pci, pci->link_gen); +/* Configure Gen1 N_FTS */ +if (pci->n_fts[0 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); + val &= ~(PORT_AFR_N_FTS_MASK |PORT_AFR_CC_N_FTS_MASK ); + val |=PORT_AFR_N_FTS (pci->n_fts[0 ]); + val |=PORT_AFR_CC_N_FTS (pci->n_fts[0 ]); +dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); + } + +/* Configure Gen2+ N_FTS */ +if (pci->n_fts[1 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); + val &= ~PORT_LOGIC_N_FTS_MASK ; + val |= pci->n_fts[pci->link_gen -1 ]; +dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); + } + val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_FAST_LINK_MODE ; val |=PORT_LINK_DLL_LINK_EN ;
drivers/pci/controller/dwc/pcie-designware.h +2 -1
@@ -34,6 +34,7 @@#define PORT_AFR_N_FTS_MASK GENMASK(15, 8)#define PORT_AFR_N_FTS (n) FIELD_PREP(PORT_AFR_N_FTS_MASK, n)#define PORT_AFR_CC_N_FTS_MASK GENMASK(23, 16) +#define PORT_AFR_CC_N_FTS (n) FIELD_PREP(PORT_AFR_CC_N_FTS_MASK, n)#define PORT_AFR_ENTER_ASPM BIT(30)#define PORT_AFR_L0S_ENTRANCE_LAT_SHIFT 24#define PORT_AFR_L0S_ENTRANCE_LAT_MASK GENMASK(26, 24)
@@ -253,6 +254,7 @@ struct dw_pcie {unsigned int version;int num_lanes;int link_gen; +u8 n_fts[2 ]; };#define to_dw_pcie_from_pp (port) container_of((port), struct dw_pcie, pp)
@@ -271,7 +273,6 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val);void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val);int dw_pcie_link_up (struct dw_pcie *pci);void dw_pcie_upconfig_setup (struct dw_pcie *pci); -void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts);int dw_pcie_wait_for_link (struct dw_pcie *pci); void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type, u64 cpu_addr, u64 pci_addr,
drivers/pci/controller/dwc/pcie-intel-gw.c +9 -18
@@ -67,7 +67,6 @@ struct intel_pcie_port {void __iomem *app_base;struct gpio_desc *reset_gpio;u32 rst_intrvl; -u32 n_fts;struct clk *core_clk;struct reset_control *core_rst;struct phy *phy;
@@ -138,37 +137,29 @@ static void intel_pcie_link_setup(struct intel_pcie_port *lpp)pcie_rc_cfg_wr (lpp, offset +PCI_EXP_LNKCTL , val); } -static void intel_pcie_port_logic_setup (struct intel_pcie_port *lpp) +static void intel_pcie_init_n_fts (struct dw_pcie *pci) { -u32 val, mask; -struct dw_pcie *pci = &lpp->pci; - -switch (pcie_link_speed[pci->link_gen]) { -case PCIE_SPEED_8_0GT : - lpp->n_fts =PORT_AFR_N_FTS_GEN3 ; +switch (pci->link_gen) { +case 3 : + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN3 ;break ; -case PCIE_SPEED_16_0GT : - lpp->n_fts =PORT_AFR_N_FTS_GEN4 ; +case 4 : + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN4 ;break ;default : - lpp->n_fts =PORT_AFR_N_FTS_GEN12_DFT ; + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN12_DFT ;break ; } - - mask =PORT_AFR_N_FTS_MASK |PORT_AFR_CC_N_FTS_MASK ; - val =FIELD_PREP (PORT_AFR_N_FTS_MASK , lpp->n_fts) | -FIELD_PREP (PORT_AFR_CC_N_FTS_MASK , lpp->n_fts); -pcie_rc_cfg_wr_mask (lpp,PCIE_PORT_AFR , mask, val); + pci->n_fts[0 ] =PORT_AFR_N_FTS_GEN12_DFT ; }static void intel_pcie_rc_setup (struct intel_pcie_port *lpp) {intel_pcie_ltssm_disable (lpp);intel_pcie_link_setup (lpp); +intel_pcie_init_n_fts (&lpp->pci);dw_pcie_setup_rc (&lpp->pci.pp);dw_pcie_upconfig_setup (&lpp->pci); -intel_pcie_port_logic_setup (lpp); -dw_pcie_link_set_n_fts (&lpp->pci, lpp->n_fts); }static int intel_pcie_ep_rst_init (struct intel_pcie_port *lpp)
drivers/pci/controller/dwc/pcie-tegra194.c +3 -22
@@ -881,17 +881,6 @@ static void tegra_pcie_prepare_host(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,0 ); -/* Configure FTS */ - val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); - val &= ~PORT_AFR_N_FTS_MASK ; - val |=PORT_AFR_N_FTS (N_FTS_VAL ); -dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |=FTS_VAL ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -/* Enable as 0xFFFF0001 response for CRS */ val =dw_pcie_readl_dbi (pci,PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT ); val &= ~(AMBA_ERROR_RESPONSE_CRS_MASK <<AMBA_ERROR_RESPONSE_CRS_SHIFT );
@@ -1794,17 +1783,6 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie) val &= ~GEN3_RELATED_OFF_GEN3_ZRXDC_NONCOMPL ;dw_pcie_writel_dbi (pci,GEN3_RELATED_OFF , val); -/* Configure N_FTS & FTS */ - val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); - val &= ~PORT_AFR_N_FTS_MASK ; - val |=PORT_AFR_N_FTS (FTS_VAL ); -dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |=FTS_VAL ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); - pcie->pcie_cap_base =dw_pcie_find_capability (&pcie->pci,PCI_CAP_ID_EXP );clk_set_rate (pcie->core_clk,GEN4_CORE_CLK_FREQ );
@@ -2033,6 +2011,9 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) pci = &pcie->pci; pci->dev = &pdev->dev; pci->ops = &tegra_dw_pcie_ops; + pci->n_fts[0 ] =N_FTS_VAL ; + pci->n_fts[1 ] =FTS_VAL ; + pp = &pci->pp; pcie->dev = &pdev->dev; pcie->mode = (enum dw_pcie_device_mode )data->mode;
Signature · 1 line
2.25.1
Re: [PATCH v2 39/40] PCI: dwc: Move N_FTS setup to common setup
Quoted 132 lines · Rob Herring
The Designware controller has common registers to set number of fast training sequence ordered sets. The Artpec6, Intel, and Tegra driver initialize these register fields. Let's move the initialization to the common setup code and drivers just have to provide the value.
There's a slight change in that the common clock mode
N_FTSfield is now initialized. Previously only the Intel driver set this. It's not clear from the code if common clock mode is used in the Artpec6 or Tegra driver. It depends on the DWC configuration. Given the field is not initialized while the others are, it seems unlikely common clock mode is used.Cc Jesper Nilsson <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-artpec6.c | 37 +++----------------- drivers/pci/controller/dwc/pcie-designware.c | 28 +++++++++------ drivers/pci/controller/dwc/pcie-designware.h | 3 +- drivers/pci/controller/dwc/pcie-intel-gw.c | 27 +++++--------- drivers/pci/controller/dwc/pcie-tegra194.c | 25 ++----------- 5 files changed, 35 insertions(+), 85 deletions(-)drivers/pci/controller/dwc/pcie-artpec6.c +4
-33@@ -44,13 +44,6 @@ struct artpec_pcie_of_data {static const struct of_device_id artpec6_pcie_of_match[]; -/* PCIe Port Logic registers (memory-mapped) */ -#define PL_OFFSET 0x700 - -#define ACK_F_ASPM_CTRL_OFF (PL_OFFSET + 0xc) -#define ACK_N_FTS_MASK GENMASK(15, 8) -#define ACK_N_FTS (x) (((x) << 8) & ACK_N_FTS_MASK) -/* ARTPEC-6 specific registers */ #define PCIECFG 0x18#define PCIECFG_DBG_OEN BIT(24)@@ -289,30 +282,6 @@ static void artpec6_pcie_init_phy(struct artpec6_pcie *artpec6_pcie) } } -static void artpec6_pcie_set_nfts (struct artpec6_pcie *artpec6_pcie) -{ -struct dw_pcie *pci = artpec6_pcie->pci; -u32 val; - -if (artpec6_pcie->variant !=ARTPEC7 ) -return ; - -/* -* Increase the N_FTS (Number of Fast Training Sequences) -* to be transmitted when transitioning from L0s to L0. -*/ - val =dw_pcie_readl_dbi (pci,ACK_F_ASPM_CTRL_OFF ); - val &= ~ACK_N_FTS_MASK ; - val |=ACK_N_FTS (180 ); -dw_pcie_writel_dbi (pci,ACK_F_ASPM_CTRL_OFF , val); - -/* -* Set the Number of Fast Training Sequences that the core -* advertises as its N_FTS during Gen2 or Gen3 link training. -*/ -dw_pcie_link_set_n_fts (pci,180 ); -} -static void artpec6_pcie_assert_core_reset (struct artpec6_pcie *artpec6_pcie) {u32 val;@@ -351,11 +320,14 @@ static int artpec6_pcie_host_init(struct pcie_port *pp)struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct artpec6_pcie *artpec6_pcie =to_artpec6_pcie (pci); +if (artpec6_pcie->variant ==ARTPEC7 ) { + pci->n_fts[0 ] =180 ; + pci->n_fts[1 ] =180 ; + }artpec6_pcie_assert_core_reset (artpec6_pcie);artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);dw_pcie_setup_rc (pp);artpec6_pcie_establish_link (pci);dw_pcie_wait_for_link (pci);@@ -403,7 +375,6 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar);drivers/pci/controller/dwc/pcie-designware.c +4
-11@@ -510,17 +510,6 @@ static void dw_pcie_link_set_max_speed(struct dw_pcie *pci, u32 link_gen) }EXPORT_SYMBOL_GPL (dw_pcie_link_set_max_speed); -void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts) -{ -u32 val; - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |= n_fts &PORT_LOGIC_N_FTS_MASK ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -} -EXPORT_SYMBOL_GPL (dw_pcie_link_set_n_fts); -static u8 dw_pcie_iatu_unroll_enabled (struct dw_pcie *pci) {u32 val;@@ -551,6 +540,23 @@ void dw_pcie_setup(struct dw_pcie *pci)if (pci->link_gen >0 )dw_pcie_link_set_max_speed (pci, pci->link_gen); +/* Configure Gen1 N_FTS */ +if (pci->n_fts[0 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); + val &= ~(PORT_AFR_N_FTS_MASK |PORT_AFR_CC_N_FTS_MASK );
drivers/pci/controller/dwc/pcie-designware.c void dw_pcie_setup(struct dw_pcie *pci) · line 556
Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware.c +10
-0+ val |=PORT_AFR_N_FTS (pci->n_fts[0 ]); + val |=PORT_AFR_CC_N_FTS (pci->n_fts[0 ]); +dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); + } + +/* Configure Gen2+ N_FTS */ +if (pci->n_fts[1 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); + val &= ~PORT_LOGIC_N_FTS_MASK ; + val |= pci->n_fts[pci->link_gen -1 ];
Apologies for getting late to this change given that the change has already been merged.
I'm wondering why is it that link_gen has to be used in deriving the index instead of directly using '1' as the index? Infact the for link speed greater than 2, accesses go beyond n_fts[] array boundaries.
Since the if() check is done based on a non-zero value of pci->n_fts[1], shouldn't the same be used for programming also?
- Vidya Sagar
Quoted 144 lines
drivers/pci/controller/dwc/pcie-designware.c +3
-0+dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); + } + val =dw_pcie_readl_dbi (pci,PCIE_PORT_LINK_CONTROL ); val &= ~PORT_LINK_FAST_LINK_MODE ; val |=PORT_LINK_DLL_LINK_EN ;drivers/pci/controller/dwc/pcie-designware.h +2
-1@@ -34,6 +34,7 @@#define PORT_AFR_N_FTS_MASK GENMASK(15, 8)#define PORT_AFR_N_FTS (n) FIELD_PREP(PORT_AFR_N_FTS_MASK, n)#define PORT_AFR_CC_N_FTS_MASK GENMASK(23, 16) +#define PORT_AFR_CC_N_FTS (n) FIELD_PREP(PORT_AFR_CC_N_FTS_MASK, n)#define PORT_AFR_ENTER_ASPM BIT(30)#define PORT_AFR_L0S_ENTRANCE_LAT_SHIFT 24#define PORT_AFR_L0S_ENTRANCE_LAT_MASK GENMASK(26, 24)@@ -253,6 +254,7 @@ struct dw_pcie {unsigned int version;int num_lanes;int link_gen; +u8 n_fts[2 ]; };#define to_dw_pcie_from_pp (port) container_of((port), struct dw_pcie, pp)@@ -271,7 +273,6 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val);void dw_pcie_write_dbi2 (struct dw_pcie *pci,u32 reg,size_t size,u32 val);int dw_pcie_link_up (struct dw_pcie *pci);void dw_pcie_upconfig_setup (struct dw_pcie *pci); -void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts);int dw_pcie_wait_for_link (struct dw_pcie *pci); void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type, u64 cpu_addr, u64 pci_addr,drivers/pci/controller/dwc/pcie-intel-gw.c +9
-18@@ -67,7 +67,6 @@ struct intel_pcie_port {void __iomem *app_base;struct gpio_desc *reset_gpio;u32 rst_intrvl; -u32 n_fts;struct clk *core_clk;struct reset_control *core_rst;struct phy *phy;@@ -138,37 +137,29 @@ static void intel_pcie_link_setup(struct intel_pcie_port *lpp)pcie_rc_cfg_wr (lpp, offset +PCI_EXP_LNKCTL , val); } -static void intel_pcie_port_logic_setup (struct intel_pcie_port *lpp) +static void intel_pcie_init_n_fts (struct dw_pcie *pci) { -u32 val, mask; -struct dw_pcie *pci = &lpp->pci; - -switch (pcie_link_speed[pci->link_gen]) { -case PCIE_SPEED_8_0GT : - lpp->n_fts =PORT_AFR_N_FTS_GEN3 ; +switch (pci->link_gen) { +case 3 : + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN3 ;break ; -case PCIE_SPEED_16_0GT : - lpp->n_fts =PORT_AFR_N_FTS_GEN4 ; +case 4 : + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN4 ;break ;default : - lpp->n_fts =PORT_AFR_N_FTS_GEN12_DFT ; + pci->n_fts[1 ] =PORT_AFR_N_FTS_GEN12_DFT ;break ; } - - mask =PORT_AFR_N_FTS_MASK |PORT_AFR_CC_N_FTS_MASK ; - val =FIELD_PREP (PORT_AFR_N_FTS_MASK , lpp->n_fts) | -FIELD_PREP (PORT_AFR_CC_N_FTS_MASK , lpp->n_fts); -pcie_rc_cfg_wr_mask (lpp,PCIE_PORT_AFR , mask, val); + pci->n_fts[0 ] =PORT_AFR_N_FTS_GEN12_DFT ; }static void intel_pcie_rc_setup (struct intel_pcie_port *lpp) {intel_pcie_ltssm_disable (lpp);intel_pcie_link_setup (lpp); +intel_pcie_init_n_fts (&lpp->pci);dw_pcie_setup_rc (&lpp->pci.pp);dw_pcie_upconfig_setup (&lpp->pci); -intel_pcie_port_logic_setup (lpp); -dw_pcie_link_set_n_fts (&lpp->pci, lpp->n_fts); }static int intel_pcie_ep_rst_init (struct intel_pcie_port *lpp)drivers/pci/controller/dwc/pcie-tegra194.c +3
-22@@ -881,17 +881,6 @@ static void tegra_pcie_prepare_host(struct pcie_port *pp)dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,0 ); -/* Configure FTS */ - val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); - val &= ~PORT_AFR_N_FTS_MASK ; - val |=PORT_AFR_N_FTS (N_FTS_VAL ); -dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |=FTS_VAL ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -/* Enable as 0xFFFF0001 response for CRS */ val =dw_pcie_readl_dbi (pci,PORT_LOGIC_AMBA_ERROR_RESPONSE_DEFAULT ); val &= ~(AMBA_ERROR_RESPONSE_CRS_MASK <<AMBA_ERROR_RESPONSE_CRS_SHIFT );@@ -1794,17 +1783,6 @@ static void pex_ep_event_pex_rst_deassert(struct tegra_pcie_dw *pcie) val &= ~GEN3_RELATED_OFF_GEN3_ZRXDC_NONCOMPL ;dw_pcie_writel_dbi (pci,GEN3_RELATED_OFF , val); -/* Configure N_FTS & FTS */ - val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); - val &= ~PORT_AFR_N_FTS_MASK ; - val |=PORT_AFR_N_FTS (FTS_VAL ); -dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |=FTS_VAL ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); - pcie->pcie_cap_base =dw_pcie_find_capability (&pcie->pci,PCI_CAP_ID_EXP );clk_set_rate (pcie->core_clk,GEN4_CORE_CLK_FREQ );@@ -2033,6 +2011,9 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) pci = &pcie->pci; pci->dev = &pdev->dev; pci->ops = &tegra_dw_pcie_ops; + pci->n_fts[0 ] =N_FTS_VAL ; + pci->n_fts[1 ] =FTS_VAL ; + pp = &pci->pp; pcie->dev = &pdev->dev; pcie->mode = (enum dw_pcie_device_mode )data->mode;
Rob Herring
reviewerRe: [PATCH v2 39/40] PCI: dwc: Move N_FTS setup to common setup
Quoted 146 lines · Vidya Sagar
Quoted 132 lines · Rob Herring
The Designware controller has common registers to set number of fast training sequence ordered sets. The Artpec6, Intel, and Tegra driver initialize these register fields. Let's move the initialization to the common setup code and drivers just have to provide the value.
There's a slight change in that the common clock mode
N_FTSfield is now initialized. Previously only the Intel driver set this. It's not clear from the code if common clock mode is used in the Artpec6 or Tegra driver. It depends on the DWC configuration. Given the field is not initialized while the others are, it seems unlikely common clock mode is used.Cc Jesper Nilsson <[email protected]>Cc Lorenzo Pieralisi <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Jingoo Han <[email protected]>Cc Gustavo Pimentel <[email protected]>Cc Thierry Reding <[email protected]>Cc Jonathan Hunter <[email protected]>Signed-off-by Rob Herring <[email protected]>--- drivers/pci/controller/dwc/pcie-artpec6.c | 37 +++----------------- drivers/pci/controller/dwc/pcie-designware.c | 28 +++++++++------ drivers/pci/controller/dwc/pcie-designware.h | 3 +- drivers/pci/controller/dwc/pcie-intel-gw.c | 27 +++++--------- drivers/pci/controller/dwc/pcie-tegra194.c | 25 ++----------- 5 files changed, 35 insertions(+), 85 deletions(-)drivers/pci/controller/dwc/pcie-artpec6.c +4
-33@@ -44,13 +44,6 @@ struct artpec_pcie_of_data {static const struct of_device_id artpec6_pcie_of_match[]; -/* PCIe Port Logic registers (memory-mapped) */ -#define PL_OFFSET 0x700 - -#define ACK_F_ASPM_CTRL_OFF (PL_OFFSET + 0xc) -#define ACK_N_FTS_MASK GENMASK(15, 8) -#define ACK_N_FTS (x) (((x) << 8) & ACK_N_FTS_MASK) -/* ARTPEC-6 specific registers */ #define PCIECFG 0x18#define PCIECFG_DBG_OEN BIT(24)@@ -289,30 +282,6 @@ static void artpec6_pcie_init_phy(struct artpec6_pcie *artpec6_pcie) } } -static void artpec6_pcie_set_nfts (struct artpec6_pcie *artpec6_pcie) -{ -struct dw_pcie *pci = artpec6_pcie->pci; -u32 val; - -if (artpec6_pcie->variant !=ARTPEC7 ) -return ; - -/* -* Increase the N_FTS (Number of Fast Training Sequences) -* to be transmitted when transitioning from L0s to L0. -*/ - val =dw_pcie_readl_dbi (pci,ACK_F_ASPM_CTRL_OFF ); - val &= ~ACK_N_FTS_MASK ; - val |=ACK_N_FTS (180 ); -dw_pcie_writel_dbi (pci,ACK_F_ASPM_CTRL_OFF , val); - -/* -* Set the Number of Fast Training Sequences that the core -* advertises as its N_FTS during Gen2 or Gen3 link training. -*/ -dw_pcie_link_set_n_fts (pci,180 ); -} -static void artpec6_pcie_assert_core_reset (struct artpec6_pcie *artpec6_pcie) {u32 val;@@ -351,11 +320,14 @@ static int artpec6_pcie_host_init(struct pcie_port *pp)struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct artpec6_pcie *artpec6_pcie =to_artpec6_pcie (pci); +if (artpec6_pcie->variant ==ARTPEC7 ) { + pci->n_fts[0 ] =180 ; + pci->n_fts[1 ] =180 ; + }artpec6_pcie_assert_core_reset (artpec6_pcie);artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);dw_pcie_setup_rc (pp);artpec6_pcie_establish_link (pci);dw_pcie_wait_for_link (pci);@@ -403,7 +375,6 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie);artpec6_pcie_wait_for_phy (artpec6_pcie); -artpec6_pcie_set_nfts (artpec6_pcie);for (bar =0 ; bar <PCI_STD_NUM_BARS ; bar++)dw_pcie_ep_reset_bar (pci, bar);drivers/pci/controller/dwc/pcie-designware.c +4
-11@@ -510,17 +510,6 @@ static void dw_pcie_link_set_max_speed(struct dw_pcie *pci, u32 link_gen) }EXPORT_SYMBOL_GPL (dw_pcie_link_set_max_speed); -void dw_pcie_link_set_n_fts (struct dw_pcie *pci,u32 n_fts) -{ -u32 val; - - val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); - val &= ~PORT_LOGIC_N_FTS_MASK ; - val |= n_fts &PORT_LOGIC_N_FTS_MASK ; -dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); -} -EXPORT_SYMBOL_GPL (dw_pcie_link_set_n_fts); -static u8 dw_pcie_iatu_unroll_enabled (struct dw_pcie *pci) {u32 val;@@ -551,6 +540,23 @@ void dw_pcie_setup(struct dw_pcie *pci)if (pci->link_gen >0 )dw_pcie_link_set_max_speed (pci, pci->link_gen); +/* Configure Gen1 N_FTS */ +if (pci->n_fts[0 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_PORT_AFR ); + val &= ~(PORT_AFR_N_FTS_MASK |PORT_AFR_CC_N_FTS_MASK );drivers/pci/controller/dwc/pcie-designware.c void dw_pcie_setup(struct dw_pcie *pci) · line 556
Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware.c +10
-0+ val |=PORT_AFR_N_FTS (pci->n_fts[0 ]); + val |=PORT_AFR_CC_N_FTS (pci->n_fts[0 ]); +dw_pcie_writel_dbi (pci,PCIE_PORT_AFR , val); + } + +/* Configure Gen2+ N_FTS */ +if (pci->n_fts[1 ]) { + val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); + val &= ~PORT_LOGIC_N_FTS_MASK ; + val |= pci->n_fts[pci->link_gen -1 ];
Quoted 8 lines
Apologies for getting late to this change given that the change has already been merged.
I'm wondering why is it thatlink_genhas to be used in deriving the index instead of directly using '1' as the index?
Infact the for link speed greater than 2, accesses go beyond n_fts[] array boundaries.
Since theif()check is done based on a non-zero value of pci->n_fts[1], shouldn't the same be used for programming also?
Yes, I think you are right.
Rob
Rob Herring
reviewerPATCH v2 40/40 PCI: dwc: Use DBI accessors
In reply to Rob HerringConvert the remaining cases of register accesses using dbi_base rather than dw_pcie_(read|write)[bwl]_dbi accessors.
--- drivers/pci/controller/dwc/pcie-spear13xx.c | 8 ++++---- drivers/pci/controller/dwc/pcie-tegra194.c | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/pci/controller/dwc/pcie-spear13xx.c +4 -4
@@ -86,12 +86,12 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)* default value in capability register is 512 bytes. So force * it to 128 here. */ -dw_pcie_read (pci->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , &val); + val =dw_pcie_readw_dbi (pci, exp_cap_off +PCI_EXP_DEVCTL ); val &= ~PCI_EXP_DEVCTL_READRQ ; -dw_pcie_write (pci->dbi_base + exp_cap_off +PCI_EXP_DEVCTL ,2 , val); +dw_pcie_writew_dbi (pci, exp_cap_off +PCI_EXP_DEVCTL , val); -dw_pcie_write (pci->dbi_base +PCI_VENDOR_ID ,2 ,0x104A ); -dw_pcie_write (pci->dbi_base +PCI_DEVICE_ID ,2 ,0xCD80 ); +dw_pcie_writew_dbi (pci,PCI_VENDOR_ID ,0x104A ); +dw_pcie_writew_dbi (pci,PCI_DEVICE_ID ,0xCD80 );/* enable ltssm */ writel(DEVICE_TYPE_RC | (1 << MISCTRL_EN_ID)
drivers/pci/controller/dwc/pcie-tegra194.c +4 -6
@@ -816,26 +816,24 @@ static void config_gen3_gen4_eq_presets(struct tegra_pcie_dw *pcie)/* Program init preset */ for (i =0 ; i < pcie->num_lanes; i++) { -dw_pcie_read (pci->dbi_base +CAP_SPCIE_CAP_OFF - + (i *2 ),2 , &val); + val =dw_pcie_readw_dbi (pci,CAP_SPCIE_CAP_OFF + (i *2 )); val &= ~CAP_SPCIE_CAP_OFF_DSP_TX_PRESET0_MASK ; val |=GEN3_GEN4_EQ_PRESET_INIT ; val &= ~CAP_SPCIE_CAP_OFF_USP_TX_PRESET0_MASK ; val |= (GEN3_GEN4_EQ_PRESET_INIT <<CAP_SPCIE_CAP_OFF_USP_TX_PRESET0_SHIFT ); -dw_pcie_write (pci->dbi_base +CAP_SPCIE_CAP_OFF - + (i *2 ),2 , val); +dw_pcie_writew_dbi (pci,CAP_SPCIE_CAP_OFF + (i *2 ), val); offset =dw_pcie_find_ext_capability (pci,PCI_EXT_CAP_ID_PL_16GT ) +PCI_PL_16GT_LE_CTRL ; -dw_pcie_read (pci->dbi_base + offset + i,1 , &val); + val =dw_pcie_readb_dbi (pci, offset + i); val &= ~PCI_PL_16GT_LE_CTRL_DSP_TX_PRESET_MASK ; val |=GEN3_GEN4_EQ_PRESET_INIT ; val &= ~PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK ; val |= (GEN3_GEN4_EQ_PRESET_INIT <<PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT ); -dw_pcie_write (pci->dbi_base + offset + i,1 , val); +dw_pcie_writeb_dbi (pci, offset + i, val); } val =dw_pcie_readl_dbi (pci,GEN3_RELATED_OFF );
Signature · 1 line
2.25.1
Lorenzo Pieralisi
AppliedQuoted 10 lines · Rob Herring
This is a series of clean-ups for the Designware PCI driver. The series initially reworks the config space accessors to use the existing
pci_opsstruct. Then there's removal of various private data that's also present in thepci_host_bridgestruct. There's also some duplicated common (PCI and DWC) register defines which I converted to use the common defines. Finally, the initialization for speed/gen, number of lanes, andN_FTSare all moved to the common DWC code.This is compile tested only as I don't have any DWC based h/w, so any testing would be helpful. A branch is here[1].
Applied the series to pci/dwc, thanks.
Lorenzo
Quoted 73 lines
Rob
[1]
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.gitpci-dw-cleanupsRob Herring (40):
PCI: Allow root and child buses to have differentpci_ops
PCI: dwc: Use DBI accessors instead of own config accessors
PCI: dwc: Allow overriding bridgepci_ops
PCI: dwc: Add a default pci_ops.map_bus for root port
PCI: dwc: al: Usepci_opsfor child config space accessors
PCI: dwc: keystone: Usepci_opsfor config space accessors
PCI: dwc: tegra: Usepci_opsfor root config space accessors
PCI: dwc: meson: Usepci_opsfor root config space accessors
PCI: dwc: kirin: Usepci_opsfor root config space accessors
PCI: dwc: exynos: Usepci_opsfor root config space accessors
PCI: dwc: histb: Usepci_opsfor root config space accessors
PCI: dwc: Remove dwc specific config accessor ops
PCI: dwc: Use generic config accessors
PCI: Also call .add_bus() callback for root bus
PCI: dwc: keystone: Convert .scan_bus() callback to useadd_bus
PCI: dwc: Convert to usepci_host_probe()
PCI: dwc: Removeroot_buspointer
PCI: dwc: Remove storing of PCI resources
PCI: dwc: Simplify config space handling
PCI: dwc/keystone: Drop duplicated 'num-viewport'
PCI: dwc: CheckCONFIG_PCI_MSIinsidedw_pcie_msi_init()
PCI: dwc/imx6: Remove duplicate definePCIE_LINK_WIDTH_SPEED_CONTROL
PCI: dwc: Add a 'num_lanes' field to structdw_pcie
PCI: dwc: EnsureFAST_LINK_MODEis cleared
PCI: dwc/meson: Drop the duplicate number of lanes setup
PCI: dwc/meson: Drop unnecessary RC config space initialization
PCI: dwc/meson: Rework PCI config and DW port logic register accesses
PCI: dwc/imx6: Use common PCI register definitions
PCI: dwc/qcom: Use common PCI register definitions
PCI: dwc: Remove hardcodedPCI_CAP_ID_EXPoffset
PCI: dwc/tegra: Use common Designware port logic register definitions
PCI: dwc: Removeread_dbi2code
PCI: dwc: Make ATU accessors private
PCI: dwc: Centralize link gen setting
PCI: dwc: SetPORT_LINK_DLL_LINK_ENin common setup code
PCI: dwc/intel-gw: Drop unnecessary checking of DT 'device_type'
property
PCI: dwc/intel-gw: Move gettingPCI_CAP_ID_EXPoffset to
intel_pcie_link_setup()
PCI: dwc/intel-gw: Drop unusedmax_width
PCI: dwc: MoveN_FTSsetup to common setup
PCI: dwc: Use DBI accessorsdrivers/pci/controller/dwc/pci-dra7xx.c | 29 +- drivers/pci/controller/dwc/pci-exynos.c | 45 +-- drivers/pci/controller/dwc/pci-imx6.c | 52 +-- drivers/pci/controller/dwc/pci-keystone.c | 126 ++----- drivers/pci/controller/dwc/pci-meson.c | 156 ++------- drivers/pci/controller/dwc/pcie-al.c | 70 +--- drivers/pci/controller/dwc/pcie-artpec6.c | 48 +-- .../pci/controller/dwc/pcie-designware-ep.c | 11 +- .../pci/controller/dwc/pcie-designware-host.c | 319 ++++++------------ .../pci/controller/dwc/pcie-designware-plat.c | 4 +- drivers/pci/controller/dwc/pcie-designware.c | 104 +++--- drivers/pci/controller/dwc/pcie-designware.h | 54 +-- drivers/pci/controller/dwc/pcie-histb.c | 45 +-- drivers/pci/controller/dwc/pcie-intel-gw.c | 65 +--- drivers/pci/controller/dwc/pcie-kirin.c | 43 +-- drivers/pci/controller/dwc/pcie-qcom.c | 33 +- drivers/pci/controller/dwc/pcie-spear13xx.c | 39 +-- drivers/pci/controller/dwc/pcie-tegra194.c | 120 ++----- drivers/pci/controller/dwc/pcie-uniphier.c | 3 +- drivers/pci/probe.c | 14 +- include/linux/pci.h | 1 + 21 files changed, 443 insertions(+), 938 deletions(-)--
2.25.1
Hi Rob,
Quoted 10 lines
This is a series of clean-ups for the Designware PCI driver. The series initially reworks the config space accessors to use the existing
pci_opsstruct. Then there's removal of various private data that's also present in thepci_host_bridgestruct. There's also some duplicated common (PCI and DWC) register defines which I converted to use the common defines. Finally, the initialization for speed/gen, number of lanes, andN_FTSare all moved to the common DWC code.This is compile tested only as I don't have any DWC based h/w, so any testing would be helpful. A branch is here[1].
I've noticed that with the latest linux-next, my board doesn't boot anymore. I've traced it back to this series. There is a similar board in kernelci [1,2] where you can have a look at the backtrace.
I've bisected this to the following patch:
PCI: dwc: Use generic config accessors
I'm pretty much lost here. It seems that the kernel tries to read from an invalid/unmapped memory address.
[1] https://kernelci.org/test/plan/id/5f5f4992d1c53777a0a6092d/
[2] https://storage.kernelci.org/next/master/next-20200914/arm64/defconfig/gcc-8/lab-nxp/baseline-fsl-ls1028a-rdb.txt
-michael
Rob Herring
reviewerQuoted 14 lines · Michael Walle
Hi Rob,
Quoted 10 lines
This is a series of clean-ups for the Designware PCI driver. The series initially reworks the config space accessors to use the existing
pci_opsstruct. Then there's removal of various private data that's also present in thepci_host_bridgestruct. There's also some duplicated common (PCI and DWC) register defines which I converted to use the common defines. Finally, the initialization for speed/gen, number of lanes, andN_FTSare all moved to the common DWC code.This is compile tested only as I don't have any DWC based h/w, so any testing would be helpful. A branch is here[1].
Quoted 6 lines
I've noticed that with the latest linux-next, my board doesn't boot anymore. I've traced it back to this series. There is a similar board in kernelci [1,2] where you can have a look at the backtrace.
I've bisected this to the following patch:
PCI: dwc: Use generic config accessors
That's helpful.
Quoted 5 lines
I'm pretty much lost here. It seems that the kernel tries to read from an invalid/unmapped memory address.
[1] https://kernelci.org/test/plan/id/5f5f4992d1c53777a0a6092d/
[2] https://storage.kernelci.org/next/master/next-20200914/arm64/defconfig/gcc-8/lab-nxp/baseline-fsl-ls1028a-rdb.txt
Thanks for the pointers. I was wondering if kernelci had any boards with DWC.
Can you try this? The link up check seemed unnecessary as it is racy. What happens if the link goes down right after checking? That's the only thing in the change that sticks out.
(quoted diff) +0 -0
b/drivers/pci/controller/dwc/pcie-designware-host.c index 317ff512f8df..afee1a0e8883 100644
drivers/pci/controller/dwc/pcie-designware-host.c +0 -0
@@ -441,6 +441,9 @@ static void __iomem
*dw_pcie_other_conf_map_bus(struct pci_bus *bus,
struct pcie_port *pp = bus->sysdata;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);+ if (!dw_pcie_link_up(pci))
+ return NULL;
+
busdev = PCIE_ATU_BUS(bus->number) | PCIE_ATU_DEV(PCI_SLOT(devfn)) |
PCIE_ATU_FUNC(PCI_FUNC(devfn));_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Am 2020-09-16 00:02, schrieb Rob Herring:
Quoted 19 lines
Can you try this? The link up check seemed unnecessary as it is racy. What happens if the link goes down right after checking? That's the only thing in the change that sticks out.
drivers/pci/controller/dwc/pcie-designware-host.c +3
-0@@ -441,6 +441,9 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus, struct pcie_port *pp = bus->sysdata;struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +if (!dw_pcie_link_up (pci)) +return NULL ; + busdev = PCIE_ATU_BUS(bus->number) |PCIE_ATU_DEV(PCI_SLOT(devfn)) |
Quoted 1 line
PCIE_ATU_FUNC(PCI_FUNC(devfn));
This will fix the issue.
-michael
Hi,
Quoted 15 lines · Michael Walle
Am 2020-09-16 00:02, schrieb Rob Herring:
Quoted 14 lines
Can you try this? The link up check seemed unnecessary as it is racy. What happens if the link goes down right after checking? That's the only thing in the change that sticks out.
drivers/pci/controller/dwc/pcie-designware-host.c +0
-0@@ -441,6 +441,9 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus, struct pcie_port *pp = bus->sysdata; struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
Quoted 8 lines
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-host.c +3
-0+ if (!dw_pcie_link_up(pci)) + return NULL; +busdev =
PCIE_ATU_BUS(bus->number)|
PCIE_ATU_DEV(PCI_SLOT(devfn)) |
PCIE_ATU_FUNC(PCI_FUNC(devfn));This will fix the issue.
This fix is required to get DRA7 EVM booting again in linux-next.
Thanks
Kishon
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Rob Herring
reviewerQuoted 28 lines · Kishon Vijay Abraham I
Hi,
Quoted 15 lines · Michael Walle
Am 2020-09-16 00:02, schrieb Rob Herring:
Quoted 14 lines
Can you try this? The link up check seemed unnecessary as it is racy. What happens if the link goes down right after checking? That's the only thing in the change that sticks out.
drivers/pci/controller/dwc/pcie-designware-host.c +0
-0@@ -441,6 +441,9 @@ static void __iomem *dw_pcie_other_conf_map_bus(struct pci_bus *bus, struct pcie_port *pp = bus->sysdata;struct dw_pcie *pci =to_dw_pcie_from_pp (pp);Quoted 8 lines
Quoted 6 lines
drivers/pci/controller/dwc/pcie-designware-host.c +3
-0+if (!dw_pcie_link_up (pci)) +return NULL ; + busdev = PCIE_ATU_BUS(bus->number) |PCIE_ATU_DEV(PCI_SLOT(devfn)) |
PCIE_ATU_FUNC(PCI_FUNC(devfn));This will fix the issue.
Quoted 1 line
This fix is required to get DRA7 EVM booting again in linux-next.
Did you see the discussion here[1]? Is firmware setting up the same register in question?
Rob