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

Merge tag 'x86_platform_for_6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Borislav Petkov:

 - Make sure PCI function 4 IDs of AMD family 0x19, models 0x60-0x7f are
   actually used in the amd_nb.c enumeration

 - Add support for extracting NUMA information from devicetree for
   Hyper-V usages

 - Add PCI device IDs for the new AMD MI300 AI accelerators

 - Annotate an array in struct uv_rtc_timer_head with the new
   __counted_by attribute

 - Rework UV's NMI action parameter handling

* tag 'x86_platform_for_6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs
  x86/numa: Add Devicetree support
  x86/of: Move the x86_flattree_get_config() call out of x86_dtb_init()
  x86/amd_nb: Add AMD Family MI300 PCI IDs
  x86/platform/uv: Annotate struct uv_rtc_timer_head with __counted_by
  x86/platform/uv: Rework NMI "action" modparam handling
parents ca2e9c3b 2a565258

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1534,6 +1534,7 @@ config NUMA 
	depends on X86_64 || (X86_32 && HIGHMEM64G && X86_BIGSMP)

	default y if X86_BIGSMP

	select USE_PERCPU_NUMA_NODE_ID

	select OF_NUMA if OF

	help

	  Enable NUMA (Non-Uniform Memory Access) support.

arch/x86/include/asm/prom.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ static inline void x86_dtb_init(void) { } 
#define of_ioapic 0

#endif



#ifdef CONFIG_OF_EARLY_FLATTREE

void x86_flattree_get_config(void);

#else

static inline void x86_flattree_get_config(void) { }

#endif

extern char cmd_line[COMMAND_LINE_SIZE];



#endif /* __ASSEMBLY__ */

arch/x86/kernel/amd_nb.c

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a

#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507

#define PCI_DEVICE_ID_AMD_MI200_ROOT		0x14bb

#define PCI_DEVICE_ID_AMD_MI300_ROOT		0x14f8



#define PCI_DEVICE_ID_AMD_17H_DF_F4		0x1464

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4	0x15ec
@@ -43,6 +44,7 @@ 
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4	0x12fc

#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4	0x12c4

#define PCI_DEVICE_ID_AMD_MI200_DF_F4		0x14d4

#define PCI_DEVICE_ID_AMD_MI300_DF_F4		0x152c



/* Protect the PCI config register pairs used for SMN. */

static DEFINE_MUTEX(smn_mutex);
@@ -62,6 +64,7 @@ static const struct pci_device_id amd_root_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_ROOT) },

	{}

};
@@ -93,6 +96,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) },

	{}

};
@@ -112,9 +116,13 @@ static const struct pci_device_id amd_nb_link_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F4) },

	{}

};

arch/x86/kernel/devicetree.c

+1 −5
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void __init dtb_apic_setup(void) 
}



#ifdef CONFIG_OF_EARLY_FLATTREE

static void __init x86_flattree_get_config(void)

void __init x86_flattree_get_config(void)

{

	u32 size, map_len;

	void *dt;
@@ -300,14 +300,10 @@ static void __init x86_flattree_get_config(void) 
	unflatten_and_copy_device_tree();

	early_memunmap(dt, map_len);

}

#else

static inline void x86_flattree_get_config(void) { }

#endif



void __init x86_dtb_init(void)

{

	x86_flattree_get_config();



	if (!of_have_populated_dt())

		return;

arch/x86/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,8 @@ void __init setup_arch(char **cmdline_p) 


	early_acpi_boot_init();



	x86_flattree_get_config();



	initmem_init();

	dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT);