Commit 5f487cd8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-platform-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:

 - Improve the DeviceTree (OF) NUMA enumeration code to address
   kernel warnings & mis-mappings on DeviceTree platforms

 - Migrate x86 platform drivers to the .remove_new callback API

 - Misc cleanups & fixes

* tag 'x86-platform-2024-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/olpc-xo1-sci: Convert to platform remove callback returning void
  x86/platform/olpc-x01-pm: Convert to platform remove callback returning void
  x86/platform/iris: Convert to platform remove callback returning void
  x86/of: Change x86_dtb_parse_smp_config() to static
  x86/of: Map NUMA node to CPUs as per DeviceTree
  x86/of: Set the parse_smp_cfg for all the DeviceTree platforms by default
  x86/hyperv/vtl: Correct x86_init.mpparse.parse_smp_cfg assignment
parents e76f69b9 801549ed

arch/x86/hyperv/hv_vtl.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ void __init hv_vtl_init_platform(void) 
	/* Avoid searching for BIOS MP tables */

	x86_init.mpparse.find_mptable = x86_init_noop;

	x86_init.mpparse.early_parse_smp_cfg = x86_init_noop;

	x86_init.mpparse.parse_smp_cfg = x86_init_noop;



	x86_platform.get_wallclock = get_rtc_noop;

	x86_platform.set_wallclock = set_rtc_noop;

arch/x86/include/asm/prom.h

+2 −7
Original line number Diff line number Diff line
@@ -23,19 +23,14 @@ extern int of_ioapic; 
extern u64 initial_dtb;

extern void add_dtb(u64 data);

void x86_of_pci_init(void);

void x86_dtb_parse_smp_config(void);

void x86_flattree_get_config(void);

#else

static inline void add_dtb(u64 data) { }

static inline void x86_of_pci_init(void) { }

static inline void x86_dtb_parse_smp_config(void) { }

static inline void x86_flattree_get_config(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/devicetree.c

+14 −10
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/pci_x86.h>

#include <asm/setup.h>

#include <asm/i8259.h>

#include <asm/numa.h>

#include <asm/prom.h>



__initdata u64 initial_dtb;
@@ -137,6 +138,7 @@ static void __init dtb_cpu_setup(void) 
			continue;

		}

		topology_register_apic(apic_id, CPU_ACPIID_INVALID, true);

		set_apicid_to_node(apic_id, of_node_to_nid(dn));

	}

}
@@ -277,9 +279,18 @@ static void __init dtb_apic_setup(void) 
	dtb_ioapic_setup();

}



#ifdef CONFIG_OF_EARLY_FLATTREE

static void __init x86_dtb_parse_smp_config(void)

{

	if (!of_have_populated_dt())

		return;



	dtb_setup_hpet();

	dtb_apic_setup();

}



void __init x86_flattree_get_config(void)

{

#ifdef CONFIG_OF_EARLY_FLATTREE

	u32 size, map_len;

	void *dt;
@@ -301,14 +312,7 @@ void __init x86_flattree_get_config(void) 


	if (initial_dtb)

		early_memunmap(dt, map_len);

}

#endif



void __init x86_dtb_parse_smp_config(void)

{

	if (!of_have_populated_dt())

		return;



	dtb_setup_hpet();

	dtb_apic_setup();

	if (of_have_populated_dt())

		x86_init.mpparse.parse_smp_cfg = x86_dtb_parse_smp_config;

}

arch/x86/platform/ce4100/ce4100.c

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ void __init x86_ce4100_early_setup(void) 
	x86_init.resources.probe_roms		= x86_init_noop;

	x86_init.mpparse.find_mptable		= x86_init_noop;

	x86_init.mpparse.early_parse_smp_cfg	= x86_init_noop;

	x86_init.mpparse.parse_smp_cfg		= x86_dtb_parse_smp_config;

	x86_init.pci.init			= ce4100_pci_init;

	x86_init.pci.init_irq			= sdv_pci_init;

arch/x86/platform/iris/iris.c

+2 −3
Original line number Diff line number Diff line
@@ -62,11 +62,10 @@ static int iris_probe(struct platform_device *pdev) 
	return 0;

}



static int iris_remove(struct platform_device *pdev)

static void iris_remove(struct platform_device *pdev)

{

	pm_power_off = old_pm_power_off;

	printk(KERN_INFO "Iris power_off handler uninstalled.\n");

	return 0;

}



static struct platform_driver iris_driver = {
@@ -74,7 +73,7 @@ static struct platform_driver iris_driver = { 
		.name   = "iris",

	},

	.probe          = iris_probe,

	.remove         = iris_remove,

	.remove_new     = iris_remove,

};



static struct resource iris_resources[] = {