Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753612AbbFHNq1 (ORCPT ); Mon, 8 Jun 2015 09:46:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38811 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544AbbFHNqJ (ORCPT ); Mon, 8 Jun 2015 09:46:09 -0400 Date: Mon, 8 Jun 2015 06:45:55 -0700 From: tip-bot for Feng Wu Message-ID: Cc: joro@8bytes.org, mingo@kernel.org, tglx@linutronix.de, feng.wu@intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, joro@8bytes.org, linux-kernel@vger.kernel.org, feng.wu@intel.com, hpa@zytor.com In-Reply-To: <1433482974-14614-10-git-send-email-feng.wu@intel.com> References: <1433482974-14614-10-git-send-email-feng.wu@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] iommu, x86: Properly handle posted interrupts for IOMMU hotplug Git-Commit-ID: 5bce3c4c68c7d86f8742c9e25814238975563bae 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 Content-Length: 1630 Lines: 42 Commit-ID: 5bce3c4c68c7d86f8742c9e25814238975563bae Gitweb: http://git.kernel.org/tip/5bce3c4c68c7d86f8742c9e25814238975563bae Author: Feng Wu AuthorDate: Fri, 5 Jun 2015 13:42:54 +0800 Committer: Thomas Gleixner CommitDate: Mon, 8 Jun 2015 15:41:33 +0200 iommu, x86: Properly handle posted interrupts for IOMMU hotplug Return error when inserting a new IOMMU which doesn't support posted interrupts if posted interrupts are already enabled. Signed-off-by: Feng Wu Acked-by: Joerg Roedel Cc: jiang.liu@linux.intel.com Cc: iommu@lists.linux-foundation.org Cc: dwmw2@infradead.org Link: http://lkml.kernel.org/r/1433482974-14614-10-git-send-email-feng.wu@intel.com Signed-off-by: Thomas Gleixner --- drivers/iommu/intel_irq_remapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 0f57af7..80f1d14 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -1355,6 +1355,9 @@ int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) return -EINVAL; if (!ecap_ir_support(iommu->ecap)) return 0; + if (irq_remapping_cap(IRQ_POSTING_CAP) && + !cap_pi_support(iommu->cap)) + return -EBUSY; if (insert) { if (!iommu->ir_table) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/