From patchwork Thu Apr 20 08:07:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerry Snitselaar X-Patchwork-Id: 85776 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp177342vqo; Thu, 20 Apr 2023 01:49:12 -0700 (PDT) X-Google-Smtp-Source: AKy350aPuIFJYHPujAL8LHFkCfDORxrGN6BfzjdK4YGbnrZzIHFpFNaZK9cJFHDr61u3hBQWSqG0 X-Received: by 2002:a17:903:187:b0:1a6:e3e3:dbb8 with SMTP id z7-20020a170903018700b001a6e3e3dbb8mr857787plg.44.1681980552237; Thu, 20 Apr 2023 01:49:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681980552; cv=none; d=google.com; s=arc-20160816; b=nx07s2v6tiClN97F0jstga6k9fCziXEcYdbNQvlKKbgZk/6136romvGikd5d7+4vtE TVBuxEAVSFx/pn2jl77hNBIdXeNZCgyvaovs+TI9qC4ynMNWKYEKD1vPJDsv1SF/mqLD dF8ayPqnmFkTpz6n/1FukVIOo9JCP7W78SB4W4NPDpaRAXPYO/T83TcMT3nxWKy16iRa BfRKW4jtFWjLGdZK9H6jnd3cSRAqPO6YjyQSCO7uEor8GsrX+jdAl+Tuv71jX0XYuKMC U/n3/sJ0aKwt9CwvFQD/zsXOecB9uCYMjRCU4c8QGIYg0DNeDdvjUT4Xlrje88C88Bzp LrTQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=oiFbyJM/OVQzht3NVRAuOeDRCZOh3MADqrY1DUOhLSk=; b=WN0OxZw4tapyjFnkPUNF9leyjBLinelMk6jL8hZXiodi47i9tLtwto5so7u8Nw4xMU +UEi3O9bU5RMsgHfU5rNU+0z6HcQBM06AkMcIPg+TGdflq74lyG9qYNCsQLnhqsvfqxJ Df8FRtaF1HKCksiWpaXkM53ZRCdiGt1tJ+jF2nT/ygpCt6mRhmqGiVwNb8yWR2KlIXkx FNhWI0x6Z04+3hX8Fmei+6EgpQkIHSTS+xHWqT/oIHz0TxfpQfdFuU5sM/DPZHBnn7qP rpfGNWBtFz/kX2XKYSJZkc6upp47rtzpCHqPfdo90YXUslWQYjsthFQ1pm8ZCO8KntTi VZ1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=W44CJRy1; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j15-20020a170902da8f00b001a6e9ae0c0bsi1437047plx.577.2023.04.20.01.48.57; Thu, 20 Apr 2023 01:49:12 -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=@redhat.com header.s=mimecast20190719 header.b=W44CJRy1; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234145AbjDTIIS (ORCPT + 99 others); Thu, 20 Apr 2023 04:08:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234328AbjDTIIQ (ORCPT ); Thu, 20 Apr 2023 04:08:16 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D25011A for ; Thu, 20 Apr 2023 01:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681978049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=oiFbyJM/OVQzht3NVRAuOeDRCZOh3MADqrY1DUOhLSk=; b=W44CJRy1XCEmXAOJfq1j1i8m5ot2mGt1/2t049S0Ole+PcZSGboZCJuxwb2GlCXXMFv63r VDYWN4Kpvf9W3bXUOJrvR3NTCF9eE/evJ8DPK5/SLV8lXGBRNdRstU8eWoiGots2GWHAsc T1tAdKarT5V7HKV1cCBJLXaqi5xpAGI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-oMS7FFhqMkiBaKPbv7BaSg-1; Thu, 20 Apr 2023 04:07:25 -0400 X-MC-Unique: oMS7FFhqMkiBaKPbv7BaSg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B9BB329AB405; Thu, 20 Apr 2023 08:07:24 +0000 (UTC) Received: from cantor.redhat.com (unknown [10.2.16.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA9DD1121315; Thu, 20 Apr 2023 08:07:23 +0000 (UTC) From: Jerry Snitselaar To: iommu@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Robin Murphy , Will Deacon , Suravee Suthikulpanit , Joerg Roedel Subject: [PATCH] iommu: amd: Use page mode macros in fetch_pte Date: Thu, 20 Apr 2023 01:07:18 -0700 Message-Id: <20230420080718.523132-1-jsnitsel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763684439544573630?= X-GMAIL-MSGID: =?utf-8?q?1763684439544573630?= Use the page mode macros instead of magic numbers in fetch_pte. Cc: Robin Murphy Cc: Will Deacon Cc: Suravee Suthikulpanit Cc: Joerg Roedel Signed-off-by: Jerry Snitselaar Reviewed-by: Vasant Hegde --- drivers/iommu/amd/io_pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/amd/io_pgtable.c b/drivers/iommu/amd/io_pgtable.c index ace0e9b8b913..61a99d715b23 100644 --- a/drivers/iommu/amd/io_pgtable.c +++ b/drivers/iommu/amd/io_pgtable.c @@ -310,8 +310,8 @@ static u64 *fetch_pte(struct amd_io_pgtable *pgtable, return NULL; /* Large PTE */ - if (PM_PTE_LEVEL(*pte) == 7 || - PM_PTE_LEVEL(*pte) == 0) + if (PM_PTE_LEVEL(*pte) == PAGE_MODE_7_LEVEL || + PM_PTE_LEVEL(*pte) == PAGE_MODE_NONE) break; /* No level skipping support yet */