From: wangyijing@huawei•com (Yijing Wang)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 24/27] IA64/MSI: Use MSI chip framework to configure MSI/MSI-X irq
Date: Thu, 23 Oct 2014 09:17:19 +0800 [thread overview]
Message-ID: <5448571F.6030105@huawei.com> (raw)
In-Reply-To: <20141022235345.GE4795@google.com>
On 2014/10/23 7:53, Bjorn Helgaas wrote:
> On Wed, Oct 15, 2014 at 11:07:12AM +0800, Yijing Wang wrote:
>> Use MSI chip framework instead of arch MSI functions to configure
>> MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework.
>
> This needs slightly more detail. You're using the MSI chip framework
> "instead of arch MSI functions". Well, there are still arch-specific
> functions, i.e., arch_ia64_setup_msi_irq() and
> arch_ia64_teardown_msi_irq().
>
> We used to have arch_setup_msi_irq() which had a weak default
> implementation, and a strong arch-specific implementation here, and you're
> replacing that model with the new "msi-ops" model. I don't know how you
> want to write that, but it's not that you're getting rid of the
> arch-specific code; you're keeping arch-specific code but structuring it
> differently.
Hm, I will rename the msi-ops functions.
>
>> Signed-off-by: Yijing Wang <wangyijing@huawei•com>
>> ---
>> arch/ia64/include/asm/pci.h | 10 ++++++++++
>> arch/ia64/kernel/msi_ia64.c | 14 ++++++++++----
>> arch/ia64/pci/pci.c | 1 +
>> 3 files changed, 21 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
>> index 52af5ed..907dcba 100644
>> --- a/arch/ia64/include/asm/pci.h
>> +++ b/arch/ia64/include/asm/pci.h
>> @@ -94,6 +94,7 @@ struct pci_controller {
>> int segment;
>> int node; /* nearest node with memory or NUMA_NO_NODE for global allocation */
>>
>> + struct msi_chip *msi_chip;
>> void *platform_data;
>> };
>>
>> @@ -101,6 +102,15 @@ struct pci_controller {
>> #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata)
>> #define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment)
>>
>> +extern struct msi_chip chip;
>
> Please make this name more descriptive. "chip" is way too generic for a
> global name.
OK, what about rename it to ia64_msi_chip, and rename the original static irq_chip ia64_msi_chip to
static irq_chip msi_chip like in x86.
>
>> +static inline struct msi_chip *pci_msi_chip(struct pci_bus *bus)
>> +{
>> + struct pci_controller *ctrl = bus->sysdata;
>> +
>> + return ctrl->msi_chip;
>> +}
>> +
>> extern struct pci_ops pci_root_ops;
>>
>> static inline int pci_proc_domain(struct pci_bus *bus)
>> diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
>> index 8c3730c..401fc98 100644
>> --- a/arch/ia64/kernel/msi_ia64.c
>> +++ b/arch/ia64/kernel/msi_ia64.c
>> @@ -112,15 +112,16 @@ static struct irq_chip ia64_msi_chip = {
>> };
>>
>>
>> -int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
>> +static int arch_ia64_setup_msi_irq(struct msi_chip *chip,
>> + struct pci_dev *dev, struct msi_desc *desc)
>> {
>> if (platform_setup_msi_irq)
>> - return platform_setup_msi_irq(pdev, desc);
>> + return platform_setup_msi_irq(dev, desc);
>>
>> - return ia64_setup_msi_irq(pdev, desc);
>> + return ia64_setup_msi_irq(dev, desc);
>
> Please don't make gratuitous changes ("pdev" -> "dev") at the same time,
> especially since the rest of the file still uses "pdev".
OK.
>
>> }
>>
>> -void arch_teardown_msi_irq(unsigned int irq)
>> +static void arch_ia64_teardown_msi_irq(struct msi_chip *chip, unsigned int irq)
>> {
>> if (platform_teardown_msi_irq)
>> return platform_teardown_msi_irq(irq);
>> @@ -128,6 +129,11 @@ void arch_teardown_msi_irq(unsigned int irq)
>> return ia64_teardown_msi_irq(irq);
>> }
>>
>> +struct msi_chip chip = {
>> + .setup_irq = arch_ia64_setup_msi_irq,
>> + .teardown_irq = arch_ia64_teardown_msi_irq,
>> +};
>> +
>> #ifdef CONFIG_INTEL_IOMMU
>> #ifdef CONFIG_SMP
>> static int dmar_msi_set_affinity(struct irq_data *data,
>> diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
>> index 291a582..299b67d 100644
>> --- a/arch/ia64/pci/pci.c
>> +++ b/arch/ia64/pci/pci.c
>> @@ -437,6 +437,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
>>
>> controller->companion = device;
>> controller->node = acpi_get_node(device->handle);
>> + controller->msi_chip = &chip;
>>
>> info = kzalloc(sizeof(*info), GFP_KERNEL);
>> if (!info) {
>> --
>> 1.7.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>
> .
>
--
Thanks!
Yijing
next prev parent reply other threads:[~2014-10-23 1:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-15 3:06 [PATCH v3 00/27] Use MSI chip framework to configure MSI/MSI-X in all platforms Yijing Wang
2014-10-15 3:06 ` [PATCH v3 01/27] MSI: Remove the redundant irq_set_chip_data() Yijing Wang
2014-10-15 3:06 ` [PATCH v3 02/27] x86/xen/MSI: Eliminate arch_msix_mask_irq() and arch_msi_mask_irq() Yijing Wang
2014-10-23 4:25 ` Bjorn Helgaas
2014-10-23 4:44 ` Yijing Wang
2014-10-15 3:06 ` [PATCH v3 03/27] s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq() Yijing Wang
2014-10-15 3:06 ` [PATCH v3 04/27] arm/MSI: Save MSI chip in pci_sys_data Yijing Wang
2014-10-20 17:21 ` Lorenzo Pieralisi
2014-10-21 1:32 ` Yijing Wang
2014-10-23 5:35 ` Bjorn Helgaas
2014-10-23 6:32 ` Yijing Wang
2014-10-15 3:06 ` [PATCH v3 05/27] PCI: tegra: Save msi " Yijing Wang
2014-10-23 5:18 ` Bjorn Helgaas
2014-10-23 6:23 ` Yijing Wang
2014-10-15 3:06 ` [PATCH v3 06/27] PCI: designware: " Yijing Wang
2014-10-15 3:06 ` [PATCH v3 07/27] PCI: rcar: " Yijing Wang
2014-10-15 3:06 ` [PATCH v3 08/27] PCI: mvebu: " Yijing Wang
2014-10-15 3:06 ` [PATCH v3 09/27] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Yijing Wang
2014-10-23 5:38 ` Bjorn Helgaas
2014-10-23 6:39 ` Yijing Wang
2014-10-15 3:06 ` [PATCH v3 10/27] PCI/MSI: Remove useless bus->msi assignment Yijing Wang
2014-10-23 5:41 ` Bjorn Helgaas
2014-10-23 6:40 ` Yijing Wang
2014-10-15 3:06 ` [PATCH v3 11/27] PCI/MSI: Refactor struct msi_chip to make it become more common Yijing Wang
2014-10-15 3:07 ` [PATCH v3 12/27] x86/MSI: Use MSI chip framework to configure MSI/MSI-X irq Yijing Wang
2014-10-15 3:07 ` [PATCH v3 13/27] x86/xen/MSI: " Yijing Wang
2014-10-15 3:07 ` [PATCH v3 14/27] Irq_remapping/MSI: " Yijing Wang
2014-10-15 3:07 ` [PATCH v3 15/27] x86/MSI: Remove unused MSI weak arch functions Yijing Wang
2014-10-15 3:07 ` [PATCH v3 16/27] Mips/MSI: Save msi chip in pci sysdata Yijing Wang
2014-10-25 13:04 ` Ralf Baechle
2014-10-27 1:06 ` Yijing Wang
2014-10-15 3:07 ` [PATCH v3 17/27] MIPS/Octeon/MSI: Use MSI chip framework to configure MSI/MSI-X irq Yijing Wang
2014-10-15 3:07 ` [PATCH v3 18/27] MIPS/Xlp: Remove the dead function destroy_irq() to fix build error Yijing Wang
2014-10-25 13:11 ` Ralf Baechle
2014-10-15 3:07 ` [PATCH v3 19/27] MIPS/Xlp/MSI: Use MSI chip framework to configure MSI/MSI-X irq Yijing Wang
2014-10-15 3:07 ` [PATCH v3 20/27] MIPS/Xlr/MSI: " Yijing Wang
2014-10-15 3:07 ` [PATCH v3 21/27] Powerpc/MSI: " Yijing Wang
2014-10-17 7:23 ` Michael Ellerman
2014-10-17 7:42 ` Yijing Wang
2014-10-15 3:07 ` [PATCH v3 22/27] s390/MSI: " Yijing Wang
2014-10-16 12:13 ` Sebastian Ott
2014-10-17 1:04 ` Yijing Wang
2014-10-15 3:07 ` [PATCH v3 23/27] arm/iop13xx/MSI: " Yijing Wang
2014-10-15 3:07 ` [PATCH v3 24/27] IA64/MSI: " Yijing Wang
2014-10-22 23:53 ` Bjorn Helgaas
2014-10-23 1:17 ` Yijing Wang [this message]
2014-10-15 3:07 ` [PATCH v3 25/27] Sparc/MSI: " Yijing Wang
2014-10-15 2:36 ` David Miller
2014-10-15 3:07 ` [PATCH v3 26/27] tile/MSI: " Yijing Wang
2014-10-15 3:07 ` [PATCH v3 27/27] PCI/MSI: Clean up unused MSI arch functions Yijing Wang
2014-10-23 5:43 ` [PATCH v3 00/27] Use MSI chip framework to configure MSI/MSI-X in all platforms Bjorn Helgaas
2014-10-23 7:45 ` Yijing Wang
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=5448571F.6030105@huawei.com \
--to=wangyijing@huawei$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox