From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71DE7C282CE for ; Wed, 24 Apr 2019 17:20:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40E7821916 for ; Wed, 24 Apr 2019 17:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126458; bh=xXVsGLTLYy1/ONdDG2YdejYM1yG+TJ9nqLT1GBgJ3FU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=irIfIXPIflnUDyS1wAboJ+fRwjk0X/+/thZA//XaVo8U9dUvUFvAjEb2isf/3YdbA GRPAg6ZEdTLQtIRZUPBKeI1Yh3ZBGcyKfQbU6WMGp/6SsxqL6R1wFev5TJIA7MV1yl vR8QWDzgJKlP1bCt7ufeXJmOfKYfOQqVHpMA3zi8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389254AbfDXRU5 (ORCPT ); Wed, 24 Apr 2019 13:20:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:46346 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389243AbfDXRUz (ORCPT ); Wed, 24 Apr 2019 13:20:55 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3CA420675; Wed, 24 Apr 2019 17:20:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556126454; bh=xXVsGLTLYy1/ONdDG2YdejYM1yG+TJ9nqLT1GBgJ3FU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aNL3R4zvUVOatQiVX8+7FyAKRcbVklOL5+1Shh9/xaBYwAMmQfAjkciSuSxHRjtBk 9BrAKnPDfQ7chZbIe3z3BpNDebHhonON0XQsqHLwWhKaq7mE+FQ1wqRvcrCRGqN6rG wI7d2avdtxaoB40DU1yaHh8wkGtb0+cXXwRFX2eY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jacob Pan , mark gross , Ashok Raj , Lu Baolu , Joerg Roedel , Sasha Levin Subject: [PATCH 4.4 115/168] iommu/vt-d: Check capability before disabling protected memory Date: Wed, 24 Apr 2019 19:09:19 +0200 Message-Id: <20190424170930.275313852@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170923.452349382@linuxfoundation.org> References: <20190424170923.452349382@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 5bb71fc790a88d063507dc5d445ab8b14e845591 ] The spec states in 10.4.16 that the Protected Memory Enable Register should be treated as read-only for implementations not supporting protected memory regions (PLMR and PHMR fields reported as Clear in the Capability register). Cc: Jacob Pan Cc: mark gross Suggested-by: Ashok Raj Fixes: f8bab73515ca5 ("intel-iommu: PMEN support") Signed-off-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/intel-iommu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 8b4a4d95669a..3e97c4b2ebed 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1598,6 +1598,9 @@ static void iommu_disable_protect_mem_regions(struct intel_iommu *iommu) u32 pmen; unsigned long flags; + if (!cap_plmr(iommu->cap) && !cap_phmr(iommu->cap)) + return; + raw_spin_lock_irqsave(&iommu->register_lock, flags); pmen = readl(iommu->reg + DMAR_PMEN_REG); pmen &= ~DMA_PMEN_EPM; -- 2.19.1