From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755629AbbFLJvg (ORCPT ); Fri, 12 Jun 2015 05:51:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34822 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755606AbbFLJvb (ORCPT ); Fri, 12 Jun 2015 05:51:31 -0400 Date: Fri, 12 Jun 2015 02:51:19 -0700 From: tip-bot for Feng Wu Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, joro@8bytes.org, tglx@linutronix.de, feng.wu@intel.com Reply-To: linux-kernel@vger.kernel.org, feng.wu@intel.com, tglx@linutronix.de, joro@8bytes.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1433827237-3382-11-git-send-email-feng.wu@intel.com> References: <1433827237-3382-11-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: c1d993341e46867af9412cf7f93f535895bbe3a7 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: c1d993341e46867af9412cf7f93f535895bbe3a7 Gitweb: http://git.kernel.org/tip/c1d993341e46867af9412cf7f93f535895bbe3a7 Author: Feng Wu AuthorDate: Tue, 9 Jun 2015 13:20:37 +0800 Committer: Thomas Gleixner CommitDate: Fri, 12 Jun 2015 11:33:52 +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 Reviewed-by: Thomas Gleixner 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/1433827237-3382-11-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)