From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:33893 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751948AbaKIPI0 (ORCPT ); Sun, 9 Nov 2014 10:08:26 -0500 From: Jiang Liu To: Bjorn Helgaas , Benjamin Herrenschmidt , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , "Rafael J. Wysocki" , Randy Dunlap , Yinghai Lu , Borislav Petkov , Grant Likely , Marc Zyngier , Yingjoe Chen , x86@kernel.org, Matthias Brugger , Jiang Liu , Yijing Wang , Alexander Gordeev Cc: Konrad Rzeszutek Wilk , Andrew Morton , Tony Luck , Joerg Roedel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RFC Part4 v1 05/17] PCI/MSI: Move msi_set_affinity() to PCI core Date: Sun, 9 Nov 2014 23:10:27 +0800 Message-Id: <1415545839-28263-6-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1415545839-28263-1-git-send-email-jiang.liu@linux.intel.com> References: <1415545839-28263-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org List-ID: Move msi_set_affinity() to PCI core, so it could be reused later. Signed-off-by: Jiang Liu --- arch/x86/kernel/apic/msi.c | 20 ++------------------ drivers/pci/msi.c | 16 ++++++++++++++++ include/linux/msi.h | 2 ++ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 727e4254f124..0b2261fe6adf 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -53,22 +53,6 @@ static void msi_compose_msg(struct irq_data *data, struct msi_msg *msg) MSI_DATA_VECTOR(cfg->vector); } -static int msi_set_affinity(struct irq_data *data, const struct cpumask *mask, - bool force) -{ - struct irq_data *parent = data->parent_data; - struct msi_msg msg; - int ret; - - ret = parent->chip->irq_set_affinity(parent, mask, force); - if (ret >= 0 && ret != IRQ_SET_MASK_OK_DONE) { - irq_chip_compose_msi_msg(data, &msg); - __write_msi_msg(data->msi_desc, &msg); - } - - return ret; -} - /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices, * which implement the MSI or MSI-X Capability Structure. @@ -78,7 +62,7 @@ static struct irq_chip msi_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = irq_chip_ack_parent, - .irq_set_affinity = msi_set_affinity, + .irq_set_affinity = msi_domain_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = msi_compose_msg, .flags = IRQCHIP_SKIP_SET_WAKE, @@ -142,7 +126,7 @@ static struct irq_chip msi_ir_chip = { .irq_unmask = unmask_msi_irq, .irq_mask = mask_msi_irq, .irq_ack = irq_chip_ack_parent, - .irq_set_affinity = msi_set_affinity, + .irq_set_affinity = msi_domain_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, }; diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 8de7c8774fd2..49a8bd37189d 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1101,6 +1101,22 @@ int pci_enable_msix_range(struct pci_dev *dev, struct msix_entry *entries, EXPORT_SYMBOL(pci_enable_msix_range); #ifdef CONFIG_PCI_MSI_IRQ_DOMAIN +int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, + bool force) +{ + struct irq_data *parent = data->parent_data; + struct msi_msg msg; + int ret; + + ret = parent->chip->irq_set_affinity(parent, mask, force); + if (ret >= 0 && ret != IRQ_SET_MASK_OK_DONE) { + irq_chip_compose_msi_msg(data, &msg); + __write_msi_msg(data->msi_desc, &msg); + } + + return ret; +} + /* * Generate a unique ID number for each possible MSI source, the ID number * is only used within the irqdomain. diff --git a/include/linux/msi.h b/include/linux/msi.h index 662c628fc2fa..daea96489a39 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -79,6 +79,8 @@ struct msi_chip { struct irq_domain; struct irq_chip; +int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, + bool force); struct irq_domain *msi_create_irq_domain(struct device_node *of_node, struct irq_chip *chip, struct irq_domain *parent); -- 1.7.10.4