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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 A10A5C43381 for ; Sat, 30 Mar 2019 00:57:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74D2D21901 for ; Sat, 30 Mar 2019 00:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907449; bh=NRukhRRy43PG6BGHeGEkAGsr+oBXGs7alM2QWToXvfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ACry201CvOD4n32CHyaURQms9ZAcjqfIxNtmRpiwCRXb5Wl5wEhenHvgPQkmzuhrj mWxRGrnSHTbSLok7+UCVKHDkvK8LrAh5iHjkKms+3NSMAeWCuu7bc9NyPePMYMq0J9 Sy8kNdP1dxMeFaVS4315QNk/Z29CFO0JS8dldwp8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732123AbfC3A52 (ORCPT ); Fri, 29 Mar 2019 20:57:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:37610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732100AbfC3A50 (ORCPT ); Fri, 29 Mar 2019 20:57:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E4542218FF; Sat, 30 Mar 2019 00:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907445; bh=NRukhRRy43PG6BGHeGEkAGsr+oBXGs7alM2QWToXvfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IncbYBZeC4Xp1nUPXqXNrtWwODCymba9ZlRPW+4KfWCTc43DdwMnqTuN4cltPylF+ irxP5n596L+nuTmBBLNz4Onkf0ojMrQrX9oqDvna01OQhxPYIedIm6IKE/EPbmScyo 1Gk7H5y+52sDC6bSgDJfMqrgamRa3RBCqPWacUCk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lu Baolu , Jacob Pan , mark gross , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.4 18/21] iommu/vt-d: Check capability before disabling protected memory Date: Fri, 29 Mar 2019 20:56:46 -0400 Message-Id: <20190330005649.28475-18-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005649.28475-1-sashal@kernel.org> References: <20190330005649.28475-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lu Baolu [ 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