Skip to content

Commit a27b008

Browse files
ahunter6hansendc
authored andcommitted
x86/tdx: Tidy reset_pamt functions
tdx_quirk_reset_paddr() was renamed to reflect that, in fact, the clearing is necessary only for hardware with a certain quirk. That is dealt with in a subsequent patch. Rename reset_pamt functions to contain "quirk" to reflect the new functionality, and remove the now misleading comment. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> Acked-by: Kai Huang <kai.huang@intel.com> Acked-by: Vishal Annapurve <vannapurve@google.com> Link: https://lore.kernel.org/all/20250819155811.136099-3-adrian.hunter%40intel.com
1 parent 94272b0 commit a27b008

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

  • arch/x86/virt/vmx/tdx

arch/x86/virt/vmx/tdx/tdx.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -660,17 +660,17 @@ void tdx_quirk_reset_page(struct page *page)
660660
}
661661
EXPORT_SYMBOL_GPL(tdx_quirk_reset_page);
662662

663-
static void tdmr_reset_pamt(struct tdmr_info *tdmr)
663+
static void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)
664664
{
665665
tdmr_do_pamt_func(tdmr, tdx_quirk_reset_paddr);
666666
}
667667

668-
static void tdmrs_reset_pamt_all(struct tdmr_info_list *tdmr_list)
668+
static void tdmrs_quirk_reset_pamt_all(struct tdmr_info_list *tdmr_list)
669669
{
670670
int i;
671671

672672
for (i = 0; i < tdmr_list->nr_consumed_tdmrs; i++)
673-
tdmr_reset_pamt(tdmr_entry(tdmr_list, i));
673+
tdmr_quirk_reset_pamt(tdmr_entry(tdmr_list, i));
674674
}
675675

676676
static unsigned long tdmrs_count_pamt_kb(struct tdmr_info_list *tdmr_list)
@@ -1142,15 +1142,7 @@ static int init_tdx_module(void)
11421142
* to the kernel.
11431143
*/
11441144
wbinvd_on_all_cpus();
1145-
/*
1146-
* According to the TDX hardware spec, if the platform
1147-
* doesn't have the "partial write machine check"
1148-
* erratum, any kernel read/write will never cause #MC
1149-
* in kernel space, thus it's OK to not convert PAMTs
1150-
* back to normal. But do the conversion anyway here
1151-
* as suggested by the TDX spec.
1152-
*/
1153-
tdmrs_reset_pamt_all(&tdx_tdmr_list);
1145+
tdmrs_quirk_reset_pamt_all(&tdx_tdmr_list);
11541146
err_free_pamts:
11551147
tdmrs_free_pamt_all(&tdx_tdmr_list);
11561148
err_free_tdmrs:

0 commit comments

Comments
 (0)