* [PATCH v8 1/6] arm: add msi.h to Kbuild
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 2/6] pci: add Altera PCI vendor ID Ley Foon Tan
` (4 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
Include asm-generic/msi.h to support CONFIG_GENERIC_MSI_IRQ_DOMAIN.
This to fix compilation error:
"include/linux/msi.h:123:21: fatal error: asm/msi.h:
No such file or directory"
Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
arch/arm/include/asm/Kbuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index be648eb..bd42530 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -14,6 +14,7 @@ generic-y += local.h
generic-y += local64.h
generic-y += mm-arch-hooks.h
generic-y += msgbuf.h
+generic-y += msi.h
generic-y += param.h
generic-y += parport.h
generic-y += poll.h
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v8 2/6] pci: add Altera PCI vendor ID
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 1/6] arm: add msi.h to Kbuild Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver Ley Foon Tan
` (3 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
include/linux/pci_ids.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index d9ba49c..08e4462 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1550,6 +1550,8 @@
#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
#define PCI_DEVICE_ID_SERVERWORKS_HT1100LD 0x0408
+#define PCI_VENDOR_ID_ALTERA 0x1172
+
#define PCI_VENDOR_ID_SBE 0x1176
#define PCI_DEVICE_ID_SBE_WANXL100 0x0301
#define PCI_DEVICE_ID_SBE_WANXL200 0x0302
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 1/6] arm: add msi.h to Kbuild Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 2/6] pci: add Altera PCI vendor ID Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
2015-10-08 9:47 ` Russell King - ARM Linux
` (2 more replies)
2015-10-08 9:43 ` [PATCH v8 4/6] pci: altera: Add Altera PCIe MSI driver Ley Foon Tan
` (2 subsequent siblings)
5 siblings, 3 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
This patch adds the Altera PCIe host controller driver.
Signed-off-by: Ley Foon Tan <lftan@altera.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/pci/host/Kconfig | 7 +
drivers/pci/host/Makefile | 1 +
drivers/pci/host/pcie-altera.c | 588 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 596 insertions(+)
create mode 100644 drivers/pci/host/pcie-altera.c
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index d5e58ba..08f2543 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -145,4 +145,11 @@ config PCIE_IPROC_BCMA
Say Y here if you want to use the Broadcom iProc PCIe controller
through the BCMA bus interface
+config PCIE_ALTERA
+ bool "Altera PCIe controller"
+ select PCI_DOMAINS
+ help
+ Say Y here if you want to enable PCIe controller support for Altera
+ SoCFPGA family of SoCs.
+
endmenu
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
index 140d66f..6954f76 100644
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_PCI_VERSATILE) += pci-versatile.o
obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o
+obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
new file mode 100644
index 0000000..8554ff9
--- /dev/null
+++ b/drivers/pci/host/pcie-altera.c
@@ -0,0 +1,588 @@
+/*
+ * Copyright Altera Corporation (C) 2013-2015. All rights reserved
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/irqchip/chained_irq.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#define A2P_ADDR_MAP_LO0 0x1000
+#define A2P_ADDR_MAP_HI0 0x1004
+#define RP_TX_REG0 0x2000
+#define RP_TX_REG1 0x2004
+#define RP_TX_CNTRL 0x2008
+#define RP_TX_EOP 0x2
+#define RP_TX_SOP 0x1
+#define RP_RXCPL_STATUS 0x2010
+#define RP_RXCPL_EOP 0x2
+#define RP_RXCPL_SOP 0x1
+#define RP_RXCPL_REG0 0x2014
+#define RP_RXCPL_REG1 0x2018
+#define P2A_INT_STATUS 0x3060
+#define P2A_INT_STS_ALL 0xF
+#define P2A_INT_ENABLE 0x3070
+#define P2A_INT_ENA_ALL 0xF
+#define RP_LTSSM 0x3C64
+#define LTSSM_L0 0xF
+
+/* TLP configuration type 0 and 1 */
+#define TLP_FMTTYPE_CFGRD0 0x04 /* Configuration Read Type 0 */
+#define TLP_FMTTYPE_CFGWR0 0x44 /* Configuration Write Type 0 */
+#define TLP_FMTTYPE_CFGRD1 0x05 /* Configuration Read Type 1 */
+#define TLP_FMTTYPE_CFGWR1 0x45 /* Configuration Write Type 1 */
+#define TLP_PAYLOAD_SIZE 0x01
+#define TLP_READ_TAG 0x1D
+#define TLP_WRITE_TAG 0x10
+#define TLP_CFG_DW0(fmttype) (((fmttype) << 24) | TLP_PAYLOAD_SIZE)
+#define TLP_CFG_DW1(reqid, tag) (((reqid) << 16) | (tag << 8) | 0xF)
+#define TLP_CFG_DW2(bus, devfn, offset) \
+ (((bus) << 24) | ((devfn) << 16) | (offset))
+#define TLP_REQ_ID(bus, devfn) (((bus) << 8) | (devfn))
+#define TLP_COMPL_STATUS(hdr) (((hdr) & 0xE0) >> 13)
+#define TLP_HDR_SIZE 3
+#define TLP_LOOP 500
+
+#define INTX_NUM 4
+
+#define DWORD_MASK 3
+
+struct altera_pcie {
+ struct platform_device *pdev;
+ void __iomem *cra_base;
+ int irq;
+ u8 root_bus_nr;
+ struct irq_domain *irq_domain;
+ struct resource bus_range;
+ struct list_head resources;
+};
+
+struct tlp_rp_regpair_t {
+ u32 ctrl;
+ u32 reg0;
+ u32 reg1;
+};
+
+static void altera_pcie_retrain(struct pci_dev *dev)
+{
+ u16 linkcap, linkstat;
+
+ /*
+ * Set the retrain bit if the PCIe rootport support > 2.5GB/s, but
+ * current speed is 2.5 GB/s.
+ */
+ pcie_capability_read_word(dev, PCI_EXP_LNKCAP, &linkcap);
+
+ if ((linkcap & PCI_EXP_LNKCAP_SLS) <= PCI_EXP_LNKCAP_SLS_2_5GB)
+ return;
+
+ pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &linkstat);
+ if ((linkstat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB)
+ pcie_capability_set_word(dev, PCI_EXP_LNKCTL,
+ PCI_EXP_LNKCTL_RL);
+}
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ALTERA, PCI_ANY_ID, altera_pcie_retrain);
+
+static void altera_pcie_fixup_res(struct pci_dev *dev)
+{
+ /*
+ * Prevent enumeration of root port.
+ */
+ if (!dev->bus->parent && dev->devfn == 0) {
+ int i;
+
+ for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+ dev->resource[i].start = 0;
+ dev->resource[i].end = 0;
+ dev->resource[i].flags = 0;
+ }
+ }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ALTERA, PCI_ANY_ID,
+ altera_pcie_fixup_res);
+
+static inline void cra_writel(struct altera_pcie *pcie, u32 value, u32 reg)
+{
+ writel_relaxed(value, pcie->cra_base + reg);
+}
+
+static inline u32 cra_readl(struct altera_pcie *pcie, u32 reg)
+{
+ return readl_relaxed(pcie->cra_base + reg);
+}
+
+static void tlp_read_rx(struct altera_pcie *pcie,
+ struct tlp_rp_regpair_t *tlp_rp_regdata)
+{
+ tlp_rp_regdata->ctrl = cra_readl(pcie, RP_RXCPL_STATUS);
+ tlp_rp_regdata->reg0 = cra_readl(pcie, RP_RXCPL_REG0);
+ tlp_rp_regdata->reg1 = cra_readl(pcie, RP_RXCPL_REG1);
+}
+
+static void tlp_write_tx(struct altera_pcie *pcie,
+ struct tlp_rp_regpair_t *tlp_rp_regdata)
+{
+ cra_writel(pcie, tlp_rp_regdata->reg0, RP_TX_REG0);
+ cra_writel(pcie, tlp_rp_regdata->reg1, RP_TX_REG1);
+ cra_writel(pcie, tlp_rp_regdata->ctrl, RP_TX_CNTRL);
+}
+
+static bool altera_pcie_link_is_up(struct altera_pcie *pcie)
+{
+ return !!(cra_readl(pcie, RP_LTSSM) & LTSSM_L0);
+}
+
+static bool altera_pcie_valid_config(struct altera_pcie *pcie,
+ struct pci_bus *bus, int dev)
+{
+ /* If there is no link, then there is no device */
+ if (bus->number != pcie->root_bus_nr) {
+ if (!altera_pcie_link_is_up(pcie))
+ return false;
+ }
+
+ /* access only one slot on each root port */
+ if (bus->number == pcie->root_bus_nr && dev > 0)
+ return false;
+
+ /*
+ * Do not read more than one device on the bus directly attached
+ * to root port, root port can only attach to one downstream port.
+ */
+ if (bus->primary == pcie->root_bus_nr && dev > 0)
+ return false;
+
+ return true;
+}
+
+static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)
+{
+ u8 loop;
+ struct tlp_rp_regpair_t tlp_rp_regdata;
+
+ /*
+ * Minimum 2 loops to read TLP headers and 1 loop to read data
+ * payload.
+ */
+ for (loop = 0; loop < TLP_LOOP; loop++) {
+ tlp_read_rx(pcie, &tlp_rp_regdata);
+ if (tlp_rp_regdata.ctrl & RP_RXCPL_EOP) {
+ if (value)
+ *value = tlp_rp_regdata.reg0;
+ return PCIBIOS_SUCCESSFUL;
+ }
+ udelay(5);
+ }
+
+ return -ENOENT;
+}
+
+static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers,
+ u32 data, bool align)
+{
+ struct tlp_rp_regpair_t tlp_rp_regdata;
+
+ tlp_rp_regdata.reg0 = headers[0];
+ tlp_rp_regdata.reg1 = headers[1];
+ tlp_rp_regdata.ctrl = RP_TX_SOP;
+ tlp_write_tx(pcie, &tlp_rp_regdata);
+
+ if (align) {
+ tlp_rp_regdata.reg0 = headers[2];
+ tlp_rp_regdata.reg1 = 0;
+ tlp_rp_regdata.ctrl = 0;
+ tlp_write_tx(pcie, &tlp_rp_regdata);
+
+ tlp_rp_regdata.reg0 = data;
+ tlp_rp_regdata.reg1 = 0;
+ } else {
+ tlp_rp_regdata.reg0 = headers[2];
+ tlp_rp_regdata.reg1 = data;
+ }
+
+ tlp_rp_regdata.ctrl = RP_TX_EOP;
+ tlp_write_tx(pcie, &tlp_rp_regdata);
+}
+
+static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn,
+ int where, u32 *value)
+{
+ int ret;
+ u32 headers[TLP_HDR_SIZE];
+
+ if (bus == pcie->root_bus_nr)
+ headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGRD0);
+ else
+ headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGRD1);
+
+ headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
+ TLP_READ_TAG);
+ headers[2] = TLP_CFG_DW2(bus, devfn, where);
+
+ tlp_write_packet(pcie, headers, 0, false);
+
+ ret = tlp_read_packet(pcie, value);
+ if (ret != PCIBIOS_SUCCESSFUL)
+ *value = ~0UL; /* return 0xFFFFFFFF if error */
+
+ return ret;
+}
+
+static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
+ int where, u32 value)
+{
+ u32 headers[TLP_HDR_SIZE];
+ int ret;
+
+ if (bus == pcie->root_bus_nr)
+ headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGWR0);
+ else
+ headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGWR1);
+
+ headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
+ TLP_WRITE_TAG);
+ headers[2] = TLP_CFG_DW2(bus, devfn, where);
+
+ /* check alignment to Qword */
+ if ((where & 0x7) == 0)
+ tlp_write_packet(pcie, headers, value, true);
+ else
+ tlp_write_packet(pcie, headers, value, false);
+
+ ret = tlp_read_packet(pcie, NULL);
+ if (ret != PCIBIOS_SUCCESSFUL)
+ return ret;
+
+ /*
+ * Monitoring changes to PCI_PRIMARY_BUS register on root port and update
+ * local copy of root bus number accordingly.
+ */
+ if ((bus == pcie->root_bus_nr) && (where == PCI_PRIMARY_BUS))
+ pcie->root_bus_nr = (u8)(value);
+
+ return PCIBIOS_SUCCESSFUL;
+}
+
+static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 *value)
+{
+ struct altera_pcie *pcie = bus->sysdata;
+ int ret;
+ u32 data;
+
+ if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn))) {
+ *value = ~0UL;
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ }
+
+ ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
+ (where & ~DWORD_MASK), &data);
+ if (ret != PCIBIOS_SUCCESSFUL)
+ return ret;
+
+ switch (size) {
+ case 1:
+ *value = (data >> (8 * (where & 0x3))) & 0xff;
+ break;
+ case 2:
+ *value = (data >> (8 * (where & 0x2))) & 0xffff;
+ break;
+ default:
+ *value = data;
+ break;
+ }
+
+ return PCIBIOS_SUCCESSFUL;
+}
+
+static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 value)
+{
+ struct altera_pcie *pcie = bus->sysdata;
+ u32 data32;
+ u32 shift = 8 * (where & 3);
+ int ret;
+
+ if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn)))
+ return PCIBIOS_DEVICE_NOT_FOUND;
+
+ /* write partial */
+ if (size != sizeof(u32)) {
+ ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
+ where & ~DWORD_MASK, &data32);
+ if (ret)
+ return ret;
+ }
+
+ switch (size) {
+ case 1:
+ data32 = (data32 & ~(0xff << shift)) |
+ ((value & 0xff) << shift);
+ break;
+ case 2:
+ data32 = (data32 & ~(0xffff << shift)) |
+ ((value & 0xffff) << shift);
+ break;
+ default:
+ data32 = value;
+ break;
+ }
+
+ return tlp_cfg_dword_write(pcie, bus->number, devfn,
+ (where & ~DWORD_MASK), data32);
+}
+
+static struct pci_ops altera_pcie_ops = {
+ .read = altera_pcie_cfg_read,
+ .write = altera_pcie_cfg_write,
+};
+
+static int altera_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
+ irq_hw_number_t hwirq)
+{
+ irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq);
+ irq_set_chip_data(irq, domain->host_data);
+
+ return 0;
+}
+
+static const struct irq_domain_ops intx_domain_ops = {
+ .map = altera_pcie_intx_map,
+};
+
+static void altera_pcie_isr(struct irq_desc *desc)
+{
+ struct irq_chip *chip = irq_desc_get_chip(desc);
+ struct altera_pcie *pcie;
+ unsigned long status;
+ u32 bit;
+ u32 virq;
+
+ chained_irq_enter(chip, desc);
+ pcie = irq_desc_get_handler_data(desc);
+
+ while ((status = cra_readl(pcie, P2A_INT_STATUS)
+ & P2A_INT_STS_ALL) != 0) {
+ for_each_set_bit(bit, &status, INTX_NUM) {
+ /* clear interrupts */
+ cra_writel(pcie, 1 << bit, P2A_INT_STATUS);
+
+ virq = irq_find_mapping(pcie->irq_domain, bit + 1);
+ if (virq)
+ generic_handle_irq(virq);
+ else
+ dev_err(&pcie->pdev->dev, "unexpected IRQ\n");
+ }
+ }
+
+ chained_irq_exit(chip, desc);
+}
+
+static void altera_pcie_release_of_pci_ranges(struct altera_pcie *pcie)
+{
+ pci_free_resource_list(&pcie->resources);
+}
+
+static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
+{
+ int err, res_valid = 0;
+ struct device *dev = &pcie->pdev->dev;
+ struct device_node *np = dev->of_node;
+ struct resource_entry *win;
+
+ err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
+ NULL);
+ if (err)
+ return err;
+
+ resource_list_for_each_entry(win, &pcie->resources) {
+ struct resource *parent, *res = win->res;
+
+ switch (resource_type(res)) {
+ case IORESOURCE_MEM:
+ parent = &iomem_resource;
+ res_valid |= !(res->flags & IORESOURCE_PREFETCH);
+ break;
+ default:
+ continue;
+ }
+
+ err = devm_request_resource(dev, parent, res);
+ if (err)
+ goto out_release_res;
+ }
+
+ if (!res_valid) {
+ dev_err(dev, "non-prefetchable memory resource required\n");
+ err = -EINVAL;
+ goto out_release_res;
+ }
+
+ return 0;
+
+out_release_res:
+ altera_pcie_release_of_pci_ranges(pcie);
+ return err;
+}
+
+static void altera_pcie_free_irq_domain(struct altera_pcie *pcie)
+{
+ int i;
+ u32 irq;
+
+ for (i = 0; i < INTX_NUM; i++) {
+ irq = irq_find_mapping(pcie->irq_domain, i + 1);
+ if (irq > 0)
+ irq_dispose_mapping(irq);
+ }
+
+ irq_domain_remove(pcie->irq_domain);
+}
+
+static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
+{
+ struct device *dev = &pcie->pdev->dev;
+ struct device_node *node = dev->of_node;
+
+ /* Setup INTx */
+ pcie->irq_domain = irq_domain_add_linear(node, INTX_NUM,
+ &intx_domain_ops, pcie);
+ if (!pcie->irq_domain) {
+ dev_err(dev, "Failed to get a INTx IRQ domain\n");
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static int altera_pcie_parse_dt(struct altera_pcie *pcie)
+{
+ struct resource *cra;
+ struct platform_device *pdev = pcie->pdev;
+
+ cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra");
+ if (!cra) {
+ dev_err(&pdev->dev,
+ "no Cra memory resource defined\n");
+ return -ENODEV;
+ }
+
+ pcie->cra_base = devm_ioremap_resource(&pdev->dev, cra);
+ if (IS_ERR(pcie->cra_base)) {
+ dev_err(&pdev->dev, "failed to map cra memory\n");
+ return PTR_ERR(pcie->cra_base);
+ }
+
+ /* setup IRQ */
+ pcie->irq = platform_get_irq(pdev, 0);
+ if (pcie->irq <= 0) {
+ dev_err(&pdev->dev, "failed to get IRQ: %d\n", pcie->irq);
+ return -EINVAL;
+ }
+
+ irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie);
+
+ return 0;
+}
+
+static int altera_pcie_probe(struct platform_device *pdev)
+{
+ struct altera_pcie *pcie;
+ struct pci_bus *bus;
+ struct pci_bus *child;
+ int ret;
+
+ pcie = devm_kzalloc(&pdev->dev, sizeof(*pcie), GFP_KERNEL);
+ if (!pcie)
+ return -ENOMEM;
+
+ pcie->pdev = pdev;
+
+ ret = altera_pcie_parse_dt(pcie);
+ if (ret) {
+ dev_err(&pdev->dev, "Parsing DT failed\n");
+ return ret;
+ }
+
+ INIT_LIST_HEAD(&pcie->resources);
+
+ ret = altera_pcie_parse_request_of_pci_ranges(pcie);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed add resources\n");
+ return ret;
+ }
+
+ ret = altera_pcie_init_irq_domain(pcie);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed creating IRQ Domain\n");
+ return ret;
+ }
+
+ /* clear all interrupts */
+ cra_writel(pcie, P2A_INT_STS_ALL, P2A_INT_STATUS);
+ /* enable all interrupts */
+ cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE);
+
+ bus = pci_scan_root_bus(&pdev->dev, pcie->root_bus_nr, &altera_pcie_ops,
+ pcie, &pcie->resources);
+ if (!bus)
+ return -ENOMEM;
+
+ pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
+ pci_assign_unassigned_bus_resources(bus);
+ pci_bus_add_devices(bus);
+
+ /* Configure PCI Express setting. */
+ list_for_each_entry(child, &bus->children, node)
+ pcie_bus_configure_settings(child);
+
+ platform_set_drvdata(pdev, pcie);
+ return ret;
+}
+
+static int altera_pcie_remove(struct platform_device *pdev)
+{
+ struct altera_pcie *pcie = platform_get_drvdata(pdev);
+
+ altera_pcie_free_irq_domain(pcie);
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static const struct of_device_id altera_pcie_of_match[] = {
+ { .compatible = "altr,pcie-root-port-1.0", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, altera_pcie_of_match);
+
+static struct platform_driver altera_pcie_driver = {
+ .probe = altera_pcie_probe,
+ .remove = altera_pcie_remove,
+ .driver = {
+ .name = "altera-pcie",
+ .of_match_table = altera_pcie_of_match,
+ },
+};
+
+module_platform_driver(altera_pcie_driver);
+
+MODULE_AUTHOR("Ley Foon Tan <lftan@altera.com>");
+MODULE_DESCRIPTION("Altera PCIe host controller driver");
+MODULE_LICENSE("GPL v2");
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 9:43 ` [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver Ley Foon Tan
@ 2015-10-08 9:47 ` Russell King - ARM Linux
2015-10-08 10:03 ` Ley Foon Tan
2015-10-08 10:45 ` kbuild test robot
2015-10-08 14:16 ` kbuild test robot
2 siblings, 1 reply; 15+ messages in thread
From: Russell King - ARM Linux @ 2015-10-08 9:47 UTC (permalink / raw)
To: Ley Foon Tan
Cc: Bjorn Helgaas, Marc Zyngier, Arnd Bergmann, Dinh Nguyen,
linux-pci, devicetree, linux-arm-kernel, linux-doc, linux-kernel,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
On Thu, Oct 08, 2015 at 05:43:11PM +0800, Ley Foon Tan wrote:
> +static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn,
> + int where, int size, u32 value)
> +{
> + struct altera_pcie *pcie = bus->sysdata;
> + u32 data32;
> + u32 shift = 8 * (where & 3);
> + int ret;
> +
> + if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn)))
> + return PCIBIOS_DEVICE_NOT_FOUND;
> +
> + /* write partial */
> + if (size != sizeof(u32)) {
> + ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
> + where & ~DWORD_MASK, &data32);
> + if (ret)
> + return ret;
> + }
> +
> + switch (size) {
> + case 1:
> + data32 = (data32 & ~(0xff << shift)) |
> + ((value & 0xff) << shift);
> + break;
> + case 2:
> + data32 = (data32 & ~(0xffff << shift)) |
> + ((value & 0xffff) << shift);
> + break;
> + default:
> + data32 = value;
Can you generate proper 1, 2 and 4 byte configuration accesses? That
is much preferred over the above read-modify-write, as there are
registers in PCI and PCIe that are read/write-1-to-clear. The above
has the effect of inadvertently clearing those RW1C bits.
--
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 9:47 ` Russell King - ARM Linux
@ 2015-10-08 10:03 ` Ley Foon Tan
2015-10-09 23:15 ` Bjorn Helgaas
0 siblings, 1 reply; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 10:03 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Mark Rutland, devicetree, Lorenzo Pieralisi, Pawel Moll,
Arnd Bergmann, linux-doc@vger.kernel.org, Marc Zyngier, linux-pci,
Ian Campbell, linux-kernel@vger.kernel.org, Rob Herring,
Kumar Gala, Bjorn Helgaas, Dinh Nguyen, linux-arm-kernel
On Thu, Oct 8, 2015 at 5:47 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
>
> On Thu, Oct 08, 2015 at 05:43:11PM +0800, Ley Foon Tan wrote:
> > +static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn,
> > + int where, int size, u32 value)
> > +{
> > + struct altera_pcie *pcie = bus->sysdata;
> > + u32 data32;
> > + u32 shift = 8 * (where & 3);
> > + int ret;
> > +
> > + if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn)))
> > + return PCIBIOS_DEVICE_NOT_FOUND;
> > +
> > + /* write partial */
> > + if (size != sizeof(u32)) {
> > + ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
> > + where & ~DWORD_MASK, &data32);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > + switch (size) {
> > + case 1:
> > + data32 = (data32 & ~(0xff << shift)) |
> > + ((value & 0xff) << shift);
> > + break;
> > + case 2:
> > + data32 = (data32 & ~(0xffff << shift)) |
> > + ((value & 0xffff) << shift);
> > + break;
> > + default:
> > + data32 = value;
>
> Can you generate proper 1, 2 and 4 byte configuration accesses? That
> is much preferred over the above read-modify-write, as there are
> registers in PCI and PCIe that are read/write-1-to-clear. The above
> has the effect of inadvertently clearing those RW1C bits.
No, hardware can only access 4-byte aligned address.
Regards
Ley Foon
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 10:03 ` Ley Foon Tan
@ 2015-10-09 23:15 ` Bjorn Helgaas
2015-10-12 12:03 ` Arnd Bergmann
0 siblings, 1 reply; 15+ messages in thread
From: Bjorn Helgaas @ 2015-10-09 23:15 UTC (permalink / raw)
To: Ley Foon Tan
Cc: Russell King - ARM Linux, Bjorn Helgaas, Marc Zyngier,
Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Lorenzo Pieralisi
On Thu, Oct 08, 2015 at 06:03:24PM +0800, Ley Foon Tan wrote:
> On Thu, Oct 8, 2015 at 5:47 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
> >
> > On Thu, Oct 08, 2015 at 05:43:11PM +0800, Ley Foon Tan wrote:
> > > +static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn,
> > > + int where, int size, u32 value)
> > > +{
> > > + struct altera_pcie *pcie = bus->sysdata;
> > > + u32 data32;
> > > + u32 shift = 8 * (where & 3);
> > > + int ret;
> > > +
> > > + if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn)))
> > > + return PCIBIOS_DEVICE_NOT_FOUND;
> > > +
> > > + /* write partial */
> > > + if (size != sizeof(u32)) {
> > > + ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
> > > + where & ~DWORD_MASK, &data32);
> > > + if (ret)
> > > + return ret;
> > > + }
> > > +
> > > + switch (size) {
> > > + case 1:
> > > + data32 = (data32 & ~(0xff << shift)) |
> > > + ((value & 0xff) << shift);
> > > + break;
> > > + case 2:
> > > + data32 = (data32 & ~(0xffff << shift)) |
> > > + ((value & 0xffff) << shift);
> > > + break;
> > > + default:
> > > + data32 = value;
> >
> > Can you generate proper 1, 2 and 4 byte configuration accesses? That
> > is much preferred over the above read-modify-write, as there are
> > registers in PCI and PCIe that are read/write-1-to-clear. The above
> > has the effect of inadvertently clearing those RW1C bits.
> No, hardware can only access 4-byte aligned address.
This is non-spec compliant, and we really should have some way of
flagging that because it may break things in ways that would be very
difficult to debug, e.g., we can lose RW1C status bits when writing an
adjacent register, so they would just silently disappear.
I don't know if this should be a kernel taint, a simple warning in
dmesg, or what. I guess the tainting mechanism is probably too
general-purpose for this, and add_taint() doesn't give any dmesg
indication. We wouldn't see the taint unless the problem actually
caused an oops or panic. In this case, I think I want a clue in dmesg
so we have a chance of seeing it even if there is no oops. So
probably something like a dev_warn("non-compliant config accesses")
would work.
You really should double-check with the hardware guys, because it's
pretty obvious that the PCI spec requires 1- and 2-byte config
accesses to work correctly. For example, if you read/modify/write to
update PCI_COMMAND, you will inadvertently clear the RW1C bits in
PCI_STATUS.
Bjorn
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-09 23:15 ` Bjorn Helgaas
@ 2015-10-12 12:03 ` Arnd Bergmann
2015-10-13 7:47 ` Ley Foon Tan
0 siblings, 1 reply; 15+ messages in thread
From: Arnd Bergmann @ 2015-10-12 12:03 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: Ley Foon Tan, Russell King - ARM Linux, Bjorn Helgaas,
Marc Zyngier, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Lorenzo Pieralisi
On Friday 09 October 2015 18:15:40 Bjorn Helgaas wrote:
>
> I don't know if this should be a kernel taint, a simple warning in
> dmesg, or what. I guess the tainting mechanism is probably too
> general-purpose for this, and add_taint() doesn't give any dmesg
> indication. We wouldn't see the taint unless the problem actually
> caused an oops or panic. In this case, I think I want a clue in dmesg
> so we have a chance of seeing it even if there is no oops. So
> probably something like a dev_warn("non-compliant config accesses")
> would work.
>
> You really should double-check with the hardware guys, because it's
> pretty obvious that the PCI spec requires 1- and 2-byte config
> accesses to work correctly. For example, if you read/modify/write to
> update PCI_COMMAND, you will inadvertently clear the RW1C bits in
> PCI_STATUS.
Would it help to require a DT property here that flags the device
as having a broken config space?
Then we could implement both in the driver, and only use the
RMW based implementation if the firmware describes the device
as "altera,broken-pci-config-space".
Arnd
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-12 12:03 ` Arnd Bergmann
@ 2015-10-13 7:47 ` Ley Foon Tan
0 siblings, 0 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-13 7:47 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Bjorn Helgaas, Russell King - ARM Linux, Bjorn Helgaas,
Marc Zyngier, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Lorenzo Pieralisi
On Mon, Oct 12, 2015 at 8:03 PM, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Friday 09 October 2015 18:15:40 Bjorn Helgaas wrote:
> >
> > I don't know if this should be a kernel taint, a simple warning in
> > dmesg, or what. I guess the tainting mechanism is probably too
> > general-purpose for this, and add_taint() doesn't give any dmesg
> > indication. We wouldn't see the taint unless the problem actually
> > caused an oops or panic. In this case, I think I want a clue in dmesg
> > so we have a chance of seeing it even if there is no oops. So
> > probably something like a dev_warn("non-compliant config accesses")
> > would work.
> >
> > You really should double-check with the hardware guys, because it's
> > pretty obvious that the PCI spec requires 1- and 2-byte config
> > accesses to work correctly. For example, if you read/modify/write to
> > update PCI_COMMAND, you will inadvertently clear the RW1C bits in
> > PCI_STATUS.
>
> Would it help to require a DT property here that flags the device
> as having a broken config space?
>
> Then we could implement both in the driver, and only use the
> RMW based implementation if the firmware describes the device
> as "altera,broken-pci-config-space".
>
I have checked the PCI/TLP specification, the address needs to be
4-byte aligned. But, we can use "byte enable" field to update specific
bytes.
For example, if byte enable is 0x3 (0011b), that mean it only update
lower 2 bytes. By doing this, we can resolve the RW1C issue here.
I will update the driver with this in next revision.
Thanks for reviewing.
Regards
Ley Foon
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 9:43 ` [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver Ley Foon Tan
2015-10-08 9:47 ` Russell King - ARM Linux
@ 2015-10-08 10:45 ` kbuild test robot
2015-10-08 14:16 ` kbuild test robot
2 siblings, 0 replies; 15+ messages in thread
From: kbuild test robot @ 2015-10-08 10:45 UTC (permalink / raw)
Cc: kbuild-all, Bjorn Helgaas, Russell King, Marc Zyngier,
Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]
Hi Ley,
[auto build test WARNING on v4.3-rc4 -- if it's inappropriate base, please ignore]
config: x86_64-allmodconfig (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
drivers/pci/host/pcie-altera.c: In function 'tlp_cfg_dword_read':
>> drivers/pci/host/pcie-altera.c:243:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL; /* return 0xFFFFFFFF if error */
^
drivers/pci/host/pcie-altera.c: In function 'altera_pcie_cfg_read':
drivers/pci/host/pcie-altera.c:291:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL;
^
vim +243 drivers/pci/host/pcie-altera.c
227 int ret;
228 u32 headers[TLP_HDR_SIZE];
229
230 if (bus == pcie->root_bus_nr)
231 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGRD0);
232 else
233 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGRD1);
234
235 headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
236 TLP_READ_TAG);
237 headers[2] = TLP_CFG_DW2(bus, devfn, where);
238
239 tlp_write_packet(pcie, headers, 0, false);
240
241 ret = tlp_read_packet(pcie, value);
242 if (ret != PCIBIOS_SUCCESSFUL)
> 243 *value = ~0UL; /* return 0xFFFFFFFF if error */
244
245 return ret;
246 }
247
248 static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
249 int where, u32 value)
250 {
251 u32 headers[TLP_HDR_SIZE];
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 50062 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver
2015-10-08 9:43 ` [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver Ley Foon Tan
2015-10-08 9:47 ` Russell King - ARM Linux
2015-10-08 10:45 ` kbuild test robot
@ 2015-10-08 14:16 ` kbuild test robot
2 siblings, 0 replies; 15+ messages in thread
From: kbuild test robot @ 2015-10-08 14:16 UTC (permalink / raw)
Cc: kbuild-all, Bjorn Helgaas, Russell King, Marc Zyngier,
Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
[-- Attachment #1: Type: text/plain, Size: 6896 bytes --]
Hi Ley,
[auto build test ERROR on v4.3-rc4 -- if it's inappropriate base, please ignore]
config: sparc-allmodconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=sparc
All errors (new ones prefixed by >>):
drivers/pci/host/pcie-altera.c: In function 'tlp_cfg_dword_read':
drivers/pci/host/pcie-altera.c:243:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL; /* return 0xFFFFFFFF if error */
^
drivers/pci/host/pcie-altera.c: In function 'altera_pcie_cfg_read':
drivers/pci/host/pcie-altera.c:291:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL;
^
drivers/pci/host/pcie-altera.c: In function 'altera_pcie_parse_request_of_pci_ranges':
>> drivers/pci/host/pcie-altera.c:410:2: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
^
cc1: some warnings being treated as errors
vim +/of_pci_get_host_bridge_resources +410 drivers/pci/host/pcie-altera.c
237 headers[2] = TLP_CFG_DW2(bus, devfn, where);
238
239 tlp_write_packet(pcie, headers, 0, false);
240
241 ret = tlp_read_packet(pcie, value);
242 if (ret != PCIBIOS_SUCCESSFUL)
> 243 *value = ~0UL; /* return 0xFFFFFFFF if error */
244
245 return ret;
246 }
247
248 static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
249 int where, u32 value)
250 {
251 u32 headers[TLP_HDR_SIZE];
252 int ret;
253
254 if (bus == pcie->root_bus_nr)
255 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGWR0);
256 else
257 headers[0] = TLP_CFG_DW0(TLP_FMTTYPE_CFGWR1);
258
259 headers[1] = TLP_CFG_DW1(TLP_REQ_ID(pcie->root_bus_nr, devfn),
260 TLP_WRITE_TAG);
261 headers[2] = TLP_CFG_DW2(bus, devfn, where);
262
263 /* check alignment to Qword */
264 if ((where & 0x7) == 0)
265 tlp_write_packet(pcie, headers, value, true);
266 else
267 tlp_write_packet(pcie, headers, value, false);
268
269 ret = tlp_read_packet(pcie, NULL);
270 if (ret != PCIBIOS_SUCCESSFUL)
271 return ret;
272
273 /*
274 * Monitoring changes to PCI_PRIMARY_BUS register on root port and update
275 * local copy of root bus number accordingly.
276 */
277 if ((bus == pcie->root_bus_nr) && (where == PCI_PRIMARY_BUS))
278 pcie->root_bus_nr = (u8)(value);
279
280 return PCIBIOS_SUCCESSFUL;
281 }
282
283 static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
284 int where, int size, u32 *value)
285 {
286 struct altera_pcie *pcie = bus->sysdata;
287 int ret;
288 u32 data;
289
290 if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn))) {
291 *value = ~0UL;
292 return PCIBIOS_DEVICE_NOT_FOUND;
293 }
294
295 ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
296 (where & ~DWORD_MASK), &data);
297 if (ret != PCIBIOS_SUCCESSFUL)
298 return ret;
299
300 switch (size) {
301 case 1:
302 *value = (data >> (8 * (where & 0x3))) & 0xff;
303 break;
304 case 2:
305 *value = (data >> (8 * (where & 0x2))) & 0xffff;
306 break;
307 default:
308 *value = data;
309 break;
310 }
311
312 return PCIBIOS_SUCCESSFUL;
313 }
314
315 static int altera_pcie_cfg_write(struct pci_bus *bus, unsigned int devfn,
316 int where, int size, u32 value)
317 {
318 struct altera_pcie *pcie = bus->sysdata;
319 u32 data32;
320 u32 shift = 8 * (where & 3);
321 int ret;
322
323 if (!altera_pcie_valid_config(pcie, bus, PCI_SLOT(devfn)))
324 return PCIBIOS_DEVICE_NOT_FOUND;
325
326 /* write partial */
327 if (size != sizeof(u32)) {
328 ret = tlp_cfg_dword_read(pcie, bus->number, devfn,
329 where & ~DWORD_MASK, &data32);
330 if (ret)
331 return ret;
332 }
333
334 switch (size) {
335 case 1:
336 data32 = (data32 & ~(0xff << shift)) |
337 ((value & 0xff) << shift);
338 break;
339 case 2:
340 data32 = (data32 & ~(0xffff << shift)) |
341 ((value & 0xffff) << shift);
342 break;
343 default:
344 data32 = value;
345 break;
346 }
347
348 return tlp_cfg_dword_write(pcie, bus->number, devfn,
349 (where & ~DWORD_MASK), data32);
350 }
351
352 static struct pci_ops altera_pcie_ops = {
353 .read = altera_pcie_cfg_read,
354 .write = altera_pcie_cfg_write,
355 };
356
357 static int altera_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
358 irq_hw_number_t hwirq)
359 {
360 irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq);
361 irq_set_chip_data(irq, domain->host_data);
362
363 return 0;
364 }
365
366 static const struct irq_domain_ops intx_domain_ops = {
367 .map = altera_pcie_intx_map,
368 };
369
370 static void altera_pcie_isr(struct irq_desc *desc)
371 {
372 struct irq_chip *chip = irq_desc_get_chip(desc);
373 struct altera_pcie *pcie;
374 unsigned long status;
375 u32 bit;
376 u32 virq;
377
378 chained_irq_enter(chip, desc);
379 pcie = irq_desc_get_handler_data(desc);
380
381 while ((status = cra_readl(pcie, P2A_INT_STATUS)
382 & P2A_INT_STS_ALL) != 0) {
383 for_each_set_bit(bit, &status, INTX_NUM) {
384 /* clear interrupts */
385 cra_writel(pcie, 1 << bit, P2A_INT_STATUS);
386
387 virq = irq_find_mapping(pcie->irq_domain, bit + 1);
388 if (virq)
389 generic_handle_irq(virq);
390 else
391 dev_err(&pcie->pdev->dev, "unexpected IRQ\n");
392 }
393 }
394
395 chained_irq_exit(chip, desc);
396 }
397
398 static void altera_pcie_release_of_pci_ranges(struct altera_pcie *pcie)
399 {
400 pci_free_resource_list(&pcie->resources);
401 }
402
403 static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
404 {
405 int err, res_valid = 0;
406 struct device *dev = &pcie->pdev->dev;
407 struct device_node *np = dev->of_node;
408 struct resource_entry *win;
409
> 410 err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
411 NULL);
412 if (err)
413 return err;
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43415 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v8 4/6] pci: altera: Add Altera PCIe MSI driver
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
` (2 preceding siblings ...)
2015-10-08 9:43 ` [PATCH v8 3/6] pci:host: Add Altera PCIe host controller driver Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
2015-10-08 14:38 ` kbuild test robot
2015-10-08 9:43 ` [PATCH v8 5/6] Documentation: dt-bindings: pci: altera pcie device tree binding Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 6/6] MAINTAINERS: Add Altera PCIe and MSI drivers maintainer Ley Foon Tan
5 siblings, 1 reply; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Mark Rutland, devicetree, Lorenzo Pieralisi, lftan.linux,
Arnd Bergmann, linux-doc, linux-pci, Ian Campbell, linux-kernel,
Rob Herring, Pawel Moll, Kumar Gala, Ley Foon Tan, Dinh Nguyen,
linux-arm-kernel
This patch adds Altera PCIe MSI driver. This soft IP supports configurable
number of vectors, which is a dts parameter.
Signed-off-by: Ley Foon Tan <lftan@altera.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
---
drivers/pci/host/Kconfig | 8 +
drivers/pci/host/Makefile | 1 +
drivers/pci/host/pcie-altera-msi.c | 310 +++++++++++++++++++++++++++++++++++++
3 files changed, 319 insertions(+)
create mode 100644 drivers/pci/host/pcie-altera-msi.c
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 08f2543..0500bb3 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -152,4 +152,12 @@ config PCIE_ALTERA
Say Y here if you want to enable PCIe controller support for Altera
SoCFPGA family of SoCs.
+config PCIE_ALTERA_MSI
+ bool "Altera PCIe MSI feature"
+ depends on PCI_MSI
+ select PCI_MSI_IRQ_DOMAIN
+ help
+ Say Y here if you want PCIe MSI support for the Altera SocFPGA SoC.
+ This MSI driver supports Altera MSI to GIC controller IP.
+
endmenu
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
index 6954f76..6c4913d 100644
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_PCIE_IPROC) += pcie-iproc.o
obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o
obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o
obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o
+obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o
diff --git a/drivers/pci/host/pcie-altera-msi.c b/drivers/pci/host/pcie-altera-msi.c
new file mode 100644
index 0000000..37a358e
--- /dev/null
+++ b/drivers/pci/host/pcie-altera-msi.c
@@ -0,0 +1,310 @@
+/*
+ * Copyright Altera Corporation (C) 2013-2015. All rights reserved
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/interrupt.h>
+#include <linux/irqchip/chained_irq.h>
+#include <linux/module.h>
+#include <linux/msi.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#define MSI_STATUS 0x0
+#define MSI_ERROR 0x4
+#define MSI_INTMASK 0x8
+
+#define MAX_MSI_VECTORS 32
+struct altera_msi {
+ DECLARE_BITMAP(used, MAX_MSI_VECTORS);
+ struct mutex lock; /* proctect used variable */
+ struct platform_device *pdev;
+ struct irq_domain *msi_domain;
+ struct irq_domain *inner_domain;
+ void __iomem *csr_base;
+ void __iomem *vector_base;
+ phys_addr_t vector_phy;
+ u32 num_of_vectors;
+ int irq;
+};
+
+static inline void msi_writel(struct altera_msi *msi, u32 value, u32 reg)
+{
+ writel_relaxed(value, msi->csr_base + reg);
+}
+
+static inline u32 msi_readl(struct altera_msi *msi, u32 reg)
+{
+ return readl_relaxed(msi->csr_base + reg);
+}
+
+static void altera_msi_isr(struct irq_desc *desc)
+{
+ struct irq_chip *chip = irq_desc_get_chip(desc);
+ struct altera_msi *msi;
+ unsigned long status;
+ u32 num_of_vectors;
+ u32 bit;
+ u32 virq;
+
+ chained_irq_enter(chip, desc);
+ msi = irq_desc_get_handler_data(desc);
+ num_of_vectors = msi->num_of_vectors;
+
+ while ((status = msi_readl(msi, MSI_STATUS)) != 0) {
+ for_each_set_bit(bit, &status, msi->num_of_vectors) {
+ /* Dummy read from vector to clear the interrupt */
+ readl_relaxed(msi->vector_base + (bit * sizeof(u32)));
+
+ virq = irq_find_mapping(msi->inner_domain, bit);
+ if (virq)
+ generic_handle_irq(virq);
+ else
+ dev_err(&msi->pdev->dev, "unexpected MSI\n");
+ }
+ }
+
+ chained_irq_exit(chip, desc);
+}
+
+static struct irq_chip altera_msi_irq_chip = {
+ .name = "Altera PCIe MSI",
+ .irq_mask = pci_msi_mask_irq,
+ .irq_unmask = pci_msi_unmask_irq,
+};
+
+static struct msi_domain_info altera_msi_domain_info = {
+ .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
+ MSI_FLAG_PCI_MSIX),
+ .chip = &altera_msi_irq_chip,
+};
+
+static void altera_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
+{
+ struct altera_msi *msi = irq_data_get_irq_chip_data(data);
+ phys_addr_t addr = msi->vector_phy + (data->hwirq * sizeof(u32));
+
+ msg->address_lo = lower_32_bits(addr);
+ msg->address_hi = upper_32_bits(addr);
+ msg->data = data->hwirq;
+
+ dev_dbg(&msi->pdev->dev, "msi#%d address_hi 0x%x address_lo 0x%x\n",
+ (int)data->hwirq, msg->address_hi, msg->address_lo);
+}
+
+static int altera_msi_set_affinity(struct irq_data *irq_data,
+ const struct cpumask *mask, bool force)
+{
+ return -EINVAL;
+}
+
+static struct irq_chip altera_msi_bottom_irq_chip = {
+ .name = "Altera MSI",
+ .irq_compose_msi_msg = altera_compose_msi_msg,
+ .irq_set_affinity = altera_msi_set_affinity,
+};
+
+static int altera_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
+ unsigned int nr_irqs, void *args)
+{
+ struct altera_msi *msi = domain->host_data;
+ unsigned long bit;
+ u32 mask;
+
+ WARN_ON(nr_irqs != 1);
+ mutex_lock(&msi->lock);
+
+ bit = find_first_zero_bit(msi->used, msi->num_of_vectors);
+ if (bit >= msi->num_of_vectors)
+ return -ENOSPC;
+
+ set_bit(bit, msi->used);
+
+ mutex_unlock(&msi->lock);
+
+ irq_domain_set_info(domain, virq, bit, &altera_msi_bottom_irq_chip,
+ domain->host_data, handle_simple_irq,
+ NULL, NULL);
+
+ mask = msi_readl(msi, MSI_INTMASK);
+ mask |= 1 << bit;
+ msi_writel(msi, mask, MSI_INTMASK);
+
+ return 0;
+}
+
+static void altera_irq_domain_free(struct irq_domain *domain,
+ unsigned int virq, unsigned int nr_irqs)
+{
+ struct irq_data *d = irq_domain_get_irq_data(domain, virq);
+ struct altera_msi *msi = irq_data_get_irq_chip_data(d);
+ u32 mask;
+
+ mutex_lock(&msi->lock);
+
+ if (!test_bit(d->hwirq, msi->used)) {
+ dev_err(&msi->pdev->dev, "trying to free unused MSI#%lu\n",
+ d->hwirq);
+ } else {
+ __clear_bit(d->hwirq, msi->used);
+ mask = msi_readl(msi, MSI_INTMASK);
+ mask &= ~(1 << d->hwirq);
+ msi_writel(msi, mask, MSI_INTMASK);
+ }
+
+ mutex_unlock(&msi->lock);
+}
+
+static const struct irq_domain_ops msi_domain_ops = {
+ .alloc = altera_irq_domain_alloc,
+ .free = altera_irq_domain_free,
+};
+
+static int altera_allocate_domains(struct altera_msi *msi)
+{
+ msi->inner_domain = irq_domain_add_linear(NULL, msi->num_of_vectors,
+ &msi_domain_ops, msi);
+ if (!msi->inner_domain) {
+ dev_err(&msi->pdev->dev, "failed to create IRQ domain\n");
+ return -ENOMEM;
+ }
+
+ msi->msi_domain = pci_msi_create_irq_domain(msi->pdev->dev.of_node,
+ &altera_msi_domain_info, msi->inner_domain);
+ if (!msi->msi_domain) {
+ dev_err(&msi->pdev->dev, "failed to create MSI domain\n");
+ irq_domain_remove(msi->inner_domain);
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+static void altera_free_domains(struct altera_msi *msi)
+{
+ irq_domain_remove(msi->msi_domain);
+ irq_domain_remove(msi->inner_domain);
+}
+
+static int altera_msi_remove(struct platform_device *pdev)
+{
+ struct altera_msi *msi = platform_get_drvdata(pdev);
+
+ msi_writel(msi, 0, MSI_INTMASK);
+ irq_set_chained_handler(msi->irq, NULL);
+ irq_set_handler_data(msi->irq, NULL);
+
+ altera_free_domains(msi);
+
+ platform_set_drvdata(pdev, NULL);
+ return 0;
+}
+
+static int altera_msi_probe(struct platform_device *pdev)
+{
+ struct altera_msi *msi;
+ struct device_node *np = pdev->dev.of_node;
+ struct resource *res;
+ int ret;
+
+ msi = devm_kzalloc(&pdev->dev, sizeof(struct altera_msi),
+ GFP_KERNEL);
+ if (!msi)
+ return -ENOMEM;
+
+ mutex_init(&msi->lock);
+ msi->pdev = pdev;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "csr");
+ if (!res) {
+ dev_err(&pdev->dev,
+ "no csr memory resource defined\n");
+ return -ENODEV;
+ }
+
+ msi->csr_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(msi->csr_base)) {
+ dev_err(&pdev->dev, "failed to map csr memory\n");
+ return PTR_ERR(msi->csr_base);
+ }
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+ "vector_slave");
+ if (!res) {
+ dev_err(&pdev->dev,
+ "no vector_slave memory resource defined\n");
+ return -ENODEV;
+ }
+
+ msi->vector_base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(msi->vector_base)) {
+ dev_err(&pdev->dev, "failed to map vector_slave memory\n");
+ return PTR_ERR(msi->vector_base);
+ }
+
+ msi->vector_phy = res->start;
+
+ if (of_property_read_u32(np, "num-vectors", &msi->num_of_vectors)) {
+ dev_err(&pdev->dev, "failed to parse the number of vectors\n");
+ return -EINVAL;
+ }
+
+ ret = altera_allocate_domains(msi);
+ if (ret)
+ return ret;
+
+ msi->irq = platform_get_irq(pdev, 0);
+ if (msi->irq <= 0) {
+ dev_err(&pdev->dev, "failed to map IRQ: %d\n", msi->irq);
+ ret = -ENODEV;
+ goto err;
+ }
+
+ irq_set_chained_handler_and_data(msi->irq, altera_msi_isr, msi);
+ platform_set_drvdata(pdev, msi);
+
+ return 0;
+
+err:
+ altera_msi_remove(pdev);
+ return ret;
+}
+
+static const struct of_device_id altera_msi_of_match[] = {
+ { .compatible = "altr,msi-1.0", NULL },
+ { },
+};
+
+static struct platform_driver altera_msi_driver = {
+ .driver = {
+ .name = "altera-msi",
+ .of_match_table = altera_msi_of_match,
+ },
+ .probe = altera_msi_probe,
+ .remove = altera_msi_remove,
+};
+
+static int __init altera_msi_init(void)
+{
+ return platform_driver_register(&altera_msi_driver);
+}
+
+subsys_initcall(altera_msi_init);
+
+MODULE_AUTHOR("Ley Foon Tan <lftan@altera.com>");
+MODULE_DESCRIPTION("Altera PCIe MSI support");
+MODULE_LICENSE("GPL v2");
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v8 4/6] pci: altera: Add Altera PCIe MSI driver
2015-10-08 9:43 ` [PATCH v8 4/6] pci: altera: Add Altera PCIe MSI driver Ley Foon Tan
@ 2015-10-08 14:38 ` kbuild test robot
0 siblings, 0 replies; 15+ messages in thread
From: kbuild test robot @ 2015-10-08 14:38 UTC (permalink / raw)
Cc: kbuild-all, Bjorn Helgaas, Russell King, Marc Zyngier,
Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
[-- Attachment #1: Type: text/plain, Size: 13792 bytes --]
Hi Ley,
[auto build test ERROR on v4.3-rc4 -- if it's inappropriate base, please ignore]
config: sparc-allmodconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=sparc
All error/warnings (new ones prefixed by >>):
In file included from include/linux/of_pci.h:5:0,
from drivers/pci//host/pcie-altera.c:22:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
drivers/pci//host/pcie-altera.c: In function 'tlp_cfg_dword_read':
drivers/pci//host/pcie-altera.c:243:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL; /* return 0xFFFFFFFF if error */
^
drivers/pci//host/pcie-altera.c: In function 'altera_pcie_cfg_read':
drivers/pci//host/pcie-altera.c:291:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL;
^
drivers/pci//host/pcie-altera.c: In function 'altera_pcie_parse_request_of_pci_ranges':
drivers/pci//host/pcie-altera.c:410:2: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
^
cc1: some warnings being treated as errors
--
In file included from drivers/pci//host/pcie-altera-msi.c:19:0:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
--
In file included from drivers/base/platform-msi.c:24:0:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
drivers/base/platform-msi.c: In function 'platform_msi_update_dom_ops':
>> drivers/base/platform-msi.c:80:9: error: 'struct msi_domain_ops' has no member named 'msi_init'
if (ops->msi_init == NULL)
^
drivers/base/platform-msi.c:81:6: error: 'struct msi_domain_ops' has no member named 'msi_init'
ops->msi_init = platform_msi_init;
^
>> drivers/base/platform-msi.c:82:9: error: 'struct msi_domain_ops' has no member named 'set_desc'
if (ops->set_desc == NULL)
^
drivers/base/platform-msi.c:83:6: error: 'struct msi_domain_ops' has no member named 'set_desc'
ops->set_desc = platform_msi_set_desc;
^
--
In file included from drivers/pci/msi.c:17:0:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
>> drivers/pci/msi.c:1218:2: error: unknown field 'set_desc' specified in initializer
.set_desc = pci_msi_domain_set_desc,
^
drivers/pci/msi.c: In function 'pci_msi_domain_update_dom_ops':
>> drivers/pci/msi.c:1230:10: error: 'struct msi_domain_ops' has no member named 'set_desc'
if (ops->set_desc == NULL)
^
drivers/pci/msi.c:1231:7: error: 'struct msi_domain_ops' has no member named 'set_desc'
ops->set_desc = pci_msi_domain_set_desc;
^
--
In file included from kernel/irq/msi.c:16:0:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
kernel/irq/msi.c: In function 'msi_domain_alloc':
>> kernel/irq/msi.c:106:29: error: 'struct msi_domain_ops' has no member named 'get_hwirq'
irq_hw_number_t hwirq = ops->get_hwirq(info, arg);
^
>> kernel/irq/msi.c:117:12: error: 'struct msi_domain_ops' has no member named 'msi_init'
ret = ops->msi_init(domain, info, virq + i, hwirq + i, arg);
^
kernel/irq/msi.c: At top level:
>> kernel/irq/msi.c:179:11: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg)
^
>> kernel/irq/msi.c:199:2: error: unknown field 'get_hwirq' specified in initializer
.get_hwirq = msi_domain_ops_get_hwirq,
^
>> kernel/irq/msi.c:200:2: error: unknown field 'msi_init' specified in initializer
.msi_init = msi_domain_ops_init,
^
>> kernel/irq/msi.c:200:14: error: 'msi_domain_ops_init' undeclared here (not in a function)
.msi_init = msi_domain_ops_init,
^
>> kernel/irq/msi.c:202:2: error: unknown field 'msi_prepare' specified in initializer
.msi_prepare = msi_domain_ops_prepare,
^
>> kernel/irq/msi.c:203:2: error: unknown field 'set_desc' specified in initializer
.set_desc = msi_domain_ops_set_desc,
^
>> kernel/irq/msi.c:203:2: warning: excess elements in struct initializer
>> kernel/irq/msi.c:203:2: warning: (near initialization for 'msi_domain_ops_default')
kernel/irq/msi.c: In function 'msi_domain_update_dom_ops':
kernel/irq/msi.c:215:9: error: 'struct msi_domain_ops' has no member named 'get_hwirq'
if (ops->get_hwirq == NULL)
^
kernel/irq/msi.c:216:6: error: 'struct msi_domain_ops' has no member named 'get_hwirq'
ops->get_hwirq = msi_domain_ops_default.get_hwirq;
^
kernel/irq/msi.c:216:42: error: 'struct msi_domain_ops' has no member named 'get_hwirq'
ops->get_hwirq = msi_domain_ops_default.get_hwirq;
^
kernel/irq/msi.c:217:9: error: 'struct msi_domain_ops' has no member named 'msi_init'
if (ops->msi_init == NULL)
^
kernel/irq/msi.c:218:6: error: 'struct msi_domain_ops' has no member named 'msi_init'
ops->msi_init = msi_domain_ops_default.msi_init;
^
kernel/irq/msi.c:218:41: error: 'struct msi_domain_ops' has no member named 'msi_init'
ops->msi_init = msi_domain_ops_default.msi_init;
^
>> kernel/irq/msi.c:221:9: error: 'struct msi_domain_ops' has no member named 'msi_prepare'
if (ops->msi_prepare == NULL)
^
kernel/irq/msi.c:222:6: error: 'struct msi_domain_ops' has no member named 'msi_prepare'
ops->msi_prepare = msi_domain_ops_default.msi_prepare;
^
kernel/irq/msi.c:222:44: error: 'struct msi_domain_ops' has no member named 'msi_prepare'
ops->msi_prepare = msi_domain_ops_default.msi_prepare;
^
>> kernel/irq/msi.c:223:9: error: 'struct msi_domain_ops' has no member named 'set_desc'
if (ops->set_desc == NULL)
^
kernel/irq/msi.c:224:6: error: 'struct msi_domain_ops' has no member named 'set_desc'
ops->set_desc = msi_domain_ops_default.set_desc;
^
kernel/irq/msi.c:224:41: error: 'struct msi_domain_ops' has no member named 'set_desc'
ops->set_desc = msi_domain_ops_default.set_desc;
^
kernel/irq/msi.c: In function 'msi_domain_alloc_irqs':
kernel/irq/msi.c:273:2: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t arg;
^
kernel/irq/msi.c:279:12: error: 'struct msi_domain_ops' has no member named 'msi_prepare'
ret = ops->msi_prepare(domain, dev, nvec, &arg);
^
kernel/irq/msi.c:284:6: error: 'struct msi_domain_ops' has no member named 'set_desc'
ops->set_desc(&arg, desc);
^
kernel/irq/msi.c:286:19: error: 'struct msi_domain_ops' has no member named 'get_hwirq'
virq = (int)ops->get_hwirq(info, &arg);
^
>> kernel/irq/msi.c:296:11: error: 'struct msi_domain_ops' has no member named 'msi_finish'
if (ops->msi_finish)
^
kernel/irq/msi.c:297:8: error: 'struct msi_domain_ops' has no member named 'msi_finish'
ops->msi_finish(&arg, ret);
^
kernel/irq/msi.c:305:9: error: 'struct msi_domain_ops' has no member named 'msi_finish'
if (ops->msi_finish)
^
kernel/irq/msi.c:306:6: error: 'struct msi_domain_ops' has no member named 'msi_finish'
ops->msi_finish(&arg, 0);
^
--
In file included from include/linux/of_pci.h:5:0,
from drivers/pci/host/pcie-altera.c:22:
>> include/linux/msi.h:199:10: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:203:9: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:212:12: error: unknown type name 'msi_alloc_info_t'
msi_alloc_info_t *arg);
^
include/linux/msi.h:213:22: error: unknown type name 'msi_alloc_info_t'
void (*msi_finish)(msi_alloc_info_t *arg, int retval);
^
include/linux/msi.h:214:20: error: unknown type name 'msi_alloc_info_t'
void (*set_desc)(msi_alloc_info_t *arg,
^
drivers/pci/host/pcie-altera.c: In function 'tlp_cfg_dword_read':
drivers/pci/host/pcie-altera.c:243:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL; /* return 0xFFFFFFFF if error */
^
drivers/pci/host/pcie-altera.c: In function 'altera_pcie_cfg_read':
drivers/pci/host/pcie-altera.c:291:12: warning: large integer implicitly truncated to unsigned type [-Woverflow]
*value = ~0UL;
^
drivers/pci/host/pcie-altera.c: In function 'altera_pcie_parse_request_of_pci_ranges':
drivers/pci/host/pcie-altera.c:410:2: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
^
cc1: some warnings being treated as errors
vim +/msi_alloc_info_t +199 include/linux/msi.h
d9109698 Jiang Liu 2014-11-15 193 * @msi_check, @msi_prepare, @msi_finish, @set_desc and @handle_error
d9109698 Jiang Liu 2014-11-15 194 * are callbacks used by msi_irq_domain_alloc_irqs() and related
d9109698 Jiang Liu 2014-11-15 195 * interfaces which are based on msi_desc.
f3cf8bb0 Jiang Liu 2014-11-12 196 */
f3cf8bb0 Jiang Liu 2014-11-12 197 struct msi_domain_ops {
aeeb5965 Jiang Liu 2014-11-15 198 irq_hw_number_t (*get_hwirq)(struct msi_domain_info *info,
aeeb5965 Jiang Liu 2014-11-15 @199 msi_alloc_info_t *arg);
f3cf8bb0 Jiang Liu 2014-11-12 200 int (*msi_init)(struct irq_domain *domain,
f3cf8bb0 Jiang Liu 2014-11-12 201 struct msi_domain_info *info,
f3cf8bb0 Jiang Liu 2014-11-12 202 unsigned int virq, irq_hw_number_t hwirq,
:::::: The code at line 199 was first introduced by commit
:::::: aeeb59657c35da64068336c20068da237f41ab76 genirq: Provide default callbacks for msi_domain_ops
:::::: TO: Jiang Liu <jiang.liu@linux.intel.com>
:::::: CC: Thomas Gleixner <tglx@linutronix.de>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 43438 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v8 5/6] Documentation: dt-bindings: pci: altera pcie device tree binding
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
` (3 preceding siblings ...)
2015-10-08 9:43 ` [PATCH v8 4/6] pci: altera: Add Altera PCIe MSI driver Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
2015-10-08 9:43 ` [PATCH v8 6/6] MAINTAINERS: Add Altera PCIe and MSI drivers maintainer Ley Foon Tan
5 siblings, 0 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
This patch adds the bindings for Altera PCIe host controller driver and
Altera PCIe MSI driver.
Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
.../devicetree/bindings/pci/altera-pcie-msi.txt | 28 +++++++++++++
.../devicetree/bindings/pci/altera-pcie.txt | 49 ++++++++++++++++++++++
2 files changed, 77 insertions(+)
create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt
diff --git a/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt b/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
new file mode 100644
index 0000000..09cd3bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
@@ -0,0 +1,28 @@
+* Altera PCIe MSI controller
+
+Required properties:
+- compatible: should contain "altr,msi-1.0"
+- reg: specifies the physical base address of the controller and
+ the length of the memory mapped region.
+- reg-names: must include the following entries:
+ "csr": CSR registers
+ "vector_slave": vectors slave port region
+- interrupt-parent: interrupt source phandle.
+- interrupts: specifies the interrupt source of the parent interrupt
+ controller. The format of the interrupt specifier depends on the
+ parent interrupt controller.
+- num-vectors: number of vectors, range 1 to 32.
+- msi-controller: indicates that this is MSI controller node
+
+
+Example
+msi0: msi@0xFF200000 {
+ compatible = "altr,msi-1.0";
+ reg = <0xFF200000 0x00000010
+ 0xFF200010 0x00000080>;
+ reg-names = "csr", "vector_slave";
+ interrupt-parent = <&hps_0_arm_gic_0>;
+ interrupts = <0 42 4>;
+ msi-controller;
+ num-vectors = <32>;
+};
diff --git a/Documentation/devicetree/bindings/pci/altera-pcie.txt b/Documentation/devicetree/bindings/pci/altera-pcie.txt
new file mode 100644
index 0000000..2951a6a
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/altera-pcie.txt
@@ -0,0 +1,49 @@
+* Altera PCIe controller
+
+Required properties:
+- compatible : should contain "altr,pcie-root-port-1.0"
+- reg: a list of physical base address and length for TXS and CRA.
+- reg-names: must include the following entries:
+ "Txs": TX slave port region
+ "Cra": Control register access region
+- interrupt-parent: interrupt source phandle.
+- interrupts: specifies the interrupt source of the parent interrupt controller.
+ The format of the interrupt specifier depends on the parent interrupt
+ controller.
+- device_type: must be "pci"
+- #address-cells: set to <3>
+- #size-cells: set to <2>
+- #interrupt-cells: set to <1>
+- ranges: describes the translation of addresses for root ports and standard
+ PCI regions.
+- interrupt-map-mask and interrupt-map: standard PCI properties to define the
+ mapping of the PCIe interface to interrupt numbers.
+
+Optional properties:
+- msi-parent: Link to the hardware entity that serves as the MSI controller for this PCIe
+ controller.
+- bus-range: PCI bus numbers covered
+
+Example
+ pcie_0: pcie@0xc00000000 {
+ compatible = "altr,pcie-root-port-1.0";
+ reg = <0xc0000000 0x20000000>,
+ <0xff220000 0x00004000>;
+ reg-names = "Txs", "Cra";
+ interrupt-parent = <&hps_0_arm_gic_0>;
+ interrupts = <0 40 4>;
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ bus-range = <0x0 0xFF>;
+ device_type = "pci";
+ msi-parent = <&msi_to_gic_gen_0>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ interrupt-map-mask = <0 0 0 7>;
+ interrupt-map = <0 0 0 1 &pcie_0 1>,
+ <0 0 0 2 &pcie_0 2>,
+ <0 0 0 3 &pcie_0 3>,
+ <0 0 0 4 &pcie_0 4>;
+ ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000
+ 0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
+ };
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v8 6/6] MAINTAINERS: Add Altera PCIe and MSI drivers maintainer
2015-10-08 9:43 [PATCH v8 0/6] Altera PCIe host controller driver with MSI support Ley Foon Tan
` (4 preceding siblings ...)
2015-10-08 9:43 ` [PATCH v8 5/6] Documentation: dt-bindings: pci: altera pcie device tree binding Ley Foon Tan
@ 2015-10-08 9:43 ` Ley Foon Tan
5 siblings, 0 replies; 15+ messages in thread
From: Ley Foon Tan @ 2015-10-08 9:43 UTC (permalink / raw)
To: Bjorn Helgaas, Russell King, Marc Zyngier
Cc: Arnd Bergmann, Dinh Nguyen, linux-pci, devicetree,
linux-arm-kernel, linux-doc, linux-kernel, Ley Foon Tan,
lftan.linux, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell,
Kumar Gala, Lorenzo Pieralisi
Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
MAINTAINERS | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9f6685f..482de0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7943,6 +7943,14 @@ F: include/linux/pci*
F: arch/x86/pci/
F: arch/x86/kernel/quirks.c
+PCI DRIVER FOR ALTERA PCIE IP
+M: Ley Foon Tan <lftan@altera.com>
+L: rfi@lists.rocketboards.org (moderated for non-subscribers)
+L: linux-pci@vger.kernel.org
+S: Supported
+F: Documentation/devicetree/bindings/pci/altera-pcie.txt
+F: drivers/pci/host/pcie-altera.c
+
PCI DRIVER FOR ARM VERSATILE PLATFORM
M: Rob Herring <robh@kernel.org>
L: linux-pci@vger.kernel.org
@@ -8044,6 +8052,14 @@ L: linux-pci@vger.kernel.org
S: Maintained
F: drivers/pci/host/*spear*
+PCI MSI DRIVER FOR ALTERA MSI IP
+M: Ley Foon Tan <lftan@altera.com>
+L: rfi@lists.rocketboards.org (moderated for non-subscribers)
+L: linux-pci@vger.kernel.org
+S: Supported
+F: Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
+F: drivers/pci/host/pcie-altera-msi.c
+
PCI MSI DRIVER FOR APPLIEDMICRO XGENE
M: Duc Dang <dhdang@apm.com>
L: linux-pci@vger.kernel.org
--
1.8.2.1
^ permalink raw reply related [flat|nested] 15+ messages in thread