Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp823839rwb; Mon, 26 Sep 2022 06:22:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7epgeNx6uSxH+NUZBOSQXn4E3vJFXAIDF3VvFCckPNnmEXU0u2KsOl4TA/yfMgtIcZqiJL X-Received: by 2002:a63:5221:0:b0:434:37b4:17f5 with SMTP id g33-20020a635221000000b0043437b417f5mr20113669pgb.479.1664198545848; Mon, 26 Sep 2022 06:22:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664198545; cv=none; d=google.com; s=arc-20160816; b=pWGT/evu3v7ZQs9pDCjnDttSyR9CVXr5T9kE2ymSjSSAnqEMgV+BUAwxr1rQE1pKDF dmyKdhr6oHH5L/9B7nRHSTyS8Cyq55u5AbwDLJLRtomvl0EeH0w1hsJefkm9KwB50Nth w0H+9nT5k+6awPoHIYKIIujQcxa473gWsPEmneqhDR83DcLO+LOKOLZNgMCVhJkKdSzk jlT7ZH7R3+Hyd2wUmDzul+b1fmQgSE+/Z19pAgx1VizLHCKaHCBmnjJE4IvkF7XRl6mj b0+rGqjzxPkHyrQHPP4lKbsOW+ldiNilYtGNeWj+cOazxNpzJMn1fPRFrTpes/rDSPCE o8Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ycgk/ggXqxqG7Pk3EzCqFGqsVZmVgv+LdOXut1hFGXA=; b=S8vl7TgIojM+ysMNYWucHwo5V5a9avTJ3GX8fFTeDvGcAAd/YL6gE1klSUYojbxtDd ss8weySBmrNhxuVhXks1PRpnS+3OWiDKa4Hd/yQYVYXBRdNWZ08YZ5X4TlLsQCUmj6Jf YUl7yBerSPGfveLV0lOBspn/iBhXV/EnJVuUQsv3pJ7KIEbpY98P6xcW/Ch8oU02zFGO ZImTDIlEM+Fr0ZabJh8oNM00brHe2jOe+63WPm9tOXVVOwCf+bWR29/AZ0/twbEifKXH Agq739z/ZSpevlxWiP3c1gOwPKOUXKOb5ivY7GQQxO7aKGYt6yAElH10IPHw4+vwAj+s Tx0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nv+NZeBJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ga22-20020a17090b039600b001f561cba131si11145153pjb.179.2022.09.26.06.22.13; Mon, 26 Sep 2022 06:22:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nv+NZeBJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237593AbiIZLMT (ORCPT + 99 others); Mon, 26 Sep 2022 07:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237488AbiIZLLQ (ORCPT ); Mon, 26 Sep 2022 07:11:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E600B5FF5B; Mon, 26 Sep 2022 03:35:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 80CA8B80972; Mon, 26 Sep 2022 10:35:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2540C43142; Mon, 26 Sep 2022 10:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188519; bh=S43vwTN5FCS7lBOECRJGWC/D4MWhEcu9+0J4OAHEcZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nv+NZeBJRCJ0fHBbiIaUtUmqPoSx9cURe5HxLHd8CJ9qVzGPKzZYkMpjV8Z5WDi45 ObhTkMvN3bqE2FN6qxHmZA2beYegrg6RAgOB0wsaq8v0Aip0u4DVH8O9aMmNqe2L5r LFmOjOXDGpvxmPt6llGs8pcx7NYpFC6nhYcmcN0k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Raghunathan Srinivasan , Yi Liu , Jerry Snitselaar , Kevin Tian , Lu Baolu , Joerg Roedel Subject: [PATCH 5.15 034/148] iommu/vt-d: Check correct capability for sagaw determination Date: Mon, 26 Sep 2022 12:11:08 +0200 Message-Id: <20220926100757.320220944@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yi Liu commit 154897807050c1161cb2660e502fc0470d46b986 upstream. Check 5-level paging capability for 57 bits address width instead of checking 1GB large page capability. Fixes: 53fc7ad6edf2 ("iommu/vt-d: Correctly calculate sagaw value of IOMMU") Cc: stable@vger.kernel.org Reported-by: Raghunathan Srinivasan Signed-off-by: Yi Liu Reviewed-by: Jerry Snitselaar Reviewed-by: Kevin Tian Reviewed-by: Raghunathan Srinivasan Link: https://lore.kernel.org/r/20220916071212.2223869-2-yi.l.liu@intel.com Signed-off-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- drivers/iommu/intel/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -539,7 +539,7 @@ static unsigned long __iommu_calculate_s { unsigned long fl_sagaw, sl_sagaw; - fl_sagaw = BIT(2) | (cap_fl1gp_support(iommu->cap) ? BIT(3) : 0); + fl_sagaw = BIT(2) | (cap_5lp_support(iommu->cap) ? BIT(3) : 0); sl_sagaw = cap_sagaw(iommu->cap); /* Second level only. */