From: Marc Zyngier <marc.zyngier@arm.com> To: Bjorn Helgaas <bhelgaas@google.com>, Thomas Gleixner <tglx@linutronix.de>, Jiang Liu <jiang.liu@linux.intel.com> Cc: <linux-arm-kernel@lists.infradead.org>, <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Will Deacon <Will.Deacon@arm.com>, Yijing Wang <wangyijing@huawei.com>, Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Subject: [PATCH 6/6] irqchip: gicv3-its: Get rid of struct msi_controller Date: Mon, 8 Dec 2014 20:12:23 +0000 [thread overview] Message-ID: <1418069543-21969-7-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1418069543-21969-1-git-send-email-marc.zyngier@arm.com> The GICv3 ITS only uses the msi_controller structure as a way to match the PHB with its MSI HW, and thus the msi_domain. But now that we can directly associate an msi_domain with a device, there is no use keeping this msi_controller around. Just remove all traces of msi_controller from the driver. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- drivers/irqchip/irq-gic-v3-its.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index e9d1615..5523241 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -60,7 +60,6 @@ struct its_collection { struct its_node { raw_spinlock_t lock; struct list_head entry; - struct msi_controller msi_chip; struct irq_domain *domain; void __iomem *base; unsigned long phys_base; @@ -875,7 +874,7 @@ retry_baser: if (val != tmp) { pr_err("ITS: %s: GITS_BASER%d doesn't stick: %lx %lx\n", - its->msi_chip.of_node->full_name, i, + its->domain->of_node->full_name, i, (unsigned long) val, (unsigned long) tmp); err = -ENXIO; goto out_free; @@ -1237,6 +1236,7 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) struct resource res; struct its_node *its; void __iomem *its_base; + struct irq_domain *inner_domain = NULL; u32 val; u64 baser, tmp; int err; @@ -1273,7 +1273,6 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) INIT_LIST_HEAD(&its->its_device_list); its->base = its_base; its->phys_base = res.start; - its->msi_chip.of_node = node; its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1; its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL); @@ -1307,26 +1306,22 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) its->flags |= ITS_FLAGS_CMDQ_NEEDS_FLUSHING; } - if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) { - its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its); - if (!its->domain) { + if (of_property_read_bool(node, "msi-controller")) { + inner_domain = irq_domain_add_tree(NULL, &its_domain_ops, its); + if (!inner_domain) { err = -ENOMEM; goto out_free_tables; } - its->domain->parent = parent; + inner_domain->parent = parent; - its->msi_chip.domain = pci_msi_create_irq_domain(node, - &its_pci_msi_domain_info, - its->domain); - if (!its->msi_chip.domain) { + its->domain = pci_msi_create_irq_domain(node, + &its_pci_msi_domain_info, + inner_domain); + if (!its->domain) { err = -ENOMEM; goto out_free_domains; } - - err = of_pci_msi_chip_add(&its->msi_chip); - if (err) - goto out_free_domains; } spin_lock(&its_lock); @@ -1336,10 +1331,10 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) return 0; out_free_domains: - if (its->msi_chip.domain) - irq_domain_remove(its->msi_chip.domain); if (its->domain) irq_domain_remove(its->domain); + if (inner_domain) + irq_domain_remove(inner_domain); out_free_tables: its_free_tables(its); out_free_cmd: -- 2.1.3
WARNING: multiple messages have this Message-ID (diff)
From: marc.zyngier@arm.com (Marc Zyngier) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] irqchip: gicv3-its: Get rid of struct msi_controller Date: Mon, 8 Dec 2014 20:12:23 +0000 [thread overview] Message-ID: <1418069543-21969-7-git-send-email-marc.zyngier@arm.com> (raw) In-Reply-To: <1418069543-21969-1-git-send-email-marc.zyngier@arm.com> The GICv3 ITS only uses the msi_controller structure as a way to match the PHB with its MSI HW, and thus the msi_domain. But now that we can directly associate an msi_domain with a device, there is no use keeping this msi_controller around. Just remove all traces of msi_controller from the driver. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- drivers/irqchip/irq-gic-v3-its.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index e9d1615..5523241 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -60,7 +60,6 @@ struct its_collection { struct its_node { raw_spinlock_t lock; struct list_head entry; - struct msi_controller msi_chip; struct irq_domain *domain; void __iomem *base; unsigned long phys_base; @@ -875,7 +874,7 @@ retry_baser: if (val != tmp) { pr_err("ITS: %s: GITS_BASER%d doesn't stick: %lx %lx\n", - its->msi_chip.of_node->full_name, i, + its->domain->of_node->full_name, i, (unsigned long) val, (unsigned long) tmp); err = -ENXIO; goto out_free; @@ -1237,6 +1236,7 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) struct resource res; struct its_node *its; void __iomem *its_base; + struct irq_domain *inner_domain = NULL; u32 val; u64 baser, tmp; int err; @@ -1273,7 +1273,6 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) INIT_LIST_HEAD(&its->its_device_list); its->base = its_base; its->phys_base = res.start; - its->msi_chip.of_node = node; its->ite_size = ((readl_relaxed(its_base + GITS_TYPER) >> 4) & 0xf) + 1; its->cmd_base = kzalloc(ITS_CMD_QUEUE_SZ, GFP_KERNEL); @@ -1307,26 +1306,22 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) its->flags |= ITS_FLAGS_CMDQ_NEEDS_FLUSHING; } - if (of_property_read_bool(its->msi_chip.of_node, "msi-controller")) { - its->domain = irq_domain_add_tree(NULL, &its_domain_ops, its); - if (!its->domain) { + if (of_property_read_bool(node, "msi-controller")) { + inner_domain = irq_domain_add_tree(NULL, &its_domain_ops, its); + if (!inner_domain) { err = -ENOMEM; goto out_free_tables; } - its->domain->parent = parent; + inner_domain->parent = parent; - its->msi_chip.domain = pci_msi_create_irq_domain(node, - &its_pci_msi_domain_info, - its->domain); - if (!its->msi_chip.domain) { + its->domain = pci_msi_create_irq_domain(node, + &its_pci_msi_domain_info, + inner_domain); + if (!its->domain) { err = -ENOMEM; goto out_free_domains; } - - err = of_pci_msi_chip_add(&its->msi_chip); - if (err) - goto out_free_domains; } spin_lock(&its_lock); @@ -1336,10 +1331,10 @@ static int its_probe(struct device_node *node, struct irq_domain *parent) return 0; out_free_domains: - if (its->msi_chip.domain) - irq_domain_remove(its->msi_chip.domain); if (its->domain) irq_domain_remove(its->domain); + if (inner_domain) + irq_domain_remove(inner_domain); out_free_tables: its_free_tables(its); out_free_cmd: -- 2.1.3
next prev parent reply other threads:[~2014-12-08 20:12 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-08 20:12 [PATCH 0/6] Introducing per-device MSI domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 1/6] device core: Introduce per-device MSI domain pointer Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 2/6] PCI/MSI: add hooks to populate the msi_domain field Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-09 2:03 ` Yijing Wang 2014-12-09 2:03 ` Yijing Wang 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 10:02 ` Marc Zyngier 2014-12-09 11:57 ` Yijing Wang 2014-12-09 11:57 ` Yijing Wang 2014-12-09 11:57 ` Yijing Wang 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:12 ` Marc Zyngier 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:24 ` Yijing Wang 2014-12-09 12:47 ` Jiang Liu 2014-12-09 12:47 ` Jiang Liu 2014-12-09 12:47 ` Jiang Liu 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:03 ` Marc Zyngier 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:11 ` Jiang Liu 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:27 ` Marc Zyngier 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:35 ` Jiang Liu 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 14:59 ` Marc Zyngier 2014-12-09 15:42 ` Jiang Liu 2014-12-09 15:42 ` Jiang Liu 2014-12-09 15:42 ` Jiang Liu 2014-12-09 12:57 ` Jiang Liu 2014-12-09 12:57 ` Jiang Liu 2015-01-27 0:40 ` Bjorn Helgaas 2015-01-27 0:40 ` Bjorn Helgaas 2015-01-27 0:43 ` Bjorn Helgaas 2015-01-27 0:43 ` Bjorn Helgaas 2014-12-08 20:12 ` [PATCH 3/6] PCI/MSI: of: add support for OF-provided msi_domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2015-01-27 0:41 ` Bjorn Helgaas 2015-01-27 0:41 ` Bjorn Helgaas 2014-12-08 20:12 ` [PATCH 4/6] PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` [PATCH 5/6] irqchip: GICv2m: Get rid of struct msi_controller Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier 2014-12-08 20:12 ` Marc Zyngier [this message] 2014-12-08 20:12 ` [PATCH 6/6] irqchip: gicv3-its: " Marc Zyngier
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=1418069543-21969-7-git-send-email-marc.zyngier@arm.com \ --to=marc.zyngier@arm.com \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=Will.Deacon@arm.com \ --cc=bhelgaas@google.com \ --cc=jiang.liu@linux.intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=tglx@linutronix.de \ --cc=wangyijing@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.