From: Kishon Vijay Abraham I <kishon@ti.com> To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Murali Karicheri <m-karicheri2@ti.com>, Bjorn Helgaas <bhelgaas@google.com>, Jingoo Han <jingoohan1@gmail.com>, Gustavo Pimentel <gustavo.pimentel@synopsys.com>, <linux-pci@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v2 3/9] PCI: keystone: Add separate functions for configuring MSI and legacy interrupt Date: Fri, 8 Feb 2019 10:03:10 +0530 [thread overview] Message-ID: <28bc5a07-3486-6129-7fc9-d37315e34237@ti.com> (raw) In-Reply-To: <20190207154419.GB21111@e107981-ln.cambridge.arm.com> Hi, On 07/02/19 9:14 PM, Lorenzo Pieralisi wrote: > On Thu, Feb 07, 2019 at 04:39:18PM +0530, Kishon Vijay Abraham I wrote: >> ks_pcie_get_irq_controller_info() was used to configure both MSI and >> legacy interrupt. This will prevent MSI or legacy interrupt specific >> intializations. Add separate functions to configure MSI and legacy >> interrupts. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/pci/controller/dwc/pci-keystone.c | 188 +++++++++++----------- >> 1 file changed, 96 insertions(+), 92 deletions(-) >> >> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c >> index 4cf9849d5a1d..b1d01751c1af 100644 >> --- a/drivers/pci/controller/dwc/pci-keystone.c >> +++ b/drivers/pci/controller/dwc/pci-keystone.c >> @@ -87,11 +87,8 @@ struct keystone_pcie { >> struct dw_pcie *pci; >> /* PCI Device ID */ >> u32 device_id; >> - int num_legacy_host_irqs; >> - int legacy_host_irqs[PCI_NUM_INTX]; >> struct device_node *legacy_intc_np; >> >> - int num_msi_host_irqs; >> int msi_host_irqs[MAX_MSI_HOST_IRQS]; >> int num_lanes; >> u32 num_viewport; >> @@ -201,14 +198,6 @@ static int ks_pcie_msi_host_init(struct pcie_port *pp) >> return dw_pcie_allocate_domains(pp); >> } >> >> -static void ks_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie) >> -{ >> - int i; >> - >> - for (i = 0; i < PCI_NUM_INTX; i++) >> - ks_pcie_app_writel(ks_pcie, IRQ_ENABLE_SET(i), 0x1); >> -} >> - >> static void ks_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, >> int offset) >> { >> @@ -490,17 +479,6 @@ static int __init ks_pcie_dw_host_init(struct keystone_pcie *ks_pcie) >> >> ks_pcie->app = *res; >> >> - /* Create legacy IRQ domain */ >> - ks_pcie->legacy_irq_domain = >> - irq_domain_add_linear(ks_pcie->legacy_intc_np, >> - PCI_NUM_INTX, >> - &ks_pcie_legacy_irq_domain_ops, >> - NULL); >> - if (!ks_pcie->legacy_irq_domain) { >> - dev_err(dev, "Failed to add irq domain for legacy irqs\n"); >> - return -EINVAL; >> - } >> - >> return dw_pcie_host_init(pp); >> } >> >> @@ -624,85 +602,117 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc) >> chained_irq_exit(chip, desc); >> } >> >> -static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, >> - char *controller, int *num_irqs) >> +static int ks_pcie_config_msi_irq(struct keystone_pcie *ks_pcie) >> { >> - int temp, max_host_irqs, legacy = 1, *host_irqs; >> struct device *dev = ks_pcie->pci->dev; >> - struct device_node *np_pcie = dev->of_node, **np_temp; >> - >> - if (!strcmp(controller, "msi-interrupt-controller")) >> - legacy = 0; >> - >> - if (legacy) { >> - np_temp = &ks_pcie->legacy_intc_np; >> - max_host_irqs = PCI_NUM_INTX; >> - host_irqs = &ks_pcie->legacy_host_irqs[0]; >> - } else { >> - np_temp = &ks_pcie->msi_intc_np; >> - max_host_irqs = MAX_MSI_HOST_IRQS; >> - host_irqs = &ks_pcie->msi_host_irqs[0]; >> - } >> + struct device_node *np = ks_pcie->np; >> + struct device_node *intc_np; >> + int irq_count; >> + int irq; >> + int ret; >> + int i; > > Nit: all int can be in one line. Okay. > >> - /* interrupt controller is in a child node */ >> - *np_temp = of_get_child_by_name(np_pcie, controller); >> - if (!(*np_temp)) { >> - dev_err(dev, "Node for %s is absent\n", controller); >> - return -EINVAL; >> - } >> + if (!IS_ENABLED(CONFIG_PCI_MSI)) >> + return 0; >> >> - temp = of_irq_count(*np_temp); >> - if (!temp) { >> - dev_err(dev, "No IRQ entries in %s\n", controller); >> - of_node_put(*np_temp); >> + intc_np = of_get_child_by_name(np, "msi-interrupt-controller"); >> + if (!intc_np) { >> + dev_WARN(dev, "msi-interrupt-controller node is absent\n"); > > I do not think you can justify a backtrace for this error path, so > convert it to a dev_warn() please. Sure. > >> return -EINVAL; >> } >> >> - if (temp > max_host_irqs) >> - dev_warn(dev, "Too many %s interrupts defined %u\n", >> - (legacy ? "legacy" : "MSI"), temp); >> + irq_count = of_irq_count(intc_np); >> + if (!irq_count) { >> + dev_err(dev, "No IRQ entries in msi-interrupt-controller\n"); >> + ret = -EINVAL; >> + goto err; >> + } >> >> - /* >> - * support upto max_host_irqs. In dt from index 0 to 3 (legacy) or 0 to >> - * 7 (MSI) >> - */ >> - for (temp = 0; temp < max_host_irqs; temp++) { >> - host_irqs[temp] = irq_of_parse_and_map(*np_temp, temp); >> - if (!host_irqs[temp]) >> - break; >> + if (irq_count > MAX_MSI_HOST_IRQS) { >> + dev_warn(dev, "Too many MSI interrupt lines defined %u\n", >> + irq_count); >> + irq_count = MAX_MSI_HOST_IRQS; >> } >> >> - of_node_put(*np_temp); >> + for (i = 0; i < irq_count; i++) { >> + irq = irq_of_parse_and_map(intc_np, i); >> + if (!irq) { >> + ret = -EINVAL; >> + goto err; >> + } >> + ks_pcie->msi_host_irqs[i] = irq; >> >> - if (temp) { >> - *num_irqs = temp; >> - return 0; >> + irq_set_chained_handler_and_data(irq, ks_pcie_msi_irq_handler, >> + ks_pcie); >> } >> >> - return -EINVAL; >> + of_node_put(intc_np); >> + return 0; >> + >> +err: >> + of_node_put(intc_np); >> + return ret; >> } >> >> -static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) >> +static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) >> { >> + struct device *dev = ks_pcie->pci->dev; >> + struct irq_domain *legacy_irq_domain; >> + struct device_node *np = ks_pcie->np; >> + struct device_node *intc_np; >> + int irq_count; >> + int irq; >> + int ret; >> int i; >> >> - /* Legacy IRQ */ >> - for (i = 0; i < ks_pcie->num_legacy_host_irqs; i++) { >> - irq_set_chained_handler_and_data(ks_pcie->legacy_host_irqs[i], >> + intc_np = of_get_child_by_name(np, "legacy-interrupt-controller"); >> + if (!intc_np) { >> + dev_WARN(dev, "legacy-interrupt-controller node is absent\n"); > > Likewise. Okay. Thanks Kishon
WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com> To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Jingoo Han <jingoohan1@gmail.com>, linux-kernel@vger.kernel.org, Murali Karicheri <m-karicheri2@ti.com>, linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>, Gustavo Pimentel <gustavo.pimentel@synopsys.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 3/9] PCI: keystone: Add separate functions for configuring MSI and legacy interrupt Date: Fri, 8 Feb 2019 10:03:10 +0530 [thread overview] Message-ID: <28bc5a07-3486-6129-7fc9-d37315e34237@ti.com> (raw) In-Reply-To: <20190207154419.GB21111@e107981-ln.cambridge.arm.com> Hi, On 07/02/19 9:14 PM, Lorenzo Pieralisi wrote: > On Thu, Feb 07, 2019 at 04:39:18PM +0530, Kishon Vijay Abraham I wrote: >> ks_pcie_get_irq_controller_info() was used to configure both MSI and >> legacy interrupt. This will prevent MSI or legacy interrupt specific >> intializations. Add separate functions to configure MSI and legacy >> interrupts. >> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> drivers/pci/controller/dwc/pci-keystone.c | 188 +++++++++++----------- >> 1 file changed, 96 insertions(+), 92 deletions(-) >> >> diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c >> index 4cf9849d5a1d..b1d01751c1af 100644 >> --- a/drivers/pci/controller/dwc/pci-keystone.c >> +++ b/drivers/pci/controller/dwc/pci-keystone.c >> @@ -87,11 +87,8 @@ struct keystone_pcie { >> struct dw_pcie *pci; >> /* PCI Device ID */ >> u32 device_id; >> - int num_legacy_host_irqs; >> - int legacy_host_irqs[PCI_NUM_INTX]; >> struct device_node *legacy_intc_np; >> >> - int num_msi_host_irqs; >> int msi_host_irqs[MAX_MSI_HOST_IRQS]; >> int num_lanes; >> u32 num_viewport; >> @@ -201,14 +198,6 @@ static int ks_pcie_msi_host_init(struct pcie_port *pp) >> return dw_pcie_allocate_domains(pp); >> } >> >> -static void ks_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie) >> -{ >> - int i; >> - >> - for (i = 0; i < PCI_NUM_INTX; i++) >> - ks_pcie_app_writel(ks_pcie, IRQ_ENABLE_SET(i), 0x1); >> -} >> - >> static void ks_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, >> int offset) >> { >> @@ -490,17 +479,6 @@ static int __init ks_pcie_dw_host_init(struct keystone_pcie *ks_pcie) >> >> ks_pcie->app = *res; >> >> - /* Create legacy IRQ domain */ >> - ks_pcie->legacy_irq_domain = >> - irq_domain_add_linear(ks_pcie->legacy_intc_np, >> - PCI_NUM_INTX, >> - &ks_pcie_legacy_irq_domain_ops, >> - NULL); >> - if (!ks_pcie->legacy_irq_domain) { >> - dev_err(dev, "Failed to add irq domain for legacy irqs\n"); >> - return -EINVAL; >> - } >> - >> return dw_pcie_host_init(pp); >> } >> >> @@ -624,85 +602,117 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc) >> chained_irq_exit(chip, desc); >> } >> >> -static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, >> - char *controller, int *num_irqs) >> +static int ks_pcie_config_msi_irq(struct keystone_pcie *ks_pcie) >> { >> - int temp, max_host_irqs, legacy = 1, *host_irqs; >> struct device *dev = ks_pcie->pci->dev; >> - struct device_node *np_pcie = dev->of_node, **np_temp; >> - >> - if (!strcmp(controller, "msi-interrupt-controller")) >> - legacy = 0; >> - >> - if (legacy) { >> - np_temp = &ks_pcie->legacy_intc_np; >> - max_host_irqs = PCI_NUM_INTX; >> - host_irqs = &ks_pcie->legacy_host_irqs[0]; >> - } else { >> - np_temp = &ks_pcie->msi_intc_np; >> - max_host_irqs = MAX_MSI_HOST_IRQS; >> - host_irqs = &ks_pcie->msi_host_irqs[0]; >> - } >> + struct device_node *np = ks_pcie->np; >> + struct device_node *intc_np; >> + int irq_count; >> + int irq; >> + int ret; >> + int i; > > Nit: all int can be in one line. Okay. > >> - /* interrupt controller is in a child node */ >> - *np_temp = of_get_child_by_name(np_pcie, controller); >> - if (!(*np_temp)) { >> - dev_err(dev, "Node for %s is absent\n", controller); >> - return -EINVAL; >> - } >> + if (!IS_ENABLED(CONFIG_PCI_MSI)) >> + return 0; >> >> - temp = of_irq_count(*np_temp); >> - if (!temp) { >> - dev_err(dev, "No IRQ entries in %s\n", controller); >> - of_node_put(*np_temp); >> + intc_np = of_get_child_by_name(np, "msi-interrupt-controller"); >> + if (!intc_np) { >> + dev_WARN(dev, "msi-interrupt-controller node is absent\n"); > > I do not think you can justify a backtrace for this error path, so > convert it to a dev_warn() please. Sure. > >> return -EINVAL; >> } >> >> - if (temp > max_host_irqs) >> - dev_warn(dev, "Too many %s interrupts defined %u\n", >> - (legacy ? "legacy" : "MSI"), temp); >> + irq_count = of_irq_count(intc_np); >> + if (!irq_count) { >> + dev_err(dev, "No IRQ entries in msi-interrupt-controller\n"); >> + ret = -EINVAL; >> + goto err; >> + } >> >> - /* >> - * support upto max_host_irqs. In dt from index 0 to 3 (legacy) or 0 to >> - * 7 (MSI) >> - */ >> - for (temp = 0; temp < max_host_irqs; temp++) { >> - host_irqs[temp] = irq_of_parse_and_map(*np_temp, temp); >> - if (!host_irqs[temp]) >> - break; >> + if (irq_count > MAX_MSI_HOST_IRQS) { >> + dev_warn(dev, "Too many MSI interrupt lines defined %u\n", >> + irq_count); >> + irq_count = MAX_MSI_HOST_IRQS; >> } >> >> - of_node_put(*np_temp); >> + for (i = 0; i < irq_count; i++) { >> + irq = irq_of_parse_and_map(intc_np, i); >> + if (!irq) { >> + ret = -EINVAL; >> + goto err; >> + } >> + ks_pcie->msi_host_irqs[i] = irq; >> >> - if (temp) { >> - *num_irqs = temp; >> - return 0; >> + irq_set_chained_handler_and_data(irq, ks_pcie_msi_irq_handler, >> + ks_pcie); >> } >> >> - return -EINVAL; >> + of_node_put(intc_np); >> + return 0; >> + >> +err: >> + of_node_put(intc_np); >> + return ret; >> } >> >> -static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) >> +static int ks_pcie_config_legacy_irq(struct keystone_pcie *ks_pcie) >> { >> + struct device *dev = ks_pcie->pci->dev; >> + struct irq_domain *legacy_irq_domain; >> + struct device_node *np = ks_pcie->np; >> + struct device_node *intc_np; >> + int irq_count; >> + int irq; >> + int ret; >> int i; >> >> - /* Legacy IRQ */ >> - for (i = 0; i < ks_pcie->num_legacy_host_irqs; i++) { >> - irq_set_chained_handler_and_data(ks_pcie->legacy_host_irqs[i], >> + intc_np = of_get_child_by_name(np, "legacy-interrupt-controller"); >> + if (!intc_np) { >> + dev_WARN(dev, "legacy-interrupt-controller node is absent\n"); > > Likewise. Okay. Thanks Kishon _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-08 4:33 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-07 11:09 [PATCH v2 0/9] PCI: DWC/Keystone: MSI configuration cleanup Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 1/9] PCI: keystone: Cleanup interrupt related macros Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 2/9] PCI: keystone: Modify legacy_irq_handler to check the IRQ_STATUS of INTA/B/C/D Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 16:15 ` Lorenzo Pieralisi 2019-02-07 16:15 ` Lorenzo Pieralisi 2019-02-08 4:32 ` Kishon Vijay Abraham I 2019-02-08 4:32 ` Kishon Vijay Abraham I 2019-02-07 20:52 ` Bjorn Helgaas 2019-02-07 20:52 ` Bjorn Helgaas 2019-02-08 11:09 ` Kishon Vijay Abraham I 2019-02-08 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 3/9] PCI: keystone: Add separate functions for configuring MSI and legacy interrupt Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 15:44 ` Lorenzo Pieralisi 2019-02-07 15:44 ` Lorenzo Pieralisi 2019-02-08 4:33 ` Kishon Vijay Abraham I [this message] 2019-02-08 4:33 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 4/9] PCI: keystone: Use hwirq to get the IRQ number offset Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 5/9] PCI: keystone: Cleanup ks_pcie_msi_irq_handler and ks_pcie_legacy_irq_handler Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 6/9] PCI: dwc: Add support to use non default msi_irq_chip Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 16:48 ` Lorenzo Pieralisi 2019-02-07 16:48 ` Lorenzo Pieralisi 2019-02-08 4:46 ` Kishon Vijay Abraham I 2019-02-08 4:46 ` Kishon Vijay Abraham I 2019-02-08 10:22 ` Lorenzo Pieralisi 2019-02-08 10:22 ` Lorenzo Pieralisi 2019-02-07 20:56 ` Bjorn Helgaas 2019-02-07 20:56 ` Bjorn Helgaas 2019-02-07 11:09 ` [PATCH v2 7/9] PCI: keystone: Use Keystone specific msi_irq_chip Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 11:09 ` [PATCH v2 8/9] PCI: dwc: Remove Keystone specific dw_pcie_host_ops Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I 2019-02-07 18:45 ` Trent Piepho 2019-02-07 18:45 ` Trent Piepho 2019-02-07 21:26 ` Bjorn Helgaas 2019-02-07 21:26 ` Bjorn Helgaas 2019-02-08 5:13 ` Kishon Vijay Abraham I 2019-02-08 5:13 ` Kishon Vijay Abraham I 2019-02-08 14:05 ` Bjorn Helgaas 2019-02-08 14:05 ` Bjorn Helgaas 2019-02-07 11:09 ` [PATCH v2 9/9] PCI: dwc: Do not write to MSI control registers if the platform doesn't use it Kishon Vijay Abraham I 2019-02-07 11:09 ` Kishon Vijay Abraham I
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=28bc5a07-3486-6129-7fc9-d37315e34237@ti.com \ --to=kishon@ti.com \ --cc=bhelgaas@google.com \ --cc=gustavo.pimentel@synopsys.com \ --cc=jingoohan1@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=m-karicheri2@ti.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.