Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp663047ybz; Wed, 22 Apr 2020 05:46:11 -0700 (PDT) X-Google-Smtp-Source: APiQypLGr/xfZZSQyAJ6kUjyjSJH2H4Yc+fVZbrbh03dVQcxoB+NFSmDZFZruLom9KC0kw9zkAPm X-Received: by 2002:a50:da05:: with SMTP id z5mr10731706edj.287.1587559571333; Wed, 22 Apr 2020 05:46:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587559571; cv=none; d=google.com; s=arc-20160816; b=XrV9AD71QeYCijkiKtM2Fo777IgqUk0yDhokrfyMW8JwYgXtPnzceGp395Em+mjtUF GWgz/lsxeedlsqbbG1yDrWuP5zrPJ2fJNcz/Dy96MQ434IBo9fGFFKH3pl7oSkrSFm9K Ay4RWuuzzBCO5+pCV8KU8yas0ttY7JHZt2dienIS3337W0+d74lMFFMAC4iTq/IzcqBn lgfzDp1du3FLQt6vkG7OguCQ70F07gegzW/X/dthguzckXqgJaNyRvFkeAWevt87RUt1 mUkdme0VlesoUzgFt9iTqxhEFVCB5KpL5p1jJGmNQxfnzgnzX9kst6KHYz+Y6SagCA8j WExQ== 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=loaIMbn1nCKfAX+hQTQUgATONJ/Q4Qr4kOJ72FqZaXk=; b=ZuAjHFZE0SIeDw3D00ODmIMY/gCkjaNQrEQxgj92fpI8nI23+GK044z4ZA/s44ZqZh iB9O99V5E2q+jEPJ0Iqg0ifpPDXkeee+XEAaOZ9VZiHw6z+D7oeaXYv1XjqQuqbFi7Oi xjxAey0MLqG1GxNyeE5O/LCSYOqvKyNPBQd33xophvWIFWD75uuMFxucUH4km6+zeUZH xCXkivsEzwNnMpilDXKvcoQU3MGvU/HTxe/NVWSg3+tPug+rXI+MZ4lbdTmAaTc3NfKO O9mRrLq0aWkSSWi6ICjrjsOCk+WNJk1xVXpjmcvsE5S2527ZocTMXRjSIoZVmHkuih3T mekw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tlJSPPau; 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 e1si3318945ejl.173.2020.04.22.05.45.47; Wed, 22 Apr 2020 05:46:11 -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=tlJSPPau; 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 S1727025AbgDVKCj (ORCPT + 99 others); Wed, 22 Apr 2020 06:02:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:51688 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727015AbgDVKCe (ORCPT ); Wed, 22 Apr 2020 06:02: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 0CD9C2076C; Wed, 22 Apr 2020 10:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587549754; bh=BtC7U9P5apcHlMtbq2Wc/WnKSOeCOUtOQd4q6P+uVCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlJSPPausRkTg5A4hNbfUT5z8o5gFn6BLiwcqRTlGTml5GS7e8f0agiWk3XAnXZpc J/SSFcGEKBzH7juI98sH3dZbKRmo+rtzqaYlkzle0d/H+ZXjEA1qOa8bQNKzbxI4pP gh45T2Erym3uwEJLg9bNb3aBdyCcRDj/0C3ByRHM= 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.4 092/100] iommu/amd: Fix the configuration of GCR3 table root pointer Date: Wed, 22 Apr 2020 11:57:02 +0200 Message-Id: <20200422095039.525103936@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095022.476101261@linuxfoundation.org> References: <20200422095022.476101261@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 b08cf57bf4554..695d4e235438c 100644 --- a/drivers/iommu/amd_iommu_types.h +++ b/drivers/iommu/amd_iommu_types.h @@ -303,7 +303,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