From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031295AbbDXPv6 (ORCPT ); Fri, 24 Apr 2015 11:51:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44195 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031216AbbDXPvv (ORCPT ); Fri, 24 Apr 2015 11:51:51 -0400 Date: Fri, 24 Apr 2015 08:50:57 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: sivanich@sgi.com, gregkh@linuxfoundation.org, linux@eikelenboom.it, linux-kernel@vger.kernel.org, david.a.cohen@linux.intel.com, konrad.wilk@oracle.com, benh@kernel.crashing.org, david.vrabel@citrix.com, rjw@rjwysocki.net, rdunlap@infradead.org, tony.luck@intel.com, tglx@linutronix.de, jiang.liu@linux.intel.com, joro@8bytes.org, bp@alien8.de, yinghai@kernel.org, mingo@kernel.org, hpa@zytor.com, bhelgaas@google.com Reply-To: konrad.wilk@oracle.com, david.a.cohen@linux.intel.com, linux@eikelenboom.it, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, sivanich@sgi.com, rjw@rjwysocki.net, david.vrabel@citrix.com, benh@kernel.crashing.org, joro@8bytes.org, jiang.liu@linux.intel.com, tglx@linutronix.de, rdunlap@infradead.org, tony.luck@intel.com, bhelgaas@google.com, hpa@zytor.com, mingo@kernel.org, yinghai@kernel.org, bp@alien8.de In-Reply-To: <1428905519-23704-27-git-send-email-jiang.liu@linux.intel.com> References: <1428905519-23704-27-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Implement irq_chip.irq_write_msi_msg for MSI/DMAR/HPET irq_chips Git-Commit-ID: 62ac1780830ed64a9a46f80a03e91de71957d670 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: 62ac1780830ed64a9a46f80a03e91de71957d670 Gitweb: http://git.kernel.org/tip/62ac1780830ed64a9a46f80a03e91de71957d670 Author: Jiang Liu AuthorDate: Mon, 13 Apr 2015 14:11:48 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:50 +0200 x86/irq: Implement irq_chip.irq_write_msi_msg for MSI/DMAR/HPET irq_chips Implement irq_chip.irq_write_msi_msg for MSI/DMAR/HPET irq_chips, they will be used to replace duplicated code. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel 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 Cc: Dimitri Sivanich Link: http://lkml.kernel.org/r/1428905519-23704-27-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/msi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 5b5ef5b..3c82586 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -192,6 +192,11 @@ dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask, return ret; } +static void dmar_msi_write_msg(struct irq_data *data, struct msi_msg *msg) +{ + dmar_msi_write(data->irq, msg); +} + static struct irq_chip dmar_msi_controller = { .name = "DMAR-MSI", .irq_unmask = dmar_msi_unmask, @@ -200,6 +205,7 @@ static struct irq_chip dmar_msi_controller = { .irq_set_affinity = dmar_msi_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = irq_msi_compose_msg, + .irq_write_msi_msg = dmar_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, }; @@ -322,6 +328,11 @@ static int hpet_msi_set_affinity(struct irq_data *data, return ret; } +static void hpet_msi_write_msg(struct irq_data *data, struct msi_msg *msg) +{ + hpet_msi_write(data->handler_data, msg); +} + static struct irq_chip hpet_msi_controller = { .name = "HPET-MSI", .irq_unmask = hpet_msi_unmask, @@ -330,6 +341,7 @@ static struct irq_chip hpet_msi_controller = { .irq_set_affinity = hpet_msi_set_affinity, .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_compose_msi_msg = irq_msi_compose_msg, + .irq_write_msi_msg = hpet_msi_write_msg, .flags = IRQCHIP_SKIP_SET_WAKE, };