Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1761459ybz; Sat, 18 Apr 2020 07:58:23 -0700 (PDT) X-Google-Smtp-Source: APiQypLc9aCwEJ6RNTzpP+EqjSOfQTf2vQhwPqOnGrcI6l6pF/gaTx/yvTT1sRRG8I/VCRb+fpyM X-Received: by 2002:a05:6402:1422:: with SMTP id c2mr1531127edx.179.1587221903560; Sat, 18 Apr 2020 07:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221903; cv=none; d=google.com; s=arc-20160816; b=a5SHjXQzHdPa63QMVrJYgX97Jd/50/TL2HfZvoLLILhpArY2EBuOPQiyGCWyM0sl71 2ywnJtpBIKBih5bijFjlwnB1EnUVbS73aufNfWLIr2vEgLwT2IvKLtzoxoYdltnhVrgh 5ruwGcvwyFshJhTFIzrj/tcyTWa4E09aZlvjvnvd7TeVDlV6jCMRcpOodIyPMPa75ZAd Zvdw+ibwinjfFuMPUf56v9xEwqoICmbwIN8bKUhyYMkex9/si1q9zUSJlukMTR/6btnm mrh+HJyWPrM+0bMlAi+cLPMnFE2XiflHuxSxCjaNToUSNMFhm5BI0A3lL+KNgwx/bXGE YVHw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=utthkRuS3+TsTSOVOYIwY7IdMKf+2HhUD2YCKTTN5q8=; b=XwsRLjfaV2OuEh+JKz4N6sbeJaNql96wh2yWId1FeXjX9lFQ7m5PF6E4I7iPes2MEG NqbCOb5hYIGQzoRmPSD2DT2deJZ6Mxh1nqKwBdOERcq6UKzMLnXzDCWHCXe3Y3poQ9GE IFLzgQt5Sc4vyu7fO9d0Q6lrfO8waqpl5dD1eVg8DhcMp9yjseBdHUTq0H9+sabtavr4 xjtg1B+14WVqjEoGCLHDtEOWjvOplfKiGrmzZ9e5FyBIiTUdFYXmh/TC+137NLAiC17B p00FEeIywyfsgWTPtwAG51PN/Jyr0tHNp6J19uj0cembhfZJSqgSRr/EFnDtgMcQWZN6 XAUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IM19uS3U; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p26si13216117ejd.193.2020.04.18.07.58.01; Sat, 18 Apr 2020 07:58:23 -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=IM19uS3U; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726797AbgDROkz (ORCPT + 99 others); Sat, 18 Apr 2020 10:40:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:49404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726785AbgDROky (ORCPT ); Sat, 18 Apr 2020 10:40:54 -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 6B6F922202; Sat, 18 Apr 2020 14:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220854; bh=gNEqwMIk6W4ZqVW7sBL8/0aKuAMn8CjvIZXrWp1EKoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IM19uS3UMZzax61jiV24FZYZ0/ZRzULK6WyCvV7OwVZfkxjPKk8SxxkqqOIw6Aoe7 K4/Olq2bCI5Jk4iOvYrcuSwsBPgRK7/MY2a+L7OZ0vAMVdWCNGvL0iCIsqXQs/EScp qoCU37RYvPGST2RhuQGeDAxfieoaNZNWDqRsOte0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jacob Pan , Lu Baolu , Liu Yi L , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.4 05/78] iommu/vt-d: Fix page request descriptor size Date: Sat, 18 Apr 2020 10:39:34 -0400 Message-Id: <20200418144047.9013-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-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: Jacob Pan [ Upstream commit 52355fb1919ef7ed9a38e0f3de6e928de1f57217 ] Intel VT-d might support PRS (Page Reqest Support) when it's running in the scalable mode. Each page request descriptor occupies 32 bytes and is 32-bytes aligned. The page request descriptor offset mask should be 32-bytes aligned. Fixes: 5b438f4ba315d ("iommu/vt-d: Support page request in scalable mode") Signed-off-by: Lu Baolu Signed-off-by: Liu Yi L Signed-off-by: Jacob Pan Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/intel-svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index 518d0b2d12afd..5313d043a6cf2 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -502,7 +502,7 @@ struct page_req_dsc { u64 priv_data[2]; }; -#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x10) +#define PRQ_RING_MASK ((0x1000 << PRQ_ORDER) - 0x20) static bool access_error(struct vm_area_struct *vma, struct page_req_dsc *req) { -- 2.20.1