From nobody Mon Sep 16 19:37:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+114379+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114379+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706171001; cv=none; d=zohomail.com; s=zohoarc; b=fJyy2c72eUSkG2O1uK2jsZKmiA0dcXUIvj2canSe2B6Git4AYOH0ZEy/L3ojmSSQsuzeVq/X4Wn9eo29LgwAO+5xhjal+ivEUbAxOBZuUgIWHMNg3LaafSlSQLZlp7aw9OUt0ip2+Hhz1hkgnriOMWfGtnMHuABbwk1tm9iFGIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706171001; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=f6gh+EfqQkKUpIwr80BcPoVdLw9UkEkO2Ci/A6esZIQ=; b=WA7TzyJoErbGdeB2aTpaRA6WagvTIEr5H+6HYrYjES7BJYLG0caqSVZliJzN69e5BITzsLwTK79BZlc1VzKzOg5yT223yWeGv3UKwiv45HyCJo5ntTSCVe7VoxZITtCjnt07MgtCsDqLzZrGijHHfXX2ZrspMEF2XYJUjEAjkO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114379+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1706171001015980.063301511919; Thu, 25 Jan 2024 00:23:21 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=13bCzb9+n+us4D36qvc4jS2Do/CBnixJzaJdykltfcM=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1706171000; v=1; b=tp3ytAdVtRcjiXidMoTxcZXhpoXv2LeMljSHqxCXuQp+raPDT6kjdYTt0WrmM4YLXziuV0Op LKRXTfdrdMHNuarGQUjp5ExvFKizZCmxHeWnuDa+rllN/rdnwT/qx/jzaFXT0LKZok80ZjZPx9M tZRoI6aknmzjllzFFJzl4MLc= X-Received: by 127.0.0.2 with SMTP id wd6KYY1788612x5kz6ZOfPE7; Thu, 25 Jan 2024 00:23:20 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.12560.1706171000007796973 for ; Thu, 25 Jan 2024 00:23:20 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-qBj7Q2FJMT2wqBtHY9Mywg-1; Thu, 25 Jan 2024 03:23:14 -0500 X-MC-Unique: qBj7Q2FJMT2wqBtHY9Mywg-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3138D185A780; Thu, 25 Jan 2024 08:23:14 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00AD3492BC9; Thu, 25 Jan 2024 08:23:14 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B65CC1801A9B; Thu, 25 Jan 2024 09:23:11 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Laszlo Ersek , Erdem Aktas , Michael Roth , Min Xu , Gerd Hoffmann , Jiewen Yao , Tom Lendacky , Oliver Steffen Subject: [edk2-devel] [PATCH v2 3/4] UefiCpuPkg/MtrrLib.h: use cache type #defines from ArchitecturalMsr.h Date: Thu, 25 Jan 2024 09:23:10 +0100 Message-ID: <20240125082311.310203-4-kraxel@redhat.com> In-Reply-To: <20240125082311.310203-1-kraxel@redhat.com> References: <20240125082311.310203-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: l0D1UJBcmmG9FadbXfMFM89Dx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1706171001592100013 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- UefiCpuPkg/Include/Library/MtrrLib.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Libr= ary/MtrrLib.h index 86cc1aab3b8e..c7d505ac06ed 100644 --- a/UefiCpuPkg/Include/Library/MtrrLib.h +++ b/UefiCpuPkg/Include/Library/MtrrLib.h @@ -9,6 +9,8 @@ #ifndef _MTRR_LIB_H_ #define _MTRR_LIB_H_ =20 +#include + // // According to IA32 SDM, MTRRs number and MSR offset are always consistent // for IA32 processor family @@ -90,12 +92,12 @@ typedef enum { CacheInvalid =3D 7 } MTRR_MEMORY_CACHE_TYPE; =20 -#define MTRR_CACHE_UNCACHEABLE 0 -#define MTRR_CACHE_WRITE_COMBINING 1 -#define MTRR_CACHE_WRITE_THROUGH 4 -#define MTRR_CACHE_WRITE_PROTECTED 5 -#define MTRR_CACHE_WRITE_BACK 6 -#define MTRR_CACHE_INVALID_TYPE 7 +#define MTRR_CACHE_UNCACHEABLE MSR_IA32_MTRR_CACHE_UNCACHEABLE +#define MTRR_CACHE_WRITE_COMBINING MSR_IA32_MTRR_CACHE_WRITE_COMBINING +#define MTRR_CACHE_WRITE_THROUGH MSR_IA32_MTRR_CACHE_WRITE_THROUGH +#define MTRR_CACHE_WRITE_PROTECTED MSR_IA32_MTRR_CACHE_WRITE_PROTECTED +#define MTRR_CACHE_WRITE_BACK MSR_IA32_MTRR_CACHE_WRITE_BACK +#define MTRR_CACHE_INVALID_TYPE MSR_IA32_MTRR_CACHE_INVALID_TYPE =20 typedef struct { UINT64 BaseAddress; --=20 2.43.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114379): https://edk2.groups.io/g/devel/message/114379 Mute This Topic: https://groups.io/mt/103950481/1787277 Mute #defines:https://edk2.groups.io/g/devel/mutehashtag/defines Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-