From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754133AbaKZXND (ORCPT ); Wed, 26 Nov 2014 18:13:03 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58496 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753709AbaKZXNA (ORCPT ); Wed, 26 Nov 2014 18:13:00 -0500 Date: Wed, 26 Nov 2014 15:12:07 -0800 From: tip-bot for Jiang Liu Message-ID: Cc: linux-kernel@vger.kernel.org, bp@alien8.de, benh@kernel.crashing.org, rjw@rjwysocki.net, hpa@zytor.com, tony.luck@intel.com, yinghai@kernel.org, mingo@kernel.org, jiang.liu@linux.intel.com, joro@8bytes.org, bhelgaas@google.com, konrad.wilk@oracle.com, tglx@linutronix.de, gregkh@linuxfoundation.org, rdunlap@infradead.org Reply-To: tglx@linutronix.de, bhelgaas@google.com, konrad.wilk@oracle.com, rdunlap@infradead.org, gregkh@linuxfoundation.org, rjw@rjwysocki.net, benh@kernel.crashing.org, linux-kernel@vger.kernel.org, bp@alien8.de, joro@8bytes.org, mingo@kernel.org, jiang.liu@linux.intel.com, yinghai@kernel.org, tony.luck@intel.com, hpa@zytor.com In-Reply-To: <1416894816-23245-26-git-send-email-jiang.liu@linux.intel.com> References: <1416894816-23245-26-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] PCI/MSI: Replace msi_update_msg() with irq_chip_compose_msi_msg() Git-Commit-ID: 51911edac211c75cef7c95d4874e2b1f77134a85 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 51911edac211c75cef7c95d4874e2b1f77134a85 Gitweb: http://git.kernel.org/tip/51911edac211c75cef7c95d4874e2b1f77134a85 Author: Jiang Liu AuthorDate: Tue, 25 Nov 2014 13:53:34 +0800 Committer: Thomas Gleixner CommitDate: Wed, 26 Nov 2014 18:59:26 +0100 PCI/MSI: Replace msi_update_msg() with irq_chip_compose_msi_msg() Function irq_chip_compose_msi_msg() can achieve the same goal as msi_update_msg(), so kill msi_update_msg(). Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Link: http://lkml.kernel.org/r/1416894816-23245-26-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/msi.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 8e8f243..15429aa 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -53,19 +53,6 @@ static void irq_msi_compose_msg(struct irq_data *data, struct msi_msg *msg) MSI_DATA_VECTOR(cfg->vector); } -static void msi_update_msg(struct msi_msg *msg, struct irq_data *irq_data) -{ - struct irq_cfg *cfg = irqd_cfg(irq_data); - - msg->data &= ~MSI_DATA_VECTOR_MASK; - msg->data |= MSI_DATA_VECTOR(cfg->vector); - msg->address_lo &= ~MSI_ADDR_DEST_ID_MASK; - msg->address_lo |= MSI_ADDR_DEST_ID(cfg->dest_apicid); - if (x2apic_enabled()) - msg->address_hi = MSI_ADDR_BASE_HI | - MSI_ADDR_EXT_DEST_ID(cfg->dest_apicid); -} - /* * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices, * which implement the MSI or MSI-X Capability Structure. @@ -198,8 +185,7 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask, ret = parent->chip->irq_set_affinity(parent, mask, force); if (ret >= 0) { - dmar_msi_read(data->irq, &msg); - msi_update_msg(&msg, data); + irq_chip_compose_msi_msg(data, &msg); dmar_msi_write(data->irq, &msg); } @@ -329,8 +315,7 @@ static int hpet_msi_set_affinity(struct irq_data *data, ret = parent->chip->irq_set_affinity(parent, mask, force); if (ret >= 0 && ret != IRQ_SET_MASK_OK_DONE) { - hpet_msi_read(data->handler_data, &msg); - msi_update_msg(&msg, data); + irq_chip_compose_msi_msg(data, &msg); hpet_msi_write(data->handler_data, &msg); }