From patchwork Fri Aug 22 08:07:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 382092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E1B71140114 for ; Fri, 22 Aug 2014 17:45:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754534AbaHVHpe (ORCPT ); Fri, 22 Aug 2014 03:45:34 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:53472 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754517AbaHVHpc (ORCPT ); Fri, 22 Aug 2014 03:45:32 -0400 Received: from 172.24.2.119 (EHLO szxeml406-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id ATJ90538; Fri, 22 Aug 2014 15:45:29 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml406-hub.china.huawei.com (10.82.67.93) with Microsoft SMTP Server id 14.3.158.1; Fri, 22 Aug 2014 15:43:02 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Yijing Wang , "Tony Luck" , Thomas Gleixner , , Subject: [PATCH v2 4/5] MSI: Use __get_cached_msi_msg() instead of get_cached_msi_msg() Date: Fri, 22 Aug 2014 16:07:59 +0800 Message-ID: <1408694880-8260-5-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1408694880-8260-1-git-send-email-wangyijing@huawei.com> References: <1408694880-8260-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.53F6F51A.0055,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: 456f1db1d77dba66c7600c3def5fc649 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Get_cached_msi_msg() only be called in two places, ia64_set_msi_irq_affinity() and sn_set_msi_irq_affinity(). The code flow is: irq = irq_data->irq get_cached_msi_msg(irq) irq_get_msi_desc(irq) irq_get_irq_data(irq) msi_desc = irq_data->desc __get_cached_msi_msg(msi_desc, msg) This is crazy, we should use __get_cached_msi_msg(irq_data->desc, msg) directly to simplify the flow, and remove get_cached_msi_msg(). Finally, rename __get_cached_msi_msg() to get_cached_msi_msg(). Signed-off-by: Yijing Wang CC: Tony Luck CC: Thomas Gleixner CC: x86@kernel.org CC: linux-ia64@vger.kernel.org --- arch/ia64/kernel/msi_ia64.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 4 ++-- arch/x86/kernel/apic/io_apic.c | 2 +- drivers/pci/msi.c | 9 +-------- include/linux/msi.h | 3 +-- 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c index c430f91..4efe748 100644 --- a/arch/ia64/kernel/msi_ia64.c +++ b/arch/ia64/kernel/msi_ia64.c @@ -23,7 +23,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, if (irq_prepare_move(irq, cpu)) return -1; - get_cached_msi_msg(irq, &msg); + get_cached_msi_msg(idata->msi_desc, &msg); addr = msg.address_lo; addr &= MSI_ADDR_DEST_ID_MASK; diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c index afc58d2..8bec242 100644 --- a/arch/ia64/sn/kernel/msi_sn.c +++ b/arch/ia64/sn/kernel/msi_sn.c @@ -175,8 +175,8 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, * Release XIO resources for the old MSI PCI address */ - get_cached_msi_msg(irq, &msg); - sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; + get_cached_msi_msg(data->msi_desc, &msg); + sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; pdev = sn_pdev->pdi_linux_pcidev; provider = SN_PCIDEV_BUSPROVIDER(pdev); diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 29290f5..e877cfb 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3145,7 +3145,7 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) if (ret) return ret; - __get_cached_msi_msg(data->msi_desc, &msg); + get_cached_msi_msg(data->msi_desc, &msg); msg.data &= ~MSI_DATA_VECTOR_MASK; msg.data |= MSI_DATA_VECTOR(cfg->vector); diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 0d0f163..8746ecd 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -296,7 +296,7 @@ void read_msi_msg(unsigned int irq, struct msi_msg *msg) __read_msi_msg(entry, msg); } -void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg) +void get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { /* Assert that the cache is valid, assuming that * valid messages are not all-zeroes. */ @@ -306,13 +306,6 @@ void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg) *msg = entry->msg; } -void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg) -{ - struct msi_desc *entry = irq_get_msi_desc(irq); - - __get_cached_msi_msg(entry, msg); -} - void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg) { if (entry->dev->current_state != PCI_D0) { diff --git a/include/linux/msi.h b/include/linux/msi.h index fff7201..329ec73 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -16,10 +16,9 @@ struct msi_desc; void mask_msi_irq(struct irq_data *data); void unmask_msi_irq(struct irq_data *data); void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg); -void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg); +void get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg); void read_msi_msg(unsigned int irq, struct msi_msg *msg); -void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg); void write_msi_msg(unsigned int irq, struct msi_msg *msg); struct msi_desc {