Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp667766ybz; Wed, 22 Apr 2020 05:52:41 -0700 (PDT) X-Google-Smtp-Source: APiQypJuWJnBOwe5ek9iy8BGqiqmiAPGIqLXvNrLxXj547VcUDhxPZkGR7Er/9+A68Cv/Lcs4flU X-Received: by 2002:aa7:d7c1:: with SMTP id e1mr24228982eds.8.1587559961013; Wed, 22 Apr 2020 05:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587559961; cv=none; d=google.com; s=arc-20160816; b=GkdTJcOp3qCwhiLyINwnGoPmi+3osVRBh/7E6ZPKvH8i34GscyBYF88ro16P0IogFk SobeH5Cn+u79SLcY6+YLNKe3KNAwBFdPeChi/GZ01cjzNUMdVBwOZHZed04NkPNT1AsP VbCSBFT2zxkniuSwZbgk8uC3oR7E3KJCxgUL2aPZC2kPTazThoCzn48YYHua1GH9YN6L CBG697sl9p2gQB6j9TwlW+2DCTEhZ/hgyxLWh/wbmdKkvPXTUt1we7YXoXAe2F0ZUEGL zrHhUYiuQ2HGOtPOVY/2bLdB1qQxcYvUZ0gJE6ONQWeBbjDPAzdgIv9wJo7y6rWYB1sb gnQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6lIcRUZgeyGKb7dh6D+b1KK56YebvVVCDQ2dGQsvVSY=; b=AWhKoNBY/B2zmB79U+sGZX9W4i4+lTf94XIfuKtLvCK+FpkthQIqvc9yX0Zjpec7Dr wgwApzEg3PLcBL3W5WSfiVVXsz+GTN/Vsd5R06xGKC3eKfgKlE2bsovCoUqK7v5g3jo2 wH4tyBXAInpfGBtyiIie5oha0gKF0/nlmaoEnIYA+66PlDfmNmw87IFEOR5ukxplVARD zDnqM/YQi4ywoPO5oOQkxitB56aWuwLZRaTaZkEBkr69ZAz2hMRNzj2nNqEU/xKcSK+9 7zRVRvWP4QR/9ihQH0OHEhvcZff4+gSXYy/NlCBxyqKZMtZZNef5HEeAQ5jJwUc6ccSh IakQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bpzjoLGu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x4si3612697edc.458.2020.04.22.05.52.18; Wed, 22 Apr 2020 05:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bpzjoLGu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732015AbgDVKre (ORCPT + 99 others); Wed, 22 Apr 2020 06:47:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:50984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729665AbgDVKPe (ORCPT ); Wed, 22 Apr 2020 06:15:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A2D112070B; Wed, 22 Apr 2020 10:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550534; bh=v7Vipc0VT/4/+NWQ5NLJhdexjHV4UhMafyaRIs4x8WU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bpzjoLGuaav27l0wt7hVcgdfmIEIDy/e383t/W6dmd8BrYvlHuZP1Sc8x1+cRSkfS YVALNGKdS695TpMYmffwcMCqHjd94XNNUMOQM0GA+nlvg2oWvbP3Ed4yZOsecVNUz2 dcEDPmFXINSNzFOP5p1GSqePiAzUdMZAOJAMiQcc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Huang , Joerg Roedel , Sasha Levin Subject: [PATCH 4.19 53/64] iommu/amd: Fix the configuration of GCR3 table root pointer Date: Wed, 22 Apr 2020 11:57:37 +0200 Message-Id: <20200422095022.347731069@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095008.799686511@linuxfoundation.org> References: <20200422095008.799686511@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 From: Adrian Huang [ Upstream commit c20f36534666e37858a14e591114d93cc1be0d34 ] The SPA of the GCR3 table root pointer[51:31] masks 20 bits. However, this requires 21 bits (Please see the AMD IOMMU specification). This leads to the potential failure when the bit 51 of SPA of the GCR3 table root pointer is 1'. Signed-off-by: Adrian Huang Fixes: 52815b75682e2 ("iommu/amd: Add support for IOMMUv2 domain mode") Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/amd_iommu_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h index 69f3d4c95b530..859b06424e5c4 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -352,7 +352,7 @@ #define DTE_GCR3_VAL_A(x) (((x) >> 12) & 0x00007ULL) #define DTE_GCR3_VAL_B(x) (((x) >> 15) & 0x0ffffULL) -#define DTE_GCR3_VAL_C(x) (((x) >> 31) & 0xfffffULL) +#define DTE_GCR3_VAL_C(x) (((x) >> 31) & 0x1fffffULL) #define DTE_GCR3_INDEX_A 0 #define DTE_GCR3_INDEX_B 1 -- 2.20.1