aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch
diff options
context:
space:
mode:
authorYutang Jiang <yutang.jiang@nxp.com>2016-10-29 00:14:32 +0800
committerJohn Crispin <john@phrozen.org>2016-10-31 17:00:10 +0100
commitc6c731fe311f7da42777ffd31804a4f6aa3f8e19 (patch)
treed92c7296f82d46d1b2da30933a97595f6cb8ad66 /target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch
parenta34f96d6cf80c7c3c425076714d9c4caa67e3670 (diff)
downloadupstream-c6c731fe311f7da42777ffd31804a4f6aa3f8e19.tar.gz
upstream-c6c731fe311f7da42777ffd31804a4f6aa3f8e19.tar.bz2
upstream-c6c731fe311f7da42777ffd31804a4f6aa3f8e19.zip
layerscape: add 64b/32b target for ls1043ardb device
Add support for NXP layerscape ls1043ardb 64b/32b Dev board. LS1043a is an SoC with 4x64-bit up to 1.6 GHz ARMv8 A53 cores. ls1043ardb support features as: 2GB DDR4, 128MB NOR/512MB NAND, USB3.0, eSDHC, I2C, GPIO, PCIe/Mini-PCIe, 6x1G/1x10G network port, etc. 64b/32b ls1043ardb target is using 4.4 kernel, and rcw/u-boot/fman images from NXP QorIQ SDK release. All of 4.4 kernel patches porting from SDK release or upstream. QorIQ SDK ISOs can be downloaded from this location: http://www.nxp.com/products/software-and-tools/run-time-software/linux-sdk/linux-sdk-for-qoriq-processors:SDKLINUX Signed-off-by: Yutang Jiang <yutang.jiang@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch')
-rw-r--r--target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch285
1 files changed, 285 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch b/target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch
new file mode 100644
index 0000000000..bfbce21bf6
--- /dev/null
+++ b/target/linux/layerscape/patches-4.4/8060-irqchip-Add-Layerscape-SCFG-MSI-controller-support.patch
@@ -0,0 +1,285 @@
+From 83ec4322b33e8d7908a3df0343246882e4e6b83a Mon Sep 17 00:00:00 2001
+From: Minghuan Lian <Minghuan.Lian@nxp.com>
+Date: Wed, 23 Mar 2016 19:08:20 +0800
+Subject: [PATCH 60/70] irqchip: Add Layerscape SCFG MSI controller support
+
+upstream b8f3ebe630a4f1b4ff9340103d3b565ad5d78d43 commit
+[context adjustment]
+
+Some kind of Freescale Layerscape SoC provides a MSI
+implementation which uses two SCFG registers MSIIR and
+MSIR to support 32 MSI interrupts for each PCIe controller.
+The patch is to support it.
+
+Signed-off-by: Minghuan Lian <Minghuan.Lian@nxp.com>
+Tested-by: Alexander Stein <alexander.stein@systec-electronic.com>
+Acked-by: Marc Zyngier <marc.zyngier@arm.com>
+Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
+---
+ drivers/irqchip/Kconfig | 5 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-ls-scfg-msi.c | 240 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 246 insertions(+)
+ create mode 100644 drivers/irqchip/irq-ls-scfg-msi.c
+
+--- a/drivers/irqchip/Kconfig
++++ b/drivers/irqchip/Kconfig
+@@ -193,3 +193,8 @@ config IRQ_MXS
+ def_bool y if MACH_ASM9260 || ARCH_MXS
+ select IRQ_DOMAIN
+ select STMP_DEVICE
++
++config LS_SCFG_MSI
++ def_bool y if SOC_LS1021A || ARCH_LAYERSCAPE
++ depends on PCI && PCI_MSI
++ select PCI_MSI_IRQ_DOMAIN
+--- a/drivers/irqchip/Makefile
++++ b/drivers/irqchip/Makefile
+@@ -55,3 +55,4 @@ obj-$(CONFIG_RENESAS_H8S_INTC) += irq-r
+ obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o
+ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o
+ obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o
++obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
+--- /dev/null
++++ b/drivers/irqchip/irq-ls-scfg-msi.c
+@@ -0,0 +1,240 @@
++/*
++ * Freescale SCFG MSI(-X) support
++ *
++ * Copyright (C) 2016 Freescale Semiconductor.
++ *
++ * Author: Minghuan Lian <Minghuan.Lian@nxp.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/kernel.h>
++#include <linux/module.h>
++#include <linux/msi.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/irqchip/chained_irq.h>
++#include <linux/irqdomain.h>
++#include <linux/of_pci.h>
++#include <linux/of_platform.h>
++#include <linux/spinlock.h>
++
++#define MSI_MAX_IRQS 32
++#define MSI_IBS_SHIFT 3
++#define MSIR 4
++
++struct ls_scfg_msi {
++ spinlock_t lock;
++ struct platform_device *pdev;
++ struct irq_domain *parent;
++ struct irq_domain *msi_domain;
++ void __iomem *regs;
++ phys_addr_t msiir_addr;
++ int irq;
++ DECLARE_BITMAP(used, MSI_MAX_IRQS);
++};
++
++static struct irq_chip ls_scfg_msi_irq_chip = {
++ .name = "MSI",
++ .irq_mask = pci_msi_mask_irq,
++ .irq_unmask = pci_msi_unmask_irq,
++};
++
++static struct msi_domain_info ls_scfg_msi_domain_info = {
++ .flags = (MSI_FLAG_USE_DEF_DOM_OPS |
++ MSI_FLAG_USE_DEF_CHIP_OPS |
++ MSI_FLAG_PCI_MSIX),
++ .chip = &ls_scfg_msi_irq_chip,
++};
++
++static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)
++{
++ struct ls_scfg_msi *msi_data = irq_data_get_irq_chip_data(data);
++
++ msg->address_hi = upper_32_bits(msi_data->msiir_addr);
++ msg->address_lo = lower_32_bits(msi_data->msiir_addr);
++ msg->data = data->hwirq << MSI_IBS_SHIFT;
++}
++
++static int ls_scfg_msi_set_affinity(struct irq_data *irq_data,
++ const struct cpumask *mask, bool force)
++{
++ return -EINVAL;
++}
++
++static struct irq_chip ls_scfg_msi_parent_chip = {
++ .name = "SCFG",
++ .irq_compose_msi_msg = ls_scfg_msi_compose_msg,
++ .irq_set_affinity = ls_scfg_msi_set_affinity,
++};
++
++static int ls_scfg_msi_domain_irq_alloc(struct irq_domain *domain,
++ unsigned int virq,
++ unsigned int nr_irqs,
++ void *args)
++{
++ struct ls_scfg_msi *msi_data = domain->host_data;
++ int pos, err = 0;
++
++ WARN_ON(nr_irqs != 1);
++
++ spin_lock(&msi_data->lock);
++ pos = find_first_zero_bit(msi_data->used, MSI_MAX_IRQS);
++ if (pos < MSI_MAX_IRQS)
++ __set_bit(pos, msi_data->used);
++ else
++ err = -ENOSPC;
++ spin_unlock(&msi_data->lock);
++
++ if (err)
++ return err;
++
++ irq_domain_set_info(domain, virq, pos,
++ &ls_scfg_msi_parent_chip, msi_data,
++ handle_simple_irq, NULL, NULL);
++
++ return 0;
++}
++
++static void ls_scfg_msi_domain_irq_free(struct irq_domain *domain,
++ unsigned int virq, unsigned int nr_irqs)
++{
++ struct irq_data *d = irq_domain_get_irq_data(domain, virq);
++ struct ls_scfg_msi *msi_data = irq_data_get_irq_chip_data(d);
++ int pos;
++
++ pos = d->hwirq;
++ if (pos < 0 || pos >= MSI_MAX_IRQS) {
++ pr_err("failed to teardown msi. Invalid hwirq %d\n", pos);
++ return;
++ }
++
++ spin_lock(&msi_data->lock);
++ __clear_bit(pos, msi_data->used);
++ spin_unlock(&msi_data->lock);
++}
++
++static const struct irq_domain_ops ls_scfg_msi_domain_ops = {
++ .alloc = ls_scfg_msi_domain_irq_alloc,
++ .free = ls_scfg_msi_domain_irq_free,
++};
++
++static void ls_scfg_msi_irq_handler(struct irq_desc *desc)
++{
++ struct ls_scfg_msi *msi_data = irq_desc_get_handler_data(desc);
++ unsigned long val;
++ int pos, virq;
++
++ chained_irq_enter(irq_desc_get_chip(desc), desc);
++
++ val = ioread32be(msi_data->regs + MSIR);
++ for_each_set_bit(pos, &val, MSI_MAX_IRQS) {
++ virq = irq_find_mapping(msi_data->parent, (31 - pos));
++ if (virq)
++ generic_handle_irq(virq);
++ }
++
++ chained_irq_exit(irq_desc_get_chip(desc), desc);
++}
++
++static int ls_scfg_msi_domains_init(struct ls_scfg_msi *msi_data)
++{
++ /* Initialize MSI domain parent */
++ msi_data->parent = irq_domain_add_linear(NULL,
++ MSI_MAX_IRQS,
++ &ls_scfg_msi_domain_ops,
++ msi_data);
++ if (!msi_data->parent) {
++ dev_err(&msi_data->pdev->dev, "failed to create IRQ domain\n");
++ return -ENOMEM;
++ }
++
++ msi_data->msi_domain = pci_msi_create_irq_domain(
++ of_node_to_fwnode(msi_data->pdev->dev.of_node),
++ &ls_scfg_msi_domain_info,
++ msi_data->parent);
++ if (!msi_data->msi_domain) {
++ dev_err(&msi_data->pdev->dev, "failed to create MSI domain\n");
++ irq_domain_remove(msi_data->parent);
++ return -ENOMEM;
++ }
++
++ return 0;
++}
++
++static int ls_scfg_msi_probe(struct platform_device *pdev)
++{
++ struct ls_scfg_msi *msi_data;
++ struct resource *res;
++ int ret;
++
++ msi_data = devm_kzalloc(&pdev->dev, sizeof(*msi_data), GFP_KERNEL);
++ if (!msi_data)
++ return -ENOMEM;
++
++ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ msi_data->regs = devm_ioremap_resource(&pdev->dev, res);
++ if (IS_ERR(msi_data->regs)) {
++ dev_err(&pdev->dev, "failed to initialize 'regs'\n");
++ return PTR_ERR(msi_data->regs);
++ }
++ msi_data->msiir_addr = res->start;
++
++ msi_data->irq = platform_get_irq(pdev, 0);
++ if (msi_data->irq <= 0) {
++ dev_err(&pdev->dev, "failed to get MSI irq\n");
++ return -ENODEV;
++ }
++
++ msi_data->pdev = pdev;
++ spin_lock_init(&msi_data->lock);
++
++ ret = ls_scfg_msi_domains_init(msi_data);
++ if (ret)
++ return ret;
++
++ irq_set_chained_handler_and_data(msi_data->irq,
++ ls_scfg_msi_irq_handler,
++ msi_data);
++
++ platform_set_drvdata(pdev, msi_data);
++
++ return 0;
++}
++
++static int ls_scfg_msi_remove(struct platform_device *pdev)
++{
++ struct ls_scfg_msi *msi_data = platform_get_drvdata(pdev);
++
++ irq_set_chained_handler_and_data(msi_data->irq, NULL, NULL);
++
++ irq_domain_remove(msi_data->msi_domain);
++ irq_domain_remove(msi_data->parent);
++
++ platform_set_drvdata(pdev, NULL);
++
++ return 0;
++}
++
++static const struct of_device_id ls_scfg_msi_id[] = {
++ { .compatible = "fsl,1s1021a-msi", },
++ { .compatible = "fsl,1s1043a-msi", },
++ {},
++};
++
++static struct platform_driver ls_scfg_msi_driver = {
++ .driver = {
++ .name = "ls-scfg-msi",
++ .of_match_table = ls_scfg_msi_id,
++ },
++ .probe = ls_scfg_msi_probe,
++ .remove = ls_scfg_msi_remove,
++};
++
++module_platform_driver(ls_scfg_msi_driver);
++
++MODULE_AUTHOR("Minghuan Lian <Minghuan.Lian@nxp.com>");
++MODULE_DESCRIPTION("Freescale Layerscape SCFG MSI controller driver");
++MODULE_LICENSE("GPL v2");