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=unavailable 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 6ACEDC43381 for ; Sat, 30 Mar 2019 01:00:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B212206DD for ; Sat, 30 Mar 2019 01:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907607; bh=fFQtP9435ikGB02gwAVe0l5/Rk1qlQe3kIjJetswgyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VdTGrpwMqNl69UdrAgeglZOlMblbbWGgg7lnd6BHHOHuFlLLZ96OuZqjLZq3tgz0y YC0GAOoSdPS8wH4/pP9lUzSw3WD6NZi5XflCAVUISj1zqPC9U2JEUzz5/Jesd5Pyhb O2djnb22M1hg/jaO9+2lPnkJBEjvfYamHcjDGZ1g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732016AbfC3A4y (ORCPT ); Fri, 29 Mar 2019 20:56:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:36536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731986AbfC3A4p (ORCPT ); Fri, 29 Mar 2019 20:56:45 -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 D59B2218D3; Sat, 30 Mar 2019 00:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907404; bh=fFQtP9435ikGB02gwAVe0l5/Rk1qlQe3kIjJetswgyA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ldet82ulFFYQRGab8kYEPOTR8g7D4OvTCrK1NakjNLXQHbIRQUK//OWUhAYR9MjF0 yjKbMEAj60vFRFHNjrWw/na795Gh+nho1BX6FaRSSSUsZcWdX4E5CPHx1JaS2geoUe He3LY1PCdt9AT7cbjh2dttQp09QKGBNKmO/xZHNI= 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.9 24/27] iommu/vt-d: Check capability before disabling protected memory Date: Fri, 29 Mar 2019 20:55:50 -0400 Message-Id: <20190330005555.28087-24-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005555.28087-1-sashal@kernel.org> References: <20190330005555.28087-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 86e349614e21..28feb1744710 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1636,6 +1636,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