From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755751AbcFGQM1 (ORCPT ); Tue, 7 Jun 2016 12:12:27 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:36492 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755413AbcFGQMZ (ORCPT ); Tue, 7 Jun 2016 12:12:25 -0400 Subject: Re: [PATCH V5 7/7] acpi, gicv3, its: Use MADT ITS subtable to do PCI/MSI domain initialization. To: Marc Zyngier References: <1464693584-22343-1-git-send-email-tn@semihalf.com> <1464693584-22343-8-git-send-email-tn@semihalf.com> <20160604130715.2297c87d@arm.com> Cc: tglx@linutronix.de, jason@lakedaemon.net, rjw@rjwysocki.net, lorenzo.pieralisi@arm.com, robert.richter@caviumnetworks.com, shijie.huang@arm.com, Suravee.Suthikulpanit@amd.com, hanjun.guo@linaro.org, al.stone@linaro.org, mw@semihalf.com, graeme.gregory@linaro.org, Catalin.Marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, ddaney.cavm@gmail.com, okaya@codeaurora.org, andrea.gallo@linaro.org From: Tomasz Nowicki Message-ID: <5756F264.6060405@semihalf.com> Date: Tue, 7 Jun 2016 18:12:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Firefox/38.0 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160604130715.2297c87d@arm.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04.06.2016 14:07, Marc Zyngier wrote: > On Tue, 31 May 2016 13:19:44 +0200 > Tomasz Nowicki wrote: > >> Let ACPI build ITS PCI MSI domain. ACPI is responsible for retrieving >> inner domain token and passing it on to its_pci_msi_init_one generic >> init call. >> >> We have now full PCI MSI domain stack, thus we can enable ITS initialization >> from GICv3 core driver for ACPI scenario. >> >> Signed-off-by: Tomasz Nowicki >> --- >> drivers/irqchip/irq-gic-v3-its-pci-msi.c | 42 +++++++++++++++++++++++++++++++- >> drivers/irqchip/irq-gic-v3.c | 3 +-- >> 2 files changed, 42 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c >> index 23679ae..985f5d9 100644 >> --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c >> +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c >> @@ -15,6 +15,7 @@ >> * along with this program. If not, see . >> */ >> >> +#include >> #include >> #include >> #include >> @@ -144,10 +145,49 @@ static int __init its_pci_of_msi_init(void) >> return 0; >> } >> >> +#ifdef CONFIG_ACPI >> + >> +static int __init >> +its_pci_msi_parse_madt(struct acpi_subtable_header *header, >> + const unsigned long end) >> +{ >> + struct acpi_madt_generic_translator *its_entry; >> + struct fwnode_handle *dom_handle; >> + char node_name[6 + 16 + 1]; // ITS identification name > > Jeezus... Where is that coming from? Is that the size of "ITS@0x"+16 > hex digits and a final NUL? For the sake of keeping things > maintainable/readable, please use kasprintf/kfree. kasprintf/kfree will be used here. > >> + >> + its_entry = (struct acpi_madt_generic_translator *)header; >> + snprintf(node_name, 23, "ITS@0x%lx", (long)its_entry->base_address); >> + dom_handle = iort_its_find_domain_token(its_entry->translation_id); >> + if (!dom_handle) { >> + pr_err("%s: Unable to locate ITS domain handle\n", node_name); >> + return 0; > > return 0? not even a slap on the wrist? Hum... > >> + } >> + >> + if (its_pci_msi_init_one(dom_handle, node_name)) >> + return 0; > > Same here. Yeah, decent error code are needed here. > >> + >> + pr_info("PCI/MSI: %s domain created\n", node_name); >> + return 0; >> +} >> + >> +static int __init its_pci_acpi_msi_init(void) >> +{ >> + acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR, >> + its_pci_msi_parse_madt, 0); >> + return 0; >> +} >> +#else >> +inline static int __init its_pci_acpi_msi_init(void) > > static only. OK > >> +{ >> + return 0; >> +} >> +#endif >> + >> static int __init its_pci_msi_init(void) >> { >> its_pci_of_msi_init(); >> + its_pci_acpi_msi_init(); >> + >> return 0; >> } >> - >> early_initcall(its_pci_msi_init); >> diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c >> index cee8296..41c1cda 100644 >> --- a/drivers/irqchip/irq-gic-v3.c >> +++ b/drivers/irqchip/irq-gic-v3.c >> @@ -951,8 +951,7 @@ static int __init gic_init_bases(void __iomem *dist_base, >> >> set_handle_irq(gic_handle_irq); >> >> - if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis() && >> - to_of_node(handle)) /* Temp hack to prevent ITS init for ACPI */ >> + if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis()) >> its_init(handle, &gic_data.rdists, gic_data.domain); >> >> gic_smp_init(); > Thanks for review. Tomasz