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 4A924C43381 for ; Sat, 30 Mar 2019 01:04:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AAAC217F5 for ; Sat, 30 Mar 2019 01:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907891; bh=Pxv0WfrAuEfMCy9ovtQ8oUryleOJFqEyemC20+3XJmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oK6IaH4Gqja0jc0bb/i9ZPLb0vX+47yH92RnlMVhwW74TfT31YqNU/F+rYEgWROAK h8ghOCZLhU3NMtYjiLbD0gCCsl2Mw30sKA9JVEwByojrjIOV3RvIisf0Ergk3gualZ 58TFP0A4lHgkKT/a6wZymW5Y4PR5RSgOf0C64r7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731247AbfC3BEp (ORCPT ); Fri, 29 Mar 2019 21:04:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:33432 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731532AbfC3Ay3 (ORCPT ); Fri, 29 Mar 2019 20:54:29 -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 E44D4218D8; Sat, 30 Mar 2019 00:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907268; bh=Pxv0WfrAuEfMCy9ovtQ8oUryleOJFqEyemC20+3XJmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CpnTbjcGJgUu4/jhDRFYEhjuRj0vfsU4RXdR0VD9dOewt4DlpTTCDLNdkMrvIJaX1 GWH2JHVC0amx3IaBx/VN5Lt/f0uQgK7f2T9lBTIrtncutxlcyhb5hTf/iziNPWJTvP PMqPtqioh+fjdzt3DN64biSh3Pkj3QCoN/Y1Y22c= 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.19 48/52] iommu/vt-d: Check capability before disabling protected memory Date: Fri, 29 Mar 2019 20:52:55 -0400 Message-Id: <20190330005301.26868-48-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005301.26868-1-sashal@kernel.org> References: <20190330005301.26868-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 2b8f5ebae821..603bf5233a99 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1624,6 +1624,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