From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 16A7C941954 for ; Tue, 30 Jan 2024 13:04:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=HBWaGiZQUIbevkgnNS7xARuMP/3JIBzKZ6hSUu2SztQ=; 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=1706619890; v=1; b=vgXP6zgCZxtQ0OA2wBLA6JON80+w7CTAQsGPbYzzhRHHVEOglsZ/KRxxOxfJzUT/2pvyWfGJ +eKKfxwgYUMYD0IDo+KqQ+YR21sG7zzm6OOCAd6OA4ES7ZMj4aMlUjfTJoG0Evo93h+p0DUyZ17 8kNTWoFtLOZKXUt/QYrxSt/U= X-Received: by 127.0.0.2 with SMTP id ySlqYY7687511xsOLcFyd99K; Tue, 30 Jan 2024 05:04:50 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.17476.1706619889767663518 for ; Tue, 30 Jan 2024 05:04:49 -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-139-W30TbLQBPF2e_v0Erdk4Tw-1; Tue, 30 Jan 2024 08:04:45 -0500 X-MC-Unique: W30TbLQBPF2e_v0Erdk4Tw-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 4323985A588; Tue, 30 Jan 2024 13:04:45 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.180]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14B14492BC7; Tue, 30 Jan 2024 13:04:45 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0D76E1800D67; Tue, 30 Jan 2024 14:04:42 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Michael Roth , Oliver Steffen , Jiewen Yao , Gerd Hoffmann , Tom Lendacky , Laszlo Ersek , Min Xu , Ard Biesheuvel , Erdem Aktas Subject: [edk2-devel] [PATCH v3 3/4] UefiCpuPkg/MtrrLib.h: use cache type #defines from ArchitecturalMsr.h Date: Tue, 30 Jan 2024 14:04:40 +0100 Message-ID: <20240130130441.772484-4-kraxel@redhat.com> In-Reply-To: <20240130130441.772484-1-kraxel@redhat.com> References: <20240130130441.772484-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: B843ucIAoav5OFCkRKnyt5Yvx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=vgXP6zgC; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Signed-off-by: Gerd Hoffmann --- UefiCpuPkg/Include/Library/MtrrLib.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h index 86cc1aab3b8e..9d715d50dfb0 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_ +#include + // // According to IA32 SDM, MTRRs number and MSR offset are always consistent // for IA32 processor family @@ -82,20 +84,20 @@ typedef struct _MTRR_SETTINGS_ { // Memory cache types // typedef enum { - CacheUncacheable = 0, - CacheWriteCombining = 1, - CacheWriteThrough = 4, - CacheWriteProtected = 5, - CacheWriteBack = 6, - CacheInvalid = 7 + CacheUncacheable = MSR_IA32_MTRR_CACHE_UNCACHEABLE, + CacheWriteCombining = MSR_IA32_MTRR_CACHE_WRITE_COMBINING, + CacheWriteThrough = MSR_IA32_MTRR_CACHE_WRITE_THROUGH, + CacheWriteProtected = MSR_IA32_MTRR_CACHE_WRITE_PROTECTED, + CacheWriteBack = MSR_IA32_MTRR_CACHE_WRITE_BACK, + CacheInvalid = MSR_IA32_MTRR_CACHE_INVALID_TYPE, } MTRR_MEMORY_CACHE_TYPE; -#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 typedef struct { UINT64 BaseAddress; -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114783): https://edk2.groups.io/g/devel/message/114783 Mute This Topic: https://groups.io/mt/104052592/7686176 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 [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-