Commit e503f539 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2026-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 fixes from Ingo Molnar:

 - Fix resctrl initialization on Hygon CPUs

 - Fix resctrl memory bandwidth counters on Hygon CPUs

 - Fix x86 self-tests build bug

* tag 'x86-urgent-2026-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  selftests/x86: Add selftests include path for kselftest.h after centralization
  x86/resctrl: Fix memory bandwidth counter width for Hygon
  x86/resctrl: Add missing resctrl initialization for Hygon
parents b671c1da d9b40d72

arch/x86/kernel/cpu/resctrl/core.c

+17 −4
Original line number Diff line number Diff line
@@ -825,7 +825,8 @@ static __init bool get_mem_config(void) 


	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)

		return __get_mem_config_intel(&hw_res->r_resctrl);

	else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

	else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||

		 boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)

		return __rdt_get_mem_config_amd(&hw_res->r_resctrl);



	return false;
@@ -987,7 +988,8 @@ static __init void rdt_init_res_defs(void) 
{

	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)

		rdt_init_res_defs_intel();

	else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)

	else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD ||

		 boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)

		rdt_init_res_defs_amd();

}
@@ -1019,8 +1021,19 @@ void resctrl_cpu_detect(struct cpuinfo_x86 *c) 
		c->x86_cache_occ_scale = ebx;

		c->x86_cache_mbm_width_offset = eax & 0xff;



		if (c->x86_vendor == X86_VENDOR_AMD && !c->x86_cache_mbm_width_offset)

		if (!c->x86_cache_mbm_width_offset) {

			switch (c->x86_vendor) {

			case X86_VENDOR_AMD:

				c->x86_cache_mbm_width_offset = MBM_CNTR_WIDTH_OFFSET_AMD;

				break;

			case X86_VENDOR_HYGON:

				c->x86_cache_mbm_width_offset = MBM_CNTR_WIDTH_OFFSET_HYGON;

				break;

			default:

				/* Leave c->x86_cache_mbm_width_offset as 0 */

				break;

			}

		}

	}

}

arch/x86/kernel/cpu/resctrl/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 


#define MBM_CNTR_WIDTH_OFFSET_AMD	20



/* Hygon MBM counter width as an offset from MBM_CNTR_WIDTH_BASE */

#define MBM_CNTR_WIDTH_OFFSET_HYGON	8



#define RMID_VAL_ERROR			BIT_ULL(63)



#define RMID_VAL_UNAVAIL		BIT_ULL(62)

tools/testing/selftests/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) 
BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64))



CFLAGS := -O2 -g -std=gnu99 -pthread -Wall $(KHDR_INCLUDES)

CFLAGS += -I $(top_srcdir)/tools/testing/selftests/



# call32_from_64 in thunks.S uses absolute addresses.

ifeq ($(CAN_BUILD_WITH_NOPIE),1)