* [PATCH v11 0/4] ARC: Add PCI support
@ 2016-02-26 16:29 Bjorn Helgaas
2016-02-26 16:29 ` [PATCH v11 1/4] " Bjorn Helgaas
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-26 16:29 UTC (permalink / raw)
To: Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
>From Joao's v9 posting
(http://lkml.kernel.org/r/cover.1454952698.git.jpinto@synopsys.com):
"This patch set has the goal to add suppport for DesignWare PCIe RC in ARC
AXS10x. It includes the necessary tweaks to:
- the ARC architecture (PCI support)
- the PCI subsystem (ARC CPU support)
- to pcie-designware (Centralisation of wait for link routine)
- to dra7xx, exynos, imx6 and spear13xx drivers to use the centralised
code for link wait
A simple module was (pcie-designware-plat) was created to contain the
specific platform init code."
Changes from v10:
- Update keystone link establishment to wait longer for link to come up
before re-initiating link training
- Also use generic dw_pcie_wait_for_link() in keystone and qcom drivers
I would still like acks from DesignWare maintainers (Jingoo or
Pratyush), from Murali for the Keystone changes, and from Arnd for the
DT updates.
This series is in my pci/host-synopsys branch here:
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/host-syn
opsys
---
Joao Pinto (4):
ARC: Add PCI support
PCI: designware: Add generic dw_pcie_wait_for_link()
PCI: designware: Add default link up check if sub-driver doesn't override
PCI: designware: Add driver for prototyping kits based on ARC SDP
.../devicetree/bindings/pci/designware-pcie.txt | 17 ++
MAINTAINERS | 7 +
arch/arc/Kconfig | 26 ++++
arch/arc/include/asm/dma.h | 5 +
arch/arc/include/asm/io.h | 9 +
arch/arc/include/asm/pci.h | 31 ++++
arch/arc/kernel/Makefile | 1
arch/arc/kernel/pcibios.c | 22 +++
arch/arc/plat-axs10x/Kconfig | 1
drivers/pci/Makefile | 1
drivers/pci/host/Kconfig | 11 ++
drivers/pci/host/Makefile | 1
drivers/pci/host/pci-dra7xx.c | 11 --
drivers/pci/host/pci-exynos.c | 13 --
drivers/pci/host/pci-imx6.c | 13 +-
drivers/pci/host/pci-keystone.c | 10 +
drivers/pci/host/pcie-designware-plat.c | 138 ++++++++++++++++++++
drivers/pci/host/pcie-designware.c | 29 ++++
drivers/pci/host/pcie-designware.h | 6 +
drivers/pci/host/pcie-qcom.c | 10 -
drivers/pci/host/pcie-spear13xx.c | 14 --
21 files changed, 318 insertions(+), 58 deletions(-)
create mode 100644 arch/arc/include/asm/pci.h
create mode 100644 arch/arc/kernel/pcibios.c
create mode 100644 drivers/pci/host/pcie-designware-plat.c
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v11 1/4] ARC: Add PCI support
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
@ 2016-02-26 16:29 ` Bjorn Helgaas
2016-02-26 16:30 ` [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link() Bjorn Helgaas
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-26 16:29 UTC (permalink / raw)
To: Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
From: Joao Pinto <Joao.Pinto@synopsys.com>
Add PCI support to ARC and update drivers/pci Makefile enabling the ARC
arch to use the generic PCI setup functions.
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
---
arch/arc/Kconfig | 26 ++++++++++++++++++++++++++
arch/arc/include/asm/dma.h | 5 +++++
arch/arc/include/asm/io.h | 9 +++++++++
arch/arc/include/asm/pci.h | 31 +++++++++++++++++++++++++++++++
arch/arc/kernel/Makefile | 1 +
arch/arc/kernel/pcibios.c | 22 ++++++++++++++++++++++
arch/arc/plat-axs10x/Kconfig | 1 +
drivers/pci/Makefile | 1 +
8 files changed, 96 insertions(+)
create mode 100644 arch/arc/include/asm/pci.h
create mode 100644 arch/arc/kernel/pcibios.c
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 76dde9d..f9e3b357 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -19,6 +19,7 @@ config ARC
select GENERIC_FIND_FIRST_BIT
# for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP
select GENERIC_IRQ_SHOW
+ select GENERIC_PCI_IOMAP
select GENERIC_PENDING_IRQ if SMP
select GENERIC_SMP_IDLE_THREAD
select HAVE_ARCH_KGDB
@@ -39,6 +40,9 @@ config ARC
select PERF_USE_VMALLOC
select HAVE_DEBUG_STACKOVERFLOW
+config MIGHT_HAVE_PCI
+ bool
+
config TRACE_IRQFLAGS_SUPPORT
def_bool y
@@ -568,6 +572,28 @@ endmenu # "ARC Architecture Configuration"
source "mm/Kconfig"
source "net/Kconfig"
source "drivers/Kconfig"
+
+menu "Bus Support"
+
+config PCI
+ bool "PCI support" if MIGHT_HAVE_PCI
+ help
+ PCI is the name of a bus system, i.e., the way the CPU talks to
+ the other stuff inside your box. Find out if your board/platform
+ has PCI.
+
+ Note: PCIe support for Synopsys Device will be available only
+ when HAPS DX is configured with PCIe RC bitmap. If you have PCI,
+ say Y, otherwise N.
+
+config PCI_SYSCALL
+ def_bool PCI
+
+source "drivers/pci/Kconfig"
+source "drivers/pci/pcie/Kconfig"
+
+endmenu
+
source "fs/Kconfig"
source "arch/arc/Kconfig.debug"
source "security/Kconfig"
diff --git a/arch/arc/include/asm/dma.h b/arch/arc/include/asm/dma.h
index ca7c451..01e47a6 100644
--- a/arch/arc/include/asm/dma.h
+++ b/arch/arc/include/asm/dma.h
@@ -10,5 +10,10 @@
#define ASM_ARC_DMA_H
#define MAX_DMA_ADDRESS 0xC0000000
+#ifdef CONFIG_PCI
+extern int isa_dma_bridge_buggy;
+#else
+#define isa_dma_bridge_buggy 0
+#endif
#endif
diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h
index 694ece8..947bf0c 100644
--- a/arch/arc/include/asm/io.h
+++ b/arch/arc/include/asm/io.h
@@ -16,6 +16,15 @@
extern void __iomem *ioremap(unsigned long physaddr, unsigned long size);
extern void __iomem *ioremap_prot(phys_addr_t offset, unsigned long size,
unsigned long flags);
+static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+ return (void __iomem *)port;
+}
+
+static inline void ioport_unmap(void __iomem *addr)
+{
+}
+
extern void iounmap(const void __iomem *addr);
#define ioremap_nocache(phy, sz) ioremap(phy, sz)
diff --git a/arch/arc/include/asm/pci.h b/arch/arc/include/asm/pci.h
new file mode 100644
index 0000000..2f2011c
--- /dev/null
+++ b/arch/arc/include/asm/pci.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _ASM_ARC_PCI_H
+#define _ASM_ARC_PCI_H
+
+#ifdef __KERNEL__
+#include <asm-generic/pci-dma-compat.h>
+#include <asm-generic/pci-bridge.h>
+
+#include <linux/ioport.h>
+
+#define PCIBIOS_MIN_IO 0x100
+#define PCIBIOS_MIN_MEM 0x100000
+
+#define pcibios_assign_all_busses() 1
+/*
+ * The PCI address space does equal the physical memory address space.
+ * The networking and block device layers use this boolean for bounce
+ * buffer decisions.
+ */
+#define PCI_DMA_BUS_IS_PHYS 1
+
+#endif /* __KERNEL__ */
+
+#endif /* _ASM_ARC_PCI_H */
diff --git a/arch/arc/kernel/Makefile b/arch/arc/kernel/Makefile
index e7f3625..1bc2036 100644
--- a/arch/arc/kernel/Makefile
+++ b/arch/arc/kernel/Makefile
@@ -12,6 +12,7 @@ obj-y := arcksyms.o setup.o irq.o time.o reset.o ptrace.o process.o devtree.o
obj-y += signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o clk.o
obj-$(CONFIG_ISA_ARCOMPACT) += entry-compact.o intc-compact.o
obj-$(CONFIG_ISA_ARCV2) += entry-arcv2.o intc-arcv2.o
+obj-$(CONFIG_PCI) += pcibios.o
obj-$(CONFIG_MODULES) += arcksyms.o module.o
obj-$(CONFIG_SMP) += smp.o
diff --git a/arch/arc/kernel/pcibios.c b/arch/arc/kernel/pcibios.c
new file mode 100644
index 0000000..72e1d73
--- /dev/null
+++ b/arch/arc/kernel/pcibios.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2014-2015 Synopsys, Inc. (www.synopsys.com)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/pci.h>
+
+/*
+ * We don't have to worry about legacy ISA devices, so nothing to do here
+ */
+resource_size_t pcibios_align_resource(void *data, const struct resource *res,
+ resource_size_t size, resource_size_t align)
+{
+ return res->start;
+}
+
+void pcibios_fixup_bus(struct pci_bus *bus)
+{
+}
diff --git a/arch/arc/plat-axs10x/Kconfig b/arch/arc/plat-axs10x/Kconfig
index d475f9d..426ac4b 100644
--- a/arch/arc/plat-axs10x/Kconfig
+++ b/arch/arc/plat-axs10x/Kconfig
@@ -11,6 +11,7 @@ menuconfig ARC_PLAT_AXS10X
select DW_APB_ICTL
select GPIO_DWAPB
select OF_GPIO
+ select MIGHT_HAVE_PCI
select GENERIC_IRQ_CHIP
select ARCH_REQUIRE_GPIOLIB
help
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index be3f631..2154092 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_PCI_IOV) += iov.o
# Some architectures use the generic PCI setup functions
#
obj-$(CONFIG_ALPHA) += setup-irq.o
+obj-$(CONFIG_ARC) += setup-irq.o
obj-$(CONFIG_ARM) += setup-irq.o
obj-$(CONFIG_ARM64) += setup-irq.o
obj-$(CONFIG_UNICORE32) += setup-irq.o
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link()
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
2016-02-26 16:29 ` [PATCH v11 1/4] " Bjorn Helgaas
@ 2016-02-26 16:30 ` Bjorn Helgaas
2016-02-26 17:24 ` Pratyush Anand
2016-02-26 16:30 ` [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override Bjorn Helgaas
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-26 16:30 UTC (permalink / raw)
To: Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
From: Joao Pinto <Joao.Pinto@synopsys.com>
Several DesignWare-based drivers (dra7xx, exynos, imx6, keystone, qcom, and
spear13xx) had similar loops waiting for the link to come up.
Add a generic dw_pcie_wait_for_link() for use by all these drivers so the
waiting is done consistently, e.g., always using usleep_range() rather than
mdelay() and using similar timeouts and retry counts.
Note that this changes the Keystone link training/wait for link strategy,
so we initiate link training, then wait longer for the link to come up
before re-initiating link training.
[bhelgaas: changelog, split into its own patch, update pci-keystone.c, pcie-qcom.c]
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-dra7xx.c | 11 +----------
drivers/pci/host/pci-exynos.c | 13 +++----------
drivers/pci/host/pci-imx6.c | 13 ++++---------
drivers/pci/host/pci-keystone.c | 10 ++++------
drivers/pci/host/pcie-designware.c | 19 +++++++++++++++++++
drivers/pci/host/pcie-designware.h | 6 ++++++
drivers/pci/host/pcie-qcom.c | 10 +---------
drivers/pci/host/pcie-spear13xx.c | 14 +-------------
8 files changed, 39 insertions(+), 57 deletions(-)
diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index 923607b..2ca3a1f 100644
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/delay.h>
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
@@ -108,7 +107,6 @@ static int dra7xx_pcie_establish_link(struct pcie_port *pp)
{
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);
u32 reg;
- unsigned int retries;
if (dw_pcie_link_up(pp)) {
dev_err(pp->dev, "link is already up\n");
@@ -119,14 +117,7 @@ static int dra7xx_pcie_establish_link(struct pcie_port *pp)
reg |= LTSSM_EN;
dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD, reg);
- for (retries = 0; retries < 1000; retries++) {
- if (dw_pcie_link_up(pp))
- return 0;
- usleep_range(10, 20);
- }
-
- dev_err(pp->dev, "link is not up\n");
- return -EINVAL;
+ return dw_pcie_wait_for_link(pp);
}
static void dra7xx_pcie_enable_interrupts(struct pcie_port *pp)
diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
index d997d22..2199761 100644
--- a/drivers/pci/host/pci-exynos.c
+++ b/drivers/pci/host/pci-exynos.c
@@ -318,7 +318,6 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
{
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
u32 val;
- unsigned int retries;
if (dw_pcie_link_up(pp)) {
dev_err(pp->dev, "Link already up\n");
@@ -357,13 +356,8 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
PCIE_APP_LTSSM_ENABLE);
/* check if the link is up or not */
- for (retries = 0; retries < 10; retries++) {
- if (dw_pcie_link_up(pp)) {
- dev_info(pp->dev, "Link up\n");
- return 0;
- }
- mdelay(100);
- }
+ if (!dw_pcie_wait_for_link(pp))
+ return 0;
while (exynos_phy_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED) == 0) {
val = exynos_blk_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED);
@@ -372,8 +366,7 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
/* power off phy */
exynos_pcie_power_off_phy(pp);
- dev_err(pp->dev, "PCIe Link Fail\n");
- return -EINVAL;
+ return -ETIMEDOUT;
}
static void exynos_pcie_clear_irq_pulse(struct pcie_port *pp)
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index fe60096..6c35d86 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -330,19 +330,14 @@ static void imx6_pcie_init_phy(struct pcie_port *pp)
static int imx6_pcie_wait_for_link(struct pcie_port *pp)
{
- unsigned int retries;
-
- for (retries = 0; retries < 200; retries++) {
- if (dw_pcie_link_up(pp))
- return 0;
- usleep_range(100, 1000);
- }
+ /* check if the link is up or not */
+ if (!dw_pcie_wait_for_link(pp))
+ return 0;
- dev_err(pp->dev, "phy link never came up\n");
dev_dbg(pp->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
readl(pp->dbi_base + PCIE_PHY_DEBUG_R0),
readl(pp->dbi_base + PCIE_PHY_DEBUG_R1));
- return -EINVAL;
+ return -ETIMEDOUT;
}
static int imx6_pcie_wait_for_speed_change(struct pcie_port *pp)
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 0aa81bd..9a91487 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -97,17 +97,15 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)
return 0;
}
- ks_dw_pcie_initiate_link_train(ks_pcie);
/* check if the link is up or not */
- for (retries = 0; retries < 200; retries++) {
- if (dw_pcie_link_up(pp))
- return 0;
- usleep_range(100, 1000);
+ for (retries = 0; retries < 5; retries++) {
ks_dw_pcie_initiate_link_train(ks_pcie);
+ if (!dw_pcie_wait_for_link(pp))
+ return 0;
}
dev_err(pp->dev, "phy link never came up\n");
- return -EINVAL;
+ return -ETIMEDOUT;
}
static void ks_pcie_msi_irq_handler(struct irq_desc *desc)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 2171682..1fd3ad3 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -22,6 +22,7 @@
#include <linux/pci_regs.h>
#include <linux/platform_device.h>
#include <linux/types.h>
+#include <linux/delay.h>
#include "pcie-designware.h"
@@ -380,6 +381,24 @@ static struct msi_controller dw_pcie_msi_chip = {
.teardown_irq = dw_msi_teardown_irq,
};
+int dw_pcie_wait_for_link(struct pcie_port *pp)
+{
+ int retries;
+
+ /* check if the link is up or not */
+ for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {
+ if (dw_pcie_link_up(pp)) {
+ dev_info(pp->dev, "link up\n");
+ return 0;
+ }
+ usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);
+ }
+
+ dev_err(pp->dev, "phy link never came up\n");
+
+ return -ETIMEDOUT;
+}
+
int dw_pcie_link_up(struct pcie_port *pp)
{
if (pp->ops->link_up)
diff --git a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h
index 2356d29..f437f9b 100644
--- a/drivers/pci/host/pcie-designware.h
+++ b/drivers/pci/host/pcie-designware.h
@@ -22,6 +22,11 @@
#define MAX_MSI_IRQS 32
#define MAX_MSI_CTRLS (MAX_MSI_IRQS / 32)
+/* Parameters for the waiting for link up routine */
+#define LINK_WAIT_MAX_RETRIES 10
+#define LINK_WAIT_USLEEP_MIN 90000
+#define LINK_WAIT_USLEEP_MAX 100000
+
struct pcie_port {
struct device *dev;
u8 root_bus_nr;
@@ -76,6 +81,7 @@ int dw_pcie_cfg_read(void __iomem *addr, int size, u32 *val);
int dw_pcie_cfg_write(void __iomem *addr, int size, u32 val);
irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
void dw_pcie_msi_init(struct pcie_port *pp);
+int dw_pcie_wait_for_link(struct pcie_port *pp);
int dw_pcie_link_up(struct pcie_port *pp);
void dw_pcie_setup_rc(struct pcie_port *pp);
int dw_pcie_host_init(struct pcie_port *pp);
diff --git a/drivers/pci/host/pcie-qcom.c b/drivers/pci/host/pcie-qcom.c
index e845fba..ec4ef54 100644
--- a/drivers/pci/host/pcie-qcom.c
+++ b/drivers/pci/host/pcie-qcom.c
@@ -128,15 +128,7 @@ static int qcom_pcie_establish_link(struct qcom_pcie *pcie)
val |= PCIE20_ELBI_SYS_CTRL_LT_ENABLE;
writel(val, pcie->elbi + PCIE20_ELBI_SYS_CTRL);
- do {
- if (dw_pcie_link_up(&pcie->pp))
- return 0;
- usleep_range(250, 1000);
- } while (retries < 200);
-
- dev_warn(dev, "phy link never came up\n");
-
- return -ETIMEDOUT;
+ return dw_pcie_wait_for_link(pp);
}
static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
diff --git a/drivers/pci/host/pcie-spear13xx.c b/drivers/pci/host/pcie-spear13xx.c
index a6cd823..a4060b8 100644
--- a/drivers/pci/host/pcie-spear13xx.c
+++ b/drivers/pci/host/pcie-spear13xx.c
@@ -13,7 +13,6 @@
*/
#include <linux/clk.h>
-#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -149,7 +148,6 @@ static int spear13xx_pcie_establish_link(struct pcie_port *pp)
struct spear13xx_pcie *spear13xx_pcie = to_spear13xx_pcie(pp);
struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;
u32 exp_cap_off = EXP_CAP_ID_OFFSET;
- unsigned int retries;
if (dw_pcie_link_up(pp)) {
dev_err(pp->dev, "link already up\n");
@@ -200,17 +198,7 @@ static int spear13xx_pcie_establish_link(struct pcie_port *pp)
| ((u32)1 << REG_TRANSLATION_ENABLE),
&app_reg->app_ctrl_0);
- /* check if the link is up or not */
- for (retries = 0; retries < 10; retries++) {
- if (dw_pcie_link_up(pp)) {
- dev_info(pp->dev, "link up\n");
- return 0;
- }
- mdelay(100);
- }
-
- dev_err(pp->dev, "link Fail\n");
- return -EINVAL;
+ return dw_pcie_wait_for_link(pp);
}
static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
2016-02-26 16:29 ` [PATCH v11 1/4] " Bjorn Helgaas
2016-02-26 16:30 ` [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link() Bjorn Helgaas
@ 2016-02-26 16:30 ` Bjorn Helgaas
2016-02-26 17:29 ` Pratyush Anand
2016-02-26 16:30 ` [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP Bjorn Helgaas
2016-02-29 18:30 ` [PATCH v11 0/4] ARC: Add PCI support Joao Pinto
4 siblings, 1 reply; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-26 16:30 UTC (permalink / raw)
To: Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
From: Joao Pinto <Joao.Pinto@synopsys.com>
Add a default DesignWare "link_up" test for use when a sub-driver doesn't
supply its own pcie_host_ops.link_up() method.
[bhelgaas: changelog, split into its own patch]
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-designware.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 1fd3ad3..fb1c16f7 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -70,6 +70,11 @@
#define PCIE_ATU_FUNC(x) (((x) & 0x7) << 16)
#define PCIE_ATU_UPPER_TARGET 0x91C
+/* PCIe Port Logic registers */
+#define PLR_OFFSET 0x700
+#define PCIE_PHY_DEBUG_R1 (PLR_OFFSET + 0x2c)
+#define PCIE_PHY_DEBUG_R1_LINK_UP 0x00000010
+
static struct pci_ops dw_pcie_ops;
int dw_pcie_cfg_read(void __iomem *addr, int size, u32 *val)
@@ -401,10 +406,13 @@ int dw_pcie_wait_for_link(struct pcie_port *pp)
int dw_pcie_link_up(struct pcie_port *pp)
{
+ u32 val;
+
if (pp->ops->link_up)
return pp->ops->link_up(pp);
- return 0;
+ val = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1);
+ return val & PCIE_PHY_DEBUG_R1_LINK_UP;
}
static int dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq,
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
` (2 preceding siblings ...)
2016-02-26 16:30 ` [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override Bjorn Helgaas
@ 2016-02-26 16:30 ` Bjorn Helgaas
2016-02-26 17:35 ` Pratyush Anand
2016-02-29 18:30 ` [PATCH v11 0/4] ARC: Add PCI support Joao Pinto
4 siblings, 1 reply; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-26 16:30 UTC (permalink / raw)
To: Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
From: Joao Pinto <Joao.Pinto@synopsys.com>
Add a reference platform driver for PCI RC IP Protoyping Kits based on the
ARC SDP.
[bhelgaas: changelog, split patch up, MAINTAINERS update]
Signed-off-by: Joao Pinto <jpinto@synopsys.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
.../devicetree/bindings/pci/designware-pcie.txt | 17 ++
MAINTAINERS | 7 +
drivers/pci/host/Kconfig | 11 ++
drivers/pci/host/Makefile | 1
drivers/pci/host/pcie-designware-plat.c | 138 ++++++++++++++++++++
5 files changed, 174 insertions(+)
create mode 100644 drivers/pci/host/pcie-designware-plat.c
diff --git a/Documentation/devicetree/bindings/pci/designware-pcie.txt b/Documentation/devicetree/bindings/pci/designware-pcie.txt
index 5b0853d..64f2fff 100644
--- a/Documentation/devicetree/bindings/pci/designware-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/designware-pcie.txt
@@ -28,3 +28,20 @@ Optional properties:
- clock-names: Must include the following entries:
- "pcie"
- "pcie_bus"
+
+Example configuration:
+
+ pcie: pcie@0xdffff000 {
+ compatible = "snps,dw-pcie";
+ reg = <0xdffff000 0x1000>, /* Controller registers */
+ <0xd0000000 0x2000>; /* PCI config space */
+ reg-names = "ctrlreg", "config";
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ ranges = <0x81000000 0 0x00000000 0xde000000 0 0x00010000
+ 0x82000000 0 0xd0400000 0xd0400000 0 0x0d000000>;
+ interrupts = <25>, <24>;
+ #interrupt-cells = <1>;
+ num-lanes = <1>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 30aca4a..e6c327b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8367,6 +8367,13 @@ L: linux-pci@vger.kernel.org
S: Maintained
F: drivers/pci/host/*designware*
+PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
+M: Joao Pinto <jpinto@synopsys.com>
+L: linux-pci@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/pci/designware-pcie.txt
+F: drivers/pci/host/pcie-designware-plat.c
+
PCI DRIVER FOR GENERIC OF HOSTS
M: Will Deacon <will.deacon@arm.com>
L: linux-pci@vger.kernel.org
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 75a6054..7c47d69 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -16,6 +16,17 @@ config PCI_MVEBU
depends on ARCH_MVEBU || ARCH_DOVE
depends on OF
+config PCIE_DW_PLAT
+ bool "Platform bus based DesignWare PCIe Controller"
+ select PCIE_DW
+ ---help---
+ This selects the DesignWare PCIe controller support. Select this if
+ you have a PCIe controller on Platform bus.
+
+ If you have a controller with this interface, say Y or M here.
+
+ If unsure, say N.
+
config PCIE_DW
bool
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
index 7b2f20c..7136a1e 100644
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@ -1,4 +1,5 @@
obj-$(CONFIG_PCIE_DW) += pcie-designware.o
+obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o
obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o
obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
diff --git a/drivers/pci/host/pcie-designware-plat.c b/drivers/pci/host/pcie-designware-plat.c
new file mode 100644
index 0000000..b350099
--- /dev/null
+++ b/drivers/pci/host/pcie-designware-plat.c
@@ -0,0 +1,138 @@
+/*
+ * PCIe RC driver for Synopsys DesignWare Core
+ *
+ * Copyright (C) 2015-2016 Synopsys, Inc. (www.synopsys.com)
+ *
+ * Authors: Joao Pinto <jpinto@synopsys.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/resource.h>
+#include <linux/signal.h>
+#include <linux/types.h>
+
+#include "pcie-designware.h"
+
+struct dw_plat_pcie {
+ void __iomem *mem_base;
+ struct pcie_port pp;
+};
+
+static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg)
+{
+ struct pcie_port *pp = arg;
+
+ return dw_handle_msi_irq(pp);
+}
+
+static void dw_plat_pcie_host_init(struct pcie_port *pp)
+{
+ dw_pcie_setup_rc(pp);
+ dw_pcie_wait_for_link(pp);
+
+ if (IS_ENABLED(CONFIG_PCI_MSI))
+ dw_pcie_msi_init(pp);
+}
+
+static struct pcie_host_ops dw_plat_pcie_host_ops = {
+ .host_init = dw_plat_pcie_host_init,
+};
+
+static int dw_plat_add_pcie_port(struct pcie_port *pp,
+ struct platform_device *pdev)
+{
+ int ret;
+
+ pp->irq = platform_get_irq(pdev, 1);
+ if (pp->irq < 0)
+ return pp->irq;
+
+ if (IS_ENABLED(CONFIG_PCI_MSI)) {
+ pp->msi_irq = platform_get_irq(pdev, 0);
+ if (pp->msi_irq < 0)
+ return pp->msi_irq;
+
+ ret = devm_request_irq(&pdev->dev, pp->msi_irq,
+ dw_plat_pcie_msi_irq_handler,
+ IRQF_SHARED, "dw-plat-pcie-msi", pp);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to request MSI IRQ\n");
+ return ret;
+ }
+ }
+
+ pp->root_bus_nr = -1;
+ pp->ops = &dw_plat_pcie_host_ops;
+
+ ret = dw_pcie_host_init(pp);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to initialize host\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static int dw_plat_pcie_probe(struct platform_device *pdev)
+{
+ struct dw_plat_pcie *dw_plat_pcie;
+ struct pcie_port *pp;
+ struct resource *res; /* Resource from DT */
+ int ret;
+
+ dw_plat_pcie = devm_kzalloc(&pdev->dev, sizeof(*dw_plat_pcie),
+ GFP_KERNEL);
+ if (!dw_plat_pcie)
+ return -ENOMEM;
+
+ pp = &dw_plat_pcie->pp;
+ pp->dev = &pdev->dev;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ dw_plat_pcie->mem_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(dw_plat_pcie->mem_base))
+ return PTR_ERR(dw_plat_pcie->mem_base);
+
+ pp->dbi_base = dw_plat_pcie->mem_base;
+
+ ret = dw_plat_add_pcie_port(pp, pdev);
+ if (ret < 0)
+ return ret;
+
+ platform_set_drvdata(pdev, dw_plat_pcie);
+ return 0;
+}
+
+static const struct of_device_id dw_plat_pcie_of_match[] = {
+ { .compatible = "snps,dw-pcie", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, dw_plat_pcie_of_match);
+
+static struct platform_driver dw_plat_pcie_driver = {
+ .driver = {
+ .name = "dw-pcie",
+ .of_match_table = dw_plat_pcie_of_match,
+ },
+ .probe = dw_plat_pcie_probe,
+};
+
+module_platform_driver(dw_plat_pcie_driver);
+
+MODULE_AUTHOR("Joao Pinto <Joao.Pinto@synopsys.com>");
+MODULE_DESCRIPTION("Synopsys PCIe host controller glue platform driver");
+MODULE_LICENSE("GPL v2");
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link()
2016-02-26 16:30 ` [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link() Bjorn Helgaas
@ 2016-02-26 17:24 ` Pratyush Anand
0 siblings, 0 replies; 11+ messages in thread
From: Pratyush Anand @ 2016-02-26 17:24 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Joao Pinto, Mark Rutland, Alexey.Brodkin, Arnd Bergmann,
Pawel Moll, Ian Campbell, linux-pci, Vineet.Gupta1, linux-kernel,
Carlos Palminha, Rob Herring, Murali Karicheri, Kumar Gala,
Jingoo Han, linux-snps-arc
On Fri, Feb 26, 2016 at 10:00 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> From: Joao Pinto <Joao.Pinto@synopsys.com>
>
> Several DesignWare-based drivers (dra7xx, exynos, imx6, keystone, qcom, and
> spear13xx) had similar loops waiting for the link to come up.
>
> Add a generic dw_pcie_wait_for_link() for use by all these drivers so the
> waiting is done consistently, e.g., always using usleep_range() rather than
> mdelay() and using similar timeouts and retry counts.
>
> Note that this changes the Keystone link training/wait for link strategy,
> so we initiate link training, then wait longer for the link to come up
> before re-initiating link training.
>
> [bhelgaas: changelog, split into its own patch, update pci-keystone.c, pcie-qcom.c]
> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
5 retries should be sufficient for keystone, still it would be good to
have a tested-by for it.
Other than that code seems fine to me.
Acked-by: Pratyush Anand <pratyush.anand@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override
2016-02-26 16:30 ` [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override Bjorn Helgaas
@ 2016-02-26 17:29 ` Pratyush Anand
0 siblings, 0 replies; 11+ messages in thread
From: Pratyush Anand @ 2016-02-26 17:29 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Joao Pinto, Mark Rutland, Alexey.Brodkin, Arnd Bergmann,
Pawel Moll, Ian Campbell, linux-pci, Vineet.Gupta1, linux-kernel,
Carlos Palminha, Rob Herring, Murali Karicheri, Kumar Gala,
Jingoo Han, linux-snps-arc
On Fri, Feb 26, 2016 at 10:00 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> From: Joao Pinto <Joao.Pinto@synopsys.com>
>
> Add a default DesignWare "link_up" test for use when a sub-driver doesn't
> supply its own pcie_host_ops.link_up() method.
>
> [bhelgaas: changelog, split into its own patch]
> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
No harm to existing platform, so
Acked-by: Pratyush Anand <pratyush.anand@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP
2016-02-26 16:30 ` [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP Bjorn Helgaas
@ 2016-02-26 17:35 ` Pratyush Anand
0 siblings, 0 replies; 11+ messages in thread
From: Pratyush Anand @ 2016-02-26 17:35 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Joao Pinto, Mark Rutland, Alexey.Brodkin, Arnd Bergmann,
Pawel Moll, Ian Campbell, linux-pci, Vineet.Gupta1, linux-kernel,
Carlos Palminha, Rob Herring, Murali Karicheri, Kumar Gala,
Jingoo Han, linux-snps-arc
On Fri, Feb 26, 2016 at 10:00 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> From: Joao Pinto <Joao.Pinto@synopsys.com>
>
> Add a reference platform driver for PCI RC IP Protoyping Kits based on the
> ARC SDP.
>
> [bhelgaas: changelog, split patch up, MAINTAINERS update]
> Signed-off-by: Joao Pinto <jpinto@synopsys.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Pratyush Anand <pratyush.anand@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH v11 0/4] ARC: Add PCI support
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
` (3 preceding siblings ...)
2016-02-26 16:30 ` [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP Bjorn Helgaas
@ 2016-02-29 18:30 ` Joao Pinto
2016-02-29 19:22 ` Bjorn Helgaas
4 siblings, 1 reply; 11+ messages in thread
From: Joao Pinto @ 2016-02-29 18:30 UTC (permalink / raw)
To: Bjorn Helgaas, Joao Pinto
Cc: mark.rutland, Alexey.Brodkin, arnd, pawel.moll, ijc+devicetree,
linux-pci, Vineet.Gupta1, Pratyush Anand, linux-kernel,
CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak, Jingoo Han,
linux-snps-arc
Hi Bjorn!
Is it possible to pull this patch set into 4.5?
Thanks
-----Original Message-----
From: linux-pci-owner@vger.kernel.org [mailto:linux-pci-owner@vger.kernel.org] On Behalf Of Bjorn Helgaas
Sent: Friday, February 26, 2016 4:30 PM
To: Joao Pinto
Cc: mark.rutland@arm.com; Alexey.Brodkin@synopsys.com; arnd@arndb.de; pawel.moll@arm.com; ijc+devicetree@hellion.org.uk; linux-pci@vger.kernel.org; Vineet.Gupta1@synopsys.com; Pratyush Anand; linux-kernel@vger.kernel.org; CARLOS.PALMINHA@synopsys.com; robh+dt@kernel.org; Murali Karicheri; galak@codeaurora.org; Jingoo Han; linux-snps-arc@lists.infradead.org
Subject: [PATCH v11 0/4] ARC: Add PCI support
>From Joao's v9 posting
(http://lkml.kernel.org/r/cover.1454952698.git.jpinto@synopsys.com):
"This patch set has the goal to add suppport for DesignWare PCIe RC in ARC
AXS10x. It includes the necessary tweaks to:
- the ARC architecture (PCI support)
- the PCI subsystem (ARC CPU support)
- to pcie-designware (Centralisation of wait for link routine)
- to dra7xx, exynos, imx6 and spear13xx drivers to use the centralised
code for link wait
A simple module was (pcie-designware-plat) was created to contain the
specific platform init code."
Changes from v10:
- Update keystone link establishment to wait longer for link to come up
before re-initiating link training
- Also use generic dw_pcie_wait_for_link() in keystone and qcom drivers
I would still like acks from DesignWare maintainers (Jingoo or Pratyush), from Murali for the Keystone changes, and from Arnd for the DT updates.
This series is in my pci/host-synopsys branch here:
https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/host-syn
opsys
---
Joao Pinto (4):
ARC: Add PCI support
PCI: designware: Add generic dw_pcie_wait_for_link()
PCI: designware: Add default link up check if sub-driver doesn't override
PCI: designware: Add driver for prototyping kits based on ARC SDP
.../devicetree/bindings/pci/designware-pcie.txt | 17 ++
MAINTAINERS | 7 +
arch/arc/Kconfig | 26 ++++
arch/arc/include/asm/dma.h | 5 +
arch/arc/include/asm/io.h | 9 +
arch/arc/include/asm/pci.h | 31 ++++
arch/arc/kernel/Makefile | 1
arch/arc/kernel/pcibios.c | 22 +++
arch/arc/plat-axs10x/Kconfig | 1
drivers/pci/Makefile | 1
drivers/pci/host/Kconfig | 11 ++
drivers/pci/host/Makefile | 1
drivers/pci/host/pci-dra7xx.c | 11 --
drivers/pci/host/pci-exynos.c | 13 --
drivers/pci/host/pci-imx6.c | 13 +-
drivers/pci/host/pci-keystone.c | 10 +
drivers/pci/host/pcie-designware-plat.c | 138 ++++++++++++++++++++
drivers/pci/host/pcie-designware.c | 29 ++++
drivers/pci/host/pcie-designware.h | 6 +
drivers/pci/host/pcie-qcom.c | 10 -
drivers/pci/host/pcie-spear13xx.c | 14 --
21 files changed, 318 insertions(+), 58 deletions(-) create mode 100644 arch/arc/include/asm/pci.h create mode 100644 arch/arc/kernel/pcibios.c create mode 100644 drivers/pci/host/pcie-designware-plat.c
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v11 0/4] ARC: Add PCI support
2016-02-29 18:30 ` [PATCH v11 0/4] ARC: Add PCI support Joao Pinto
@ 2016-02-29 19:22 ` Bjorn Helgaas
2016-03-01 10:57 ` Joao Pinto
0 siblings, 1 reply; 11+ messages in thread
From: Bjorn Helgaas @ 2016-02-29 19:22 UTC (permalink / raw)
To: Joao Pinto
Cc: Bjorn Helgaas, mark.rutland, Alexey.Brodkin, arnd, pawel.moll,
ijc+devicetree, linux-pci, Vineet.Gupta1, Pratyush Anand,
linux-kernel, CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak,
Jingoo Han, linux-snps-arc
On Mon, Feb 29, 2016 at 06:30:52PM +0000, Joao Pinto wrote:
> Hi Bjorn!
>
> Is it possible to pull this patch set into 4.5?
No, it's a little late for v4.5. We're already at v4.5-rc6, so it's
only critical bug fixes until the v4.6 merge window opens.
Bjorn
> -----Original Message-----
> From: linux-pci-owner@vger.kernel.org [mailto:linux-pci-owner@vger.kernel.org] On Behalf Of Bjorn Helgaas
> Sent: Friday, February 26, 2016 4:30 PM
> To: Joao Pinto
> Cc: mark.rutland@arm.com; Alexey.Brodkin@synopsys.com; arnd@arndb.de; pawel.moll@arm.com; ijc+devicetree@hellion.org.uk; linux-pci@vger.kernel.org; Vineet.Gupta1@synopsys.com; Pratyush Anand; linux-kernel@vger.kernel.org; CARLOS.PALMINHA@synopsys.com; robh+dt@kernel.org; Murali Karicheri; galak@codeaurora.org; Jingoo Han; linux-snps-arc@lists.infradead.org
> Subject: [PATCH v11 0/4] ARC: Add PCI support
>
> >From Joao's v9 posting
> (http://lkml.kernel.org/r/cover.1454952698.git.jpinto@synopsys.com):
>
> "This patch set has the goal to add suppport for DesignWare PCIe RC in ARC
> AXS10x. It includes the necessary tweaks to:
>
> - the ARC architecture (PCI support)
> - the PCI subsystem (ARC CPU support)
> - to pcie-designware (Centralisation of wait for link routine)
> - to dra7xx, exynos, imx6 and spear13xx drivers to use the centralised
> code for link wait
>
> A simple module was (pcie-designware-plat) was created to contain the
> specific platform init code."
>
> Changes from v10:
> - Update keystone link establishment to wait longer for link to come up
> before re-initiating link training
> - Also use generic dw_pcie_wait_for_link() in keystone and qcom drivers
>
> I would still like acks from DesignWare maintainers (Jingoo or Pratyush), from Murali for the Keystone changes, and from Arnd for the DT updates.
>
> This series is in my pci/host-synopsys branch here:
> https://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/host-syn
> opsys
> ---
>
> Joao Pinto (4):
> ARC: Add PCI support
> PCI: designware: Add generic dw_pcie_wait_for_link()
> PCI: designware: Add default link up check if sub-driver doesn't override
> PCI: designware: Add driver for prototyping kits based on ARC SDP
>
>
> .../devicetree/bindings/pci/designware-pcie.txt | 17 ++
> MAINTAINERS | 7 +
> arch/arc/Kconfig | 26 ++++
> arch/arc/include/asm/dma.h | 5 +
> arch/arc/include/asm/io.h | 9 +
> arch/arc/include/asm/pci.h | 31 ++++
> arch/arc/kernel/Makefile | 1
> arch/arc/kernel/pcibios.c | 22 +++
> arch/arc/plat-axs10x/Kconfig | 1
> drivers/pci/Makefile | 1
> drivers/pci/host/Kconfig | 11 ++
> drivers/pci/host/Makefile | 1
> drivers/pci/host/pci-dra7xx.c | 11 --
> drivers/pci/host/pci-exynos.c | 13 --
> drivers/pci/host/pci-imx6.c | 13 +-
> drivers/pci/host/pci-keystone.c | 10 +
> drivers/pci/host/pcie-designware-plat.c | 138 ++++++++++++++++++++
> drivers/pci/host/pcie-designware.c | 29 ++++
> drivers/pci/host/pcie-designware.h | 6 +
> drivers/pci/host/pcie-qcom.c | 10 -
> drivers/pci/host/pcie-spear13xx.c | 14 --
> 21 files changed, 318 insertions(+), 58 deletions(-) create mode 100644 arch/arc/include/asm/pci.h create mode 100644 arch/arc/kernel/pcibios.c create mode 100644 drivers/pci/host/pcie-designware-plat.c
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v11 0/4] ARC: Add PCI support
2016-02-29 19:22 ` Bjorn Helgaas
@ 2016-03-01 10:57 ` Joao Pinto
0 siblings, 0 replies; 11+ messages in thread
From: Joao Pinto @ 2016-03-01 10:57 UTC (permalink / raw)
To: Bjorn Helgaas, Joao Pinto
Cc: Bjorn Helgaas, mark.rutland, Alexey.Brodkin, arnd, pawel.moll,
ijc+devicetree, linux-pci, Vineet.Gupta1, Pratyush Anand,
linux-kernel, CARLOS.PALMINHA, robh+dt, Murali Karicheri, galak,
Jingoo Han, linux-snps-arc
Hi!
On 2/29/2016 7:22 PM, Bjorn Helgaas wrote:
> On Mon, Feb 29, 2016 at 06:30:52PM +0000, Joao Pinto wrote:
>> Hi Bjorn!
>>
>> Is it possible to pull this patch set into 4.5?
>
> No, it's a little late for v4.5. We're already at v4.5-rc6, so it's
> only critical bug fixes until the v4.6 merge window opens.
Ok, makes sense!
>
> Bjorn
>
Thanks!
Joao
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-03-01 10:57 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-26 16:29 [PATCH v11 0/4] ARC: Add PCI support Bjorn Helgaas
2016-02-26 16:29 ` [PATCH v11 1/4] " Bjorn Helgaas
2016-02-26 16:30 ` [PATCH v11 2/4] PCI: designware: Add generic dw_pcie_wait_for_link() Bjorn Helgaas
2016-02-26 17:24 ` Pratyush Anand
2016-02-26 16:30 ` [PATCH v11 3/4] PCI: designware: Add default link up check if sub-driver doesn't override Bjorn Helgaas
2016-02-26 17:29 ` Pratyush Anand
2016-02-26 16:30 ` [PATCH v11 4/4] PCI: designware: Add driver for prototyping kits based on ARC SDP Bjorn Helgaas
2016-02-26 17:35 ` Pratyush Anand
2016-02-29 18:30 ` [PATCH v11 0/4] ARC: Add PCI support Joao Pinto
2016-02-29 19:22 ` Bjorn Helgaas
2016-03-01 10:57 ` Joao Pinto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).