Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932192AbcCWLWw (ORCPT ); Wed, 23 Mar 2016 07:22:52 -0400 Received: from mail-bl2on0082.outbound.protection.outlook.com ([65.55.169.82]:57376 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751067AbcCWLWn (ORCPT ); Wed, 23 Mar 2016 07:22:43 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; From: Minghuan Lian To: , , CC: Marc Zyngier , Thomas Gleixner , Jason Cooper , Roy Zang , Mingkai Hu , Stuart Yoder , Yang-Leo Li , Scott Wood , Rob Herring , Minghuan Lian Subject: [PATCH 2/2 v6] irqchip/Layerscape: Add SCFG MSI controller support Date: Wed, 23 Mar 2016 19:08:20 +0800 Message-ID: <1458731300-13648-2-git-send-email-Minghuan.Lian@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458731300-13648-1-git-send-email-Minghuan.Lian@nxp.com> References: <1458731300-13648-1-git-send-email-Minghuan.Lian@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131032048205900956;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(50226001)(77096005)(586003)(50466002)(106466001)(1220700001)(92566002)(48376002)(4326007)(47776003)(5003940100001)(1096002)(105606002)(76176999)(5001770100001)(2950100001)(5008740100001)(104016004)(86362001)(36756003)(85426001)(189998001)(229853001)(2906002)(81166005)(2201001)(19580395003)(19580405001)(87936001)(6806005)(11100500001)(50986999)(7059030)(217873001)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB1593;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD017;1:GES2CyMcGeWWS6EX73LlublQ3ZP7JLm5VA1mFlmRlIzYLxXjnoecYj4YlJWGSqXzDedG0jo9IJO2OtTfiIEqbLGcJ65vDLOuFdv72HB43j/O1YFqKKeIDz7lO97TEGRg4fue2S89N5e8K146Givgj3xdEixF9cm9LC1mt19vEnxa9Xv2SAsWAR7esk/QS/FOQbXiYlO4ZRunpHP0wcaRzW9JDMjcGKQWbuwjb+vIRE7cXGqo/9Rh/KOftIlVsQQUO1ns7/J9dgZKFm6kPrp3I2NWIYRBuqIqPMJlYkAoGieyP2HDEbf/B9uXuHJaqSvd5g+TxPErl7lL33oPgptqJTBLR30nt2+6IztunZpA3qdLOc/UADosE8BhFhxtNunEFv2EuFbikW0ScsyYdtnG0D5kLOwj5GJ4v88Pf3AthJNb4T5qRrZWzVQUNBH+Nr/4sDpCA3JTqr3LfMyKkI/WkrKVEihCFOON4q8wyU2CzTq6rNelcYYzI6QCkL1FI83O+GR2LFp7mkljksJ8okyMRK3ryP4zEI99mIL2KhIsXhwoEExcr2rzeyEFuJ7sg8jaG33X6w6Wmm777rhIFcOZvtDSrFh9L9ZPxnb/tM4bZ6N7FkbL+09l5DCNOaiatAkvCw5vf/JneUj9AqbEmuAIOw== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: d058ef8d-ae22-4082-cb3d-08d3530b41f5 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1593;2:AcXb8v4W0zgRJa6JavgSFUr4PdaOnL4zR18oKkgPxZ6vS3gdB01K8dKp31MaI4rGe+HJ0dO0P9A3gdGrrjk+rE2g5K5z18L2g9EH7gV4OgLu0ElYC72LAn/gaVny7sOPS1qY2t3vlvEk0e5wf26uZeO/qSyeN5x6wtERSfBJr/gskuQsNc4PCB4GDLaWzSsL;3:E0WDUO6BtUGYBOhb/WnOdjQ8+ROogPRNqPRsF6S9ZQ5SBB0cDvi6lV6zc0r5BnhoMrJ+3BQkmiF3j7DuW9THa6Ulxhc+ZTepDlJ5P1m94tBGOI7NKEC6xURhfrkw02id606/vOOuSO1BbXBWR+5W4dIqG1HE195D5d5Q81Nk5QXAM/IeODIxlQWkLV+L3ypdQE4RE1Xh4bj7H1V5gOSwJ4ksev0WbRJxI8YXWThJRPY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1593; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1593;25:lJmiVUE2Oi+wzWlFZvfpB2bqEpw2f+ngBwlZS9fI7nrBQOzOqEBk6WKZ/Xp6xhrT5CFh/Do3I39WWpaho2Y1lHLtw8AVeTz/OpZ7qmTbr9x56771jy1EZ/ObHoKGStNbEdNPoLn69NozaNT5OuO2I4SaNl15oCfc/y55t09X1tuWTrT/Z7oNXwr2oxbzEd8RJ2q9qTsMJgLXmIuA506SJ/KTvSIZukIjaGN/SLT72dXn/xlW74b7AbueydnPzQuc1wiV5tXTfJzrwm4fj7UJb9XSjjUmE8PWe8UZrdCeVUdMWaDOxgHNjYWQaQIdf+mjtrSca25G14jzX/J1putdCCwi4k6sPYGCVU2COFeQWU0PqGw1pNnjyGQdizgp/CUmB+STl6XYCdUzlsxIALbOKGiajgdsyFZei8UamnBb5emOns3b4ayoeBKDGd7HEq0mcKjqLqtXC05XvBH5Zh2ZaSA7GQK8kxzaN90bcZi6e4WClqfveH5TgQCNCmQkwgxHh4BzaE69q7u8IejC9qHJezK5u64tEhgMl8iU/2UUm78= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13015025)(13024025)(5005006)(13023025)(13017025)(13018025)(8121501046)(3002001)(10201501046);SRVR:CY1PR0301MB1593;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB1593; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1593;4:7HFFeYp+a/lc3NSPiyor8PHgKSyWVqQPUXbDVUNHMqG6hGDjxtVQQbU7FzhXVSWnsFIqQPJnqVRhBRqPvVhu/rLDlyCM94sO62w/5MYipUVpvfT5peHUyda0a4EQ9d+wTnHoGmYy94zd2v7HJLi7c5Pw+aHkz+xoo7paIKqeo5wOXj+skrkPYyb50/sTg0FOfbXaNZGehX3MzrviPX/DSJqW4VYdTP5P2htkkDu+cI+lH1aEqdpWaTgxKWfmmnKlQ+bKU2+//IuXVF5CZahqNLlHE/3xi/1zOvkn46J6AActDH1gZZIRUmnKGn+xIl1HUNmk/wBWHDT7kOS/cWaOXhN30bnfDUynth0+DUdoL5CZcVQPgR15m0S2qIicGWS6jO3LqKF7Fs3mzwEl7j52m5JrZA1y5KfZT3C5TbYVQn7cmvBCalHOz9RI9jsF+rCcI6ITGaZpbEx/FbYIHF0tNg== X-Forefront-PRVS: 08902E536D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB1593;23:aHBScPcV/1Ht/5F8gKDmndSFBFWvOCWaS0BFI/8?= =?us-ascii?Q?g8+jJH46xJk5Guy7P33qVmz3tI/4hS1M/cRIV/i/GGeSkwSNXXOPe4cBpt0B?= =?us-ascii?Q?h+5/nU17CKuwfZe9eMwKyOaaAAFX//RJEogCOiYeWNd2ZMHP++qoUJFH6Dp8?= =?us-ascii?Q?dSNGFguE4HGveanpI/8/FAnVxAZyd2xLbJP3Ww01AEc5KBU+oQliLWLmuvfP?= =?us-ascii?Q?sgqwOcj0Ulj95cKo5ejZY8zC3xNqWAT5930O2PVtW8x7L5vHjYdP6+oZ06ye?= =?us-ascii?Q?j0JpoMSYyScyIqtfyqeZrgImYWlUCrz9vrHw3v9pR6vsA0n/jdE5/4OIeRBG?= =?us-ascii?Q?EtyF/TxyEbF6TOvDUkE+pG43FtkycaStknx1I5hNmb2+dfYuqQIHwlWYwIz+?= =?us-ascii?Q?vnWpYyxKF5zXxBPJlO0C0nD1Vh/rOdkIy/mN2o1MpzTKXi7DnMp59vgRJSgN?= =?us-ascii?Q?Dcak+YqxaGXqXjWDvLjqfXKfhjSdDiSNjgiL0ShSpjjt4I4xPvmwOkOdRlgp?= =?us-ascii?Q?NHc/R+O2183lHRsD1NQbw5oLqvRwRm12BYtzXy48BbhjbgODmVW4ceSd6PGr?= =?us-ascii?Q?+z1tHf7Ckc83oDjexMgxrZu4XZx7gijPnB1KoMhPw6ycPa+wL2uWlDoHzvJT?= =?us-ascii?Q?g+0W3KcWgIBVSW4zN7+uG8BxvQQqBrUzaiufqqIgjVjwlSy1Qxdb251KmrBz?= =?us-ascii?Q?1ZbT3P/OnvcWCzIxa3wx1JRx61QjTl7d3ff8D0q/tJP9Us8WkullCsM5TN0A?= =?us-ascii?Q?pbCyHddR3wVcivVevLRgjnrmMrXoZWn/Ep/7JVHvfqqskpNfEHDyKlp0++sw?= =?us-ascii?Q?dvxMV1/R+NpKMFnmmel0MCnyBdtFS/j0mKkWarvf5cknoVdV322Si78Dv5IP?= =?us-ascii?Q?7BMliDevydUiAWxtqYvufd1mPUWVx6pLpYVtQhY0RWjgFAUoxdy9XyTrmv7h?= =?us-ascii?Q?FbR5PLoQnhA9qlynNFC4cAtfxmFizlmgsHUqy9JN0sWD7cgB16cvJV9PG2Fm?= =?us-ascii?Q?qLRbpGuscaEpduZ/W6A59Xwi/eUGSgWMYyEnxVNQ6KbiF868s00igxaANbRH?= =?us-ascii?Q?TjSc1wLNpo1xC3fakKQBgA+RcvKVVs4DFRjMQuTswRudVi5DxTQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB1593;5:PQJj3TI80CzsMevh0k0rbgok07aghP/tUXXPR9/tAvcN0+aA2pSldgLJtOCiGY1tjsdWRvosJvmW/i/t3U2lAxKDXxIUhwWdS6a6Mcsd0UZfp4qUkX2utiw367LFBSngs6/TmCmitT+vtYnsRSG2eOP446BAnCPiy7+0Jm02ImA=;24:p4uOT5YM9hGy95XP6w9dPaC0pS4sd/PCAzEvCAMM7rRvTXAprhHg87wufQF7MKllteA3n4oSScakUVbvdifBIl4d/9mmM8+9LJPU+rU1b9k= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2016 11:07:00.3404 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1593 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8152 Lines: 300 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 Tested-by: Alexander Stein Acked-by: Marc Zyngier --- Change log v6: 1. Change copyright - use "Freescale" instead of "NXP" v5: 1. drop nr_irqs from struct ls_scfg_msi v4: 1. do not register irq_enable irq_disable 2. shorten the chip name to "SCFG" v3: 1. call of_node_to_fwnode() v2: 1. rename ls1-msi to ls-scfg-msi 2. remove reg-names MSIIR MSIR 3. remove calling set_irq_flags() 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 diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 7e8c441..2eab96c 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -246,3 +246,8 @@ config IRQ_MXS config MVEBU_ODMI bool select GENERIC_MSI_IRQ_DOMAIN + +config LS_SCFG_MSI + def_bool y if SOC_LS1021A || ARCH_LAYERSCAPE + depends on PCI && PCI_MSI + select PCI_MSI_IRQ_DOMAIN diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index b03cfcb..ee74ceb 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -65,3 +65,4 @@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o +obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c new file mode 100644 index 0000000..02cca74c --- /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 + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 "); +MODULE_DESCRIPTION("Freescale Layerscape SCFG MSI controller driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1