Continue converting the metadata readers to the table-driven helper. Add a table that pairs each field ID with the 'struct tdx_sys_info_td_ctrl' member that holds its value, and read all fields by walking that table. Annotate the table as __initconst as it is referenced only during init. AI was used under supervision to review code and workshop logs Signed-off-by: Chao Gao Reviewed-by: Rick Edgecombe --- v4: - Collect tags [Rick] - Drop per-class macros [Nikolay, Dave] --- arch/x86/virt/vmx/tdx/tdx.c | 6 ++++++ arch/x86/virt/vmx/tdx/tdx.h | 5 +++++ arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 17 +---------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 8dcd8b6ca3a2..bd0c8359eb55 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -461,6 +461,12 @@ static const struct field_mapping dpamt_mappings[] __initconst = { tdmr, pamt_page_bitmap_entry_bits), }; +static const struct field_mapping td_ctrl_mappings[] __initconst = { + FIELD_MAP(TDX_FIELD_TDR_BASE_SIZE, td_ctrl, tdr_base_size), + FIELD_MAP(TDX_FIELD_TDCS_BASE_SIZE, td_ctrl, tdcs_base_size), + FIELD_MAP(TDX_FIELD_TDVPS_BASE_SIZE, td_ctrl, tdvps_base_size), +}; + #include "tdx_global_metadata.c" static __init int check_features(struct tdx_sys_info *sysinfo) diff --git a/arch/x86/virt/vmx/tdx/tdx.h b/arch/x86/virt/vmx/tdx/tdx.h index 4faf07925dc0..8bd8928c1802 100644 --- a/arch/x86/virt/vmx/tdx/tdx.h +++ b/arch/x86/virt/vmx/tdx/tdx.h @@ -73,6 +73,11 @@ #define TDX_FIELD_PAMT_1G_ENTRY_SIZE 0x9100000100000012ULL #define TDX_FIELD_PAMT_PAGE_BITMAP_ENTRY_BITS 0x9100000000000013ULL +/* Class "TD Control Structures" */ +#define TDX_FIELD_TDR_BASE_SIZE 0x9800000100000000ULL +#define TDX_FIELD_TDCS_BASE_SIZE 0x9800000100000100ULL +#define TDX_FIELD_TDVPS_BASE_SIZE 0x9800000100000200ULL + /* TDX page types */ #define PT_NDA 0x0 #define PT_RSVD 0x1 diff --git a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c index 0d47ac3335f7..6025421874cd 100644 --- a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c +++ b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c @@ -7,21 +7,6 @@ * Include this file to other C file instead. */ -static __init int get_tdx_sys_info_td_ctrl(struct tdx_sys_info_td_ctrl *sysinfo_td_ctrl) -{ - int ret = 0; - u64 val; - - if (!ret && !(ret = read_sys_metadata_field(0x9800000100000000, &val))) - sysinfo_td_ctrl->tdr_base_size = val; - if (!ret && !(ret = read_sys_metadata_field(0x9800000100000100, &val))) - sysinfo_td_ctrl->tdcs_base_size = val; - if (!ret && !(ret = read_sys_metadata_field(0x9800000100000200, &val))) - sysinfo_td_ctrl->tdvps_base_size = val; - - return ret; -} - static __init int get_tdx_sys_info_td_conf(struct tdx_sys_info_td_conf *sysinfo_td_conf) { int ret = 0; @@ -81,7 +66,7 @@ static __init int get_tdx_sys_info(struct tdx_sys_info *sysinfo) ret = ret ?: read_sys_metadata_table(features_mappings, &sysinfo->features); ret = ret ?: read_sys_metadata_table(tdmr_mappings, &sysinfo->tdmr); - ret = ret ?: get_tdx_sys_info_td_ctrl(&sysinfo->td_ctrl); + ret = ret ?: read_sys_metadata_table(td_ctrl_mappings, &sysinfo->td_ctrl); ret = ret ?: get_tdx_sys_info_td_conf(&sysinfo->td_conf); /* -- 2.52.0