From patchwork Sun Nov 9 15:10:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 5261411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AB4279F295 for ; Sun, 9 Nov 2014 15:16:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF86C20122 for ; Sun, 9 Nov 2014 15:16:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D786B20158 for ; Sun, 9 Nov 2014 15:16:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XnUBX-0001qa-7X; Sun, 09 Nov 2014 15:13:47 +0000 Received: from mga02.intel.com ([134.134.136.20]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XnU8z-0007Sg-5Y for linux-arm-kernel@lists.infradead.org; Sun, 09 Nov 2014 15:11:10 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 09 Nov 2014 07:10:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,346,1413270000"; d="scan'208";a="604933522" Received: from gerry-dev.bj.intel.com ([10.238.158.52]) by orsmga001.jf.intel.com with ESMTP; 09 Nov 2014 07:10:42 -0800 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, Mike Marciniszyn , Roland Dreier , Sean Hefty , Hal Rosenstock , Matthias Brugger , Jiang Liu Subject: [RFC Part4 v1 16/17] x86, htirq: Kill struct ht_irq_msg by reusing struct msi_msg Date: Sun, 9 Nov 2014 23:10:38 +0800 Message-Id: <1415545839-28263-17-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141109_071109_573275_502E3759 X-CRM114-Status: GOOD ( 15.43 ) X-Spam-Score: -5.3 (-----) Cc: Tony Luck , Konrad Rzeszutek Wilk , linux-rdma@vger.kernel.org, Greg Kroah-Hartman , Joerg Roedel , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, Andrew Morton , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reuse struct msi_msg for HT interrupts, so we could use common MSI code to manage HT interrupts later. Signed-off-by: Jiang Liu --- arch/x86/kernel/apic/htirq.c | 6 +++--- drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- drivers/pci/htirq.c | 8 ++++---- include/linux/htirq.h | 14 +++++--------- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/apic/htirq.c b/arch/x86/kernel/apic/htirq.c index 1448df3f9e9f..b6503510f1af 100644 --- a/arch/x86/kernel/apic/htirq.c +++ b/arch/x86/kernel/apic/htirq.c @@ -34,7 +34,7 @@ ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) ret = parent->chip->irq_set_affinity(parent, mask, force); if (ret >= 0) { - struct ht_irq_msg msg; + struct msi_msg msg; struct irq_cfg *cfg = irqd_cfg(data); fetch_ht_irq_msg(data->irq, &msg); @@ -115,7 +115,7 @@ static void htirq_domain_free(struct irq_domain *domain, unsigned int virq, static void htirq_domain_activate(struct irq_domain *domain, struct irq_data *irq_data) { - struct ht_irq_msg msg; + struct msi_msg msg; struct irq_cfg *cfg = irqd_cfg(irq_data); msg.address_hi = HT_IRQ_HIGH_DEST_ID(cfg->dest_apicid); @@ -137,7 +137,7 @@ static void htirq_domain_activate(struct irq_domain *domain, static void htirq_domain_deactivate(struct irq_domain *domain, struct irq_data *irq_data) { - struct ht_irq_msg msg; + struct msi_msg msg; memset(&msg, 0, sizeof(msg)); write_ht_irq_msg(irq_data->irq, &msg); diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 7cc305488a3d..b49ce8942b57 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c @@ -986,7 +986,7 @@ static int ipath_ht_intconfig(struct ipath_devdata *dd) } static void ipath_ht_irq_update(struct pci_dev *dev, int irq, - struct ht_irq_msg *msg) + struct msi_msg *msg) { struct ipath_devdata *dd = pci_get_drvdata(dev); u64 prev_intconfig = dd->ipath_intconfig; diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 7eb4109a3df4..3bbbc5cdcb9b 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c @@ -23,7 +23,7 @@ */ static DEFINE_SPINLOCK(ht_irq_lock); -void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg) +void write_ht_irq_msg(unsigned int irq, struct msi_msg *msg) { struct ht_irq_cfg *cfg = irq_get_handler_data(irq); unsigned long flags; @@ -43,7 +43,7 @@ void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg) cfg->msg = *msg; } -void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg) +void fetch_ht_irq_msg(unsigned int irq, struct msi_msg *msg) { struct ht_irq_cfg *cfg = irq_get_handler_data(irq); @@ -53,7 +53,7 @@ void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg) void mask_ht_irq(struct irq_data *data) { struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data); - struct ht_irq_msg msg = cfg->msg; + struct msi_msg msg = cfg->msg; msg.address_lo |= 1; write_ht_irq_msg(data->irq, &msg); @@ -62,7 +62,7 @@ void mask_ht_irq(struct irq_data *data) void unmask_ht_irq(struct irq_data *data) { struct ht_irq_cfg *cfg = irq_data_get_irq_handler_data(data); - struct ht_irq_msg msg = cfg->msg; + struct msi_msg msg = cfg->msg; msg.address_lo &= ~1; write_ht_irq_msg(data->irq, &msg); diff --git a/include/linux/htirq.h b/include/linux/htirq.h index d4a527e58434..98e432f7f9b1 100644 --- a/include/linux/htirq.h +++ b/include/linux/htirq.h @@ -1,16 +1,12 @@ #ifndef LINUX_HTIRQ_H #define LINUX_HTIRQ_H +#include struct pci_dev; struct irq_data; -struct ht_irq_msg { - u32 address_lo; /* low 32 bits of the ht irq message */ - u32 address_hi; /* high 32 bits of the it irq message */ -}; - typedef void (ht_irq_update_t)(struct pci_dev *dev, int irq, - struct ht_irq_msg *msg); + struct msi_msg *msg); struct ht_irq_cfg { struct pci_dev *dev; @@ -18,12 +14,12 @@ struct ht_irq_cfg { ht_irq_update_t *update; unsigned pos; unsigned idx; - struct ht_irq_msg msg; + struct msi_msg msg; }; /* Helper functions.. */ -void fetch_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg); -void write_ht_irq_msg(unsigned int irq, struct ht_irq_msg *msg); +void fetch_ht_irq_msg(unsigned int irq, struct msi_msg *msg); +void write_ht_irq_msg(unsigned int irq, struct msi_msg *msg); void mask_ht_irq(struct irq_data *data); void unmask_ht_irq(struct irq_data *data);