From: Hanjun Guo <hanjun.guo@linaro.org> To: Marc Zyngier <marc.zyngier@arm.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, Thomas Gleixner <tglx@linutronix.de>, Greg KH <gregkh@linuxfoundation.org>, Tomasz Nowicki <tn@semihalf.com>, Ma Jun <majun258@huawei.com>, Kefeng Wang <wangkefeng.wang@huawei.com>, Agustin Vega-Frias <agustinv@codeaurora.org>, Sinan Kaya <okaya@codeaurora.org>, charles.garcia-tobin@arm.com, huxinwei@huawei.com, yimin@huawei.com, Jon Masters <jcm@redhat.com>, Hanjun Guo <hanjun.guo@linaro.org> Subject: [PATCH v6 14/14] irqchip: mbigen: Add ACPI support Date: Mon, 2 Jan 2017 21:31:45 +0800 [thread overview] Message-ID: <1483363905-2806-15-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1483363905-2806-1-git-send-email-hanjun.guo@linaro.org> With the preparation of platform msi support and interrupt producer in DSDT, we can add mbigen ACPI support now. We are using _PRS methd to indicate number of irq pins instead of num_pins in DT to avoid _DSD usage in this case. For mbi-gen, Device(MBI0) { Name(_HID, "HISI0152") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xa0080000, 0x10000) }) Name (_PRS, ResourceTemplate() { Interrupt(ResourceProducer,...) {12,14,....} }) } For devices, Device(COM0) { Name(_HID, "ACPIIDxx") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xb0030000, 0x10000) Interrupt(ResourceConsumer,..., "\_SB.MBI0") {12} }) } With the helpe of platform msi and interrupt producer, then devices will get the virq from mbi-gen's irqdomain. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Reviewed-by: Majun <majun258@huawei.com> Tested-by: Majun <majun258@huawei.com> Tested-by: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/irq-mbigen.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index 4e11da5..17d35fa 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/module.h> @@ -180,7 +181,7 @@ static int mbigen_domain_translate(struct irq_domain *d, unsigned long *hwirq, unsigned int *type) { - if (is_of_node(fwspec->fwnode)) { + if (is_of_node(fwspec->fwnode) || is_acpi_device_node(fwspec->fwnode)) { if (fwspec->param_count != 2) return -EINVAL; @@ -271,6 +272,54 @@ static int mbigen_of_create_domain(struct platform_device *pdev, return 0; } +#ifdef CONFIG_ACPI +static acpi_status mbigen_acpi_process_resource(struct acpi_resource *ares, + void *context) +{ + struct acpi_resource_extended_irq *ext_irq; + u32 *num_irqs = context; + + switch (ares->type) { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + ext_irq = &ares->data.extended_irq; + *num_irqs += ext_irq->interrupt_count; + break; + default: + break; + } + + return AE_OK; +} + +static int mbigen_acpi_create_domain(struct platform_device *pdev, + struct mbigen_device *mgn_chip) +{ + struct irq_domain *domain; + u32 num_msis = 0; + acpi_status status; + + status = acpi_walk_resources(ACPI_HANDLE(&pdev->dev), METHOD_NAME__PRS, + mbigen_acpi_process_resource, &num_msis); + if (ACPI_FAILURE(status) || num_msis == 0) + return -EINVAL; + + domain = platform_msi_create_device_domain(&pdev->dev, num_msis, + mbigen_write_msg, + &mbigen_domain_ops, + mgn_chip); + if (!domain) + return -ENOMEM; + + return 0; +} +#else +static int mbigen_acpi_create_domain(struct platform_device *pdev, + struct mbigen_device *mgn_chip) +{ + return -ENODEV; +} +#endif + static int mbigen_device_probe(struct platform_device *pdev) { struct mbigen_device *mgn_chip; @@ -288,9 +337,17 @@ static int mbigen_device_probe(struct platform_device *pdev) if (IS_ERR(mgn_chip->base)) return PTR_ERR(mgn_chip->base); - err = mbigen_of_create_domain(pdev, mgn_chip); - if (err) + if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) + err = mbigen_of_create_domain(pdev, mgn_chip); + else if (ACPI_COMPANION(&pdev->dev)) + err = mbigen_acpi_create_domain(pdev, mgn_chip); + else + err = -EINVAL; + + if (err) { + dev_err(&pdev->dev, "Failed to create mbi-gen@%p irqdomain", mgn_chip->base); return err; + } platform_set_drvdata(pdev, mgn_chip); return 0; @@ -302,10 +359,17 @@ static int mbigen_device_probe(struct platform_device *pdev) }; MODULE_DEVICE_TABLE(of, mbigen_of_match); +static const struct acpi_device_id mbigen_acpi_match[] = { + { "HISI0152", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match); + static struct platform_driver mbigen_platform_driver = { .driver = { .name = "Hisilicon MBIGEN-V2", .of_match_table = mbigen_of_match, + .acpi_match_table = ACPI_PTR(mbigen_acpi_match), }, .probe = mbigen_device_probe, }; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: hanjun.guo@linaro.org (Hanjun Guo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 14/14] irqchip: mbigen: Add ACPI support Date: Mon, 2 Jan 2017 21:31:45 +0800 [thread overview] Message-ID: <1483363905-2806-15-git-send-email-hanjun.guo@linaro.org> (raw) In-Reply-To: <1483363905-2806-1-git-send-email-hanjun.guo@linaro.org> With the preparation of platform msi support and interrupt producer in DSDT, we can add mbigen ACPI support now. We are using _PRS methd to indicate number of irq pins instead of num_pins in DT to avoid _DSD usage in this case. For mbi-gen, Device(MBI0) { Name(_HID, "HISI0152") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xa0080000, 0x10000) }) Name (_PRS, ResourceTemplate() { Interrupt(ResourceProducer,...) {12,14,....} }) } For devices, Device(COM0) { Name(_HID, "ACPIIDxx") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xb0030000, 0x10000) Interrupt(ResourceConsumer,..., "\_SB.MBI0") {12} }) } With the helpe of platform msi and interrupt producer, then devices will get the virq from mbi-gen's irqdomain. Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Reviewed-by: Majun <majun258@huawei.com> Tested-by: Majun <majun258@huawei.com> Tested-by: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/irq-mbigen.c | 70 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index 4e11da5..17d35fa 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -16,6 +16,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/module.h> @@ -180,7 +181,7 @@ static int mbigen_domain_translate(struct irq_domain *d, unsigned long *hwirq, unsigned int *type) { - if (is_of_node(fwspec->fwnode)) { + if (is_of_node(fwspec->fwnode) || is_acpi_device_node(fwspec->fwnode)) { if (fwspec->param_count != 2) return -EINVAL; @@ -271,6 +272,54 @@ static int mbigen_of_create_domain(struct platform_device *pdev, return 0; } +#ifdef CONFIG_ACPI +static acpi_status mbigen_acpi_process_resource(struct acpi_resource *ares, + void *context) +{ + struct acpi_resource_extended_irq *ext_irq; + u32 *num_irqs = context; + + switch (ares->type) { + case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: + ext_irq = &ares->data.extended_irq; + *num_irqs += ext_irq->interrupt_count; + break; + default: + break; + } + + return AE_OK; +} + +static int mbigen_acpi_create_domain(struct platform_device *pdev, + struct mbigen_device *mgn_chip) +{ + struct irq_domain *domain; + u32 num_msis = 0; + acpi_status status; + + status = acpi_walk_resources(ACPI_HANDLE(&pdev->dev), METHOD_NAME__PRS, + mbigen_acpi_process_resource, &num_msis); + if (ACPI_FAILURE(status) || num_msis == 0) + return -EINVAL; + + domain = platform_msi_create_device_domain(&pdev->dev, num_msis, + mbigen_write_msg, + &mbigen_domain_ops, + mgn_chip); + if (!domain) + return -ENOMEM; + + return 0; +} +#else +static int mbigen_acpi_create_domain(struct platform_device *pdev, + struct mbigen_device *mgn_chip) +{ + return -ENODEV; +} +#endif + static int mbigen_device_probe(struct platform_device *pdev) { struct mbigen_device *mgn_chip; @@ -288,9 +337,17 @@ static int mbigen_device_probe(struct platform_device *pdev) if (IS_ERR(mgn_chip->base)) return PTR_ERR(mgn_chip->base); - err = mbigen_of_create_domain(pdev, mgn_chip); - if (err) + if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node) + err = mbigen_of_create_domain(pdev, mgn_chip); + else if (ACPI_COMPANION(&pdev->dev)) + err = mbigen_acpi_create_domain(pdev, mgn_chip); + else + err = -EINVAL; + + if (err) { + dev_err(&pdev->dev, "Failed to create mbi-gen@%p irqdomain", mgn_chip->base); return err; + } platform_set_drvdata(pdev, mgn_chip); return 0; @@ -302,10 +359,17 @@ static int mbigen_device_probe(struct platform_device *pdev) }; MODULE_DEVICE_TABLE(of, mbigen_of_match); +static const struct acpi_device_id mbigen_acpi_match[] = { + { "HISI0152", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, mbigen_acpi_match); + static struct platform_driver mbigen_platform_driver = { .driver = { .name = "Hisilicon MBIGEN-V2", .of_match_table = mbigen_of_match, + .acpi_match_table = ACPI_PTR(mbigen_acpi_match), }, .probe = mbigen_device_probe, }; -- 1.9.1
next prev parent reply other threads:[~2017-01-02 13:34 UTC|newest] Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-02 13:31 [PATCH v6 00/14] ACPI platform MSI support and its example mbigen Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 01/14] ACPI: ARM64: IORT: minor cleanup for iort_match_node_callback() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-03 14:08 ` Lorenzo Pieralisi 2017-01-04 7:56 ` Hanjun Guo 2017-01-04 7:56 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 02/14] irqchip: gic-v3-its: keep the head file include in alphabetic order Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 10:20 ` Matthias Brugger 2017-01-11 14:16 ` Hanjun Guo 2017-01-11 14:16 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 03/14] ACPI: ARM64: IORT: add missing comment for iort_dev_find_its_id() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 14:34 ` Lorenzo Pieralisi 2017-01-04 14:34 ` Lorenzo Pieralisi 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 6:05 ` Hanjun Guo 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-05 9:53 ` Lorenzo Pieralisi 2017-01-02 13:31 ` [PATCH v6 04/14] irqchip: gicv3-its: platform-msi: refactor its_pmsi_prepare() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-11 10:31 ` Matthias Brugger 2017-01-11 10:31 ` Matthias Brugger 2017-01-02 13:31 ` [PATCH v6 05/14] ACPI: platform-msi: retrieve dev id from IORT Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-03 8:43 ` Tomasz Nowicki 2017-01-03 8:43 ` Tomasz Nowicki 2017-01-03 9:37 ` Tomasz Nowicki 2017-01-03 9:37 ` Tomasz Nowicki 2017-01-03 11:24 ` Tomasz Nowicki 2017-01-03 11:24 ` Tomasz Nowicki 2017-01-04 19:18 ` Lorenzo Pieralisi 2017-01-04 19:18 ` Lorenzo Pieralisi 2017-01-05 12:45 ` Hanjun Guo 2017-01-05 12:45 ` Hanjun Guo 2017-01-05 15:15 ` Lorenzo Pieralisi 2017-01-05 15:15 ` Lorenzo Pieralisi 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 13:39 ` Hanjun Guo 2017-01-10 14:57 ` Lorenzo Pieralisi 2017-01-10 14:57 ` Lorenzo Pieralisi 2017-01-11 14:15 ` Hanjun Guo 2017-01-11 14:15 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 06/14] irqchip: gicv3-its: platform-msi: refactor its_pmsi_init() to prepare for ACPI Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-03 7:41 ` Tomasz Nowicki 2017-01-03 7:41 ` Tomasz Nowicki 2017-01-04 7:02 ` Hanjun Guo 2017-01-04 7:02 ` Hanjun Guo 2017-01-04 7:29 ` Tomasz Nowicki 2017-01-04 7:29 ` Tomasz Nowicki 2017-01-04 8:25 ` Hanjun Guo 2017-01-04 8:25 ` Hanjun Guo 2017-01-04 9:02 ` Marc Zyngier 2017-01-04 9:02 ` Marc Zyngier 2017-01-04 10:19 ` Hanjun Guo 2017-01-04 10:19 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 07/14] irqchip: gicv3-its: platform-msi: scan MADT to create platform msi domain Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 08/14] ACPI: ARM64: IORT: rework iort_node_get_id() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 17:58 ` Lorenzo Pieralisi 2017-01-04 17:58 ` Lorenzo Pieralisi 2017-01-05 8:19 ` Hanjun Guo 2017-01-05 8:19 ` Hanjun Guo 2017-01-05 8:19 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 09/14] ACPI: platform: setup MSI domain for ACPI based platform device Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 21:17 ` Rafael J. Wysocki 2017-01-02 13:31 ` [PATCH v6 10/14] ACPI: ARM64: IORT: rework iort_node_get_id() for NC->SMMU->ITS case Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 22:30 ` Sinan Kaya 2017-01-02 22:30 ` Sinan Kaya 2017-01-02 22:30 ` Sinan Kaya 2017-01-03 0:08 ` Hanjun Guo 2017-01-03 0:08 ` Hanjun Guo 2017-01-03 0:08 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 11/14] msi: platform: make platform_msi_create_device_domain() ACPI aware Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-04 16:49 ` Lorenzo Pieralisi 2017-01-04 16:49 ` Lorenzo Pieralisi 2017-01-02 13:31 ` [PATCH v6 12/14] irqchip: mbigen: drop module owner Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` [PATCH v6 13/14] irqchip: mbigen: introduce mbigen_of_create_domain() Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo 2017-01-02 13:31 ` Hanjun Guo [this message] 2017-01-02 13:31 ` [PATCH v6 14/14] irqchip: mbigen: Add ACPI support Hanjun Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1483363905-2806-15-git-send-email-hanjun.guo@linaro.org \ --to=hanjun.guo@linaro.org \ --cc=agustinv@codeaurora.org \ --cc=charles.garcia-tobin@arm.com \ --cc=gregkh@linuxfoundation.org \ --cc=huxinwei@huawei.com \ --cc=jcm@redhat.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=lorenzo.pieralisi@arm.com \ --cc=majun258@huawei.com \ --cc=marc.zyngier@arm.com \ --cc=okaya@codeaurora.org \ --cc=rjw@rjwysocki.net \ --cc=tglx@linutronix.de \ --cc=tn@semihalf.com \ --cc=wangkefeng.wang@huawei.com \ --cc=yimin@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.