From patchwork Wed May 4 11:54:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 67127 Delivered-To: patches@linaro.org Received: by 10.140.92.199 with SMTP id b65csp135482qge; Wed, 4 May 2016 04:54:52 -0700 (PDT) X-Received: by 10.194.117.70 with SMTP id kc6mr8949045wjb.94.1462362892775; Wed, 04 May 2016 04:54:52 -0700 (PDT) Return-Path: Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com. [2a00:1450:400c:c09::235]) by mx.google.com with ESMTPS id 193si4482181wmh.122.2016.05.04.04.54.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 04:54:52 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::235 as permitted sender) client-ip=2a00:1450:400c:c09::235; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::235 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x235.google.com with SMTP id n129so185276164wmn.1 for ; Wed, 04 May 2016 04:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kTV9cMs6UDgHgulrICnCx+O50m+DwZUGmupJsgXedjg=; b=kjGluVN1gSgSu0HWCJ37Iyk6r+MINboMcl3eULPqn/cDJzDfEyMOSQE65wZH6CF5X6 /EI1l+WV269GEzdvLKnl96auIPR89eNHqaWlabFFwL53g2/skqN8ZLsveDiBG4hWENvS Z3goFx8txW+489MnXArIkvz99UEFM7GshAX9M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kTV9cMs6UDgHgulrICnCx+O50m+DwZUGmupJsgXedjg=; b=Y0qq9nV/+lLE0WULKPQ5d84QExs3BIlKwM23X0Pok8Huvvx/i+K9nsFh9ihW8EGuul 5058ioSKjHJ9LAy3pQOqVJfMQzsfmtcJMsnVQYHkzCPjkrs+FSy4T5Ulr8wPCSuCY89m Po8qPDMyzYdoYWZ6WeymcyfQBPKldE44KLtminy8XZSUfDMdnejebOrpYsc7T8KjBwbT WD8qZnSzBTMtJ3E8GQl3WNLfCzbddhu8NFgvnJynLG//lzBHIswNHry02/TDmNYe3Ntt PoW2G1Z8Ap6HfkpeDy/xut53vgOFFlILg6oSeltdlwCdyJxUd9f8rZnbDkurNIiO5WDE rtVQ== X-Gm-Message-State: AOPr4FXBuWmLksK7Mu/KpsAx+SkKsCqRkAAcztKK2AqxdfnfWYgJ+rQAqN4rPow0e8ClGX8zdV4= X-Received: by 10.194.89.38 with SMTP id bl6mr7991288wjb.44.1462362892510; Wed, 04 May 2016 04:54:52 -0700 (PDT) Return-Path: Received: from new-host-61.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ck9sm3816623wjc.22.2016.05.04.04.54.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 04:54:50 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org, linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com, julien.grall@arm.com, yehuday@marvell.com Subject: [PATCH v9 6/7] iommu/arm-smmu: do not advertise IOMMU_CAP_INTR_REMAP Date: Wed, 4 May 2016 11:54:17 +0000 Message-Id: <1462362858-2925-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462362858-2925-1-git-send-email-eric.auger@linaro.org> References: <1462362858-2925-1-git-send-email-eric.auger@linaro.org> Do not advertise IOMMU_CAP_INTR_REMAP for arm-smmu(-v3). Indeed the irq_remapping capability is abstracted on irqchip side for ARM as opposed to Intel IOMMU featuring IRQ remapping HW. So to check IRQ remapping capability, the msi domain needs to be checked instead. This commit needs to be applied after "vfio/type1: also check IRQ remapping capability at msi domain" else the legacy interrupt assignment gets broken with arm-smmu. Signed-off-by: Eric Auger --- drivers/iommu/arm-smmu-v3.c | 3 ++- drivers/iommu/arm-smmu.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index b5d9826..778212c 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1386,7 +1386,8 @@ static bool arm_smmu_capable(enum iommu_cap cap) case IOMMU_CAP_CACHE_COHERENCY: return true; case IOMMU_CAP_INTR_REMAP: - return true; /* MSIs are just memory writes */ + /* interrupt translation handled at MSI controller level */ + return false; case IOMMU_CAP_NOEXEC: return true; default: diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 0908985..e7c9e89 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1320,7 +1320,8 @@ static bool arm_smmu_capable(enum iommu_cap cap) */ return true; case IOMMU_CAP_INTR_REMAP: - return true; /* MSIs are just memory writes */ + /* interrupt translation handled at MSI controller level */ + return false; case IOMMU_CAP_NOEXEC: return true; default: