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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 830E6C5518A for ; Wed, 22 Apr 2020 10:30:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F9962084D for ; Wed, 22 Apr 2020 10:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551413; bh=0NX5m65ZX918gnHGu6BeQVuUAFP1/jHZfec34UtVYrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bdx+My9bnh3A94E76yDpr5cDOcnLHGYchkczK6xj0lOs1jhZQwdutGEn9UX2jf4S1 EDXPuC81G4yVEZav2crXiyRVkGF9ydIGlZFkU3/+rjSD4kdwlX9r1XqGqZB1UoAQfD IABZRRLNvJPXtdWWNJIsTtxQfb7MYiLhRfaYVDSE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730167AbgDVK03 (ORCPT ); Wed, 22 Apr 2020 06:26:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730725AbgDVK0Z (ORCPT ); Wed, 22 Apr 2020 06:26:25 -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 B65D02075A; Wed, 22 Apr 2020 10:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587551185; bh=0NX5m65ZX918gnHGu6BeQVuUAFP1/jHZfec34UtVYrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YtTtzFLvJ6/0NC0samtF/CkDiFCyBRYZnCYy++tEgpNCx2X0WzwmE5/qk8U0/aTEn 7BHwfSokELeRE9UyDqVP+bUateiT3/4Y+NKfKpyObRPWxlI/R4h8AnLzCFvsi7P5QT /cc6LcDM6EHQyFAt473/Ht+YFFU6DUsu46xSwfz0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lu Baolu , Liu Yi L , Jacob Pan , Joerg Roedel , Sasha Levin Subject: [PATCH 5.6 135/166] iommu/vt-d: Fix page request descriptor size Date: Wed, 22 Apr 2020 11:57:42 +0200 Message-Id: <20200422095103.094308153@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095047.669225321@linuxfoundation.org> References: <20200422095047.669225321@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: 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 fc7d78876e021..2998418f0a383 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -531,7 +531,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