From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754161AbdJRNqI (ORCPT ); Wed, 18 Oct 2017 09:46:08 -0400 Received: from terminus.zytor.com ([65.50.211.136]:46519 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750935AbdJRNqG (ORCPT ); Wed, 18 Oct 2017 09:46:06 -0400 Date: Wed, 18 Oct 2017 06:43:50 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: sixiao@microsoft.com, Jork.Loeser@microsoft.com, marc.zyngier@arm.com, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, sthemmin@microsoft.com, saeedm@mellanox.com, haiyangz@microsoft.com, bhelgaas@google.com, v-micos@microsoft.com, jopoulso@microsoft.com, kys@microsoft.com, linux-kernel@vger.kernel.org, decui@microsoft.com Reply-To: haiyangz@microsoft.com, bhelgaas@google.com, v-micos@microsoft.com, jopoulso@microsoft.com, linux-kernel@vger.kernel.org, kys@microsoft.com, decui@microsoft.com, sixiao@microsoft.com, mingo@kernel.org, Jork.Loeser@microsoft.com, tglx@linutronix.de, marc.zyngier@arm.com, hpa@zytor.com, sthemmin@microsoft.com, saeedm@mellanox.com In-Reply-To: <20171017075600.527569354@linutronix.de> References: <20171017075600.527569354@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE Git-Commit-ID: c201c91799d687c0a6d8c3272950f51aad5ffebe 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: c201c91799d687c0a6d8c3272950f51aad5ffebe Gitweb: https://git.kernel.org/tip/c201c91799d687c0a6d8c3272950f51aad5ffebe Author: Thomas Gleixner AuthorDate: Tue, 17 Oct 2017 09:54:59 +0200 Committer: Thomas Gleixner CommitDate: Wed, 18 Oct 2017 15:38:31 +0200 x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE Select CONFIG_GENERIC_IRQ_RESERVATION_MODE so PCI/MSI domains get the MSI_FLAG_MUST_REACTIVATE flag set in pci_msi_create_irq_domain(). Remove the explicit setters of this flag in the apic/msi code as they are not longer required. Fixes: 4900be83602b ("x86/vector/msi: Switch to global reservation mode") Reported-and-tested-by: Dexuan Cui Signed-off-by: Thomas Gleixner Cc: Josh Poulson Cc: Mihai Costache Cc: Stephen Hemminger Cc: Marc Zyngier Cc: linux-pci@vger.kernel.org Cc: Haiyang Zhang Cc: Simon Xiao Cc: Saeed Mahameed Cc: Jork Loeser Cc: Bjorn Helgaas Cc: devel@linuxdriverproject.org Cc: KY Srinivasan Link: https://lkml.kernel.org/r/20171017075600.527569354@linutronix.de --- arch/x86/Kconfig | 1 + arch/x86/kernel/apic/msi.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 64e99d3..ea4beda 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -95,6 +95,7 @@ config X86 select GENERIC_IRQ_MATRIX_ALLOCATOR if X86_LOCAL_APIC select GENERIC_IRQ_MIGRATION if SMP select GENERIC_IRQ_PROBE + select GENERIC_IRQ_RESERVATION_MODE select GENERIC_IRQ_SHOW select GENERIC_PENDING_IRQ if SMP select GENERIC_SMP_IDLE_THREAD diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 5b6dd1a..9b18be7 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -129,7 +129,7 @@ static struct msi_domain_ops pci_msi_domain_ops = { static struct msi_domain_info pci_msi_domain_info = { .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_PCI_MSIX | MSI_FLAG_MUST_REACTIVATE, + MSI_FLAG_PCI_MSIX, .ops = &pci_msi_domain_ops, .chip = &pci_msi_controller, .handler = handle_edge_irq, @@ -167,8 +167,7 @@ static struct irq_chip pci_msi_ir_controller = { static struct msi_domain_info pci_msi_ir_domain_info = { .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX | - MSI_FLAG_MUST_REACTIVATE, + MSI_FLAG_MULTI_PCI_MSI | MSI_FLAG_PCI_MSIX, .ops = &pci_msi_domain_ops, .chip = &pci_msi_ir_controller, .handler = handle_edge_irq,