Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a99d34b5 authored by Joseph Lo's avatar Joseph Lo Committed by Stephen Warren
Browse files

Revert "ARM: tegra: add cpu_disable for hotplug" 



This reverts commit 510bb595 "ARM: tegra: add cpu_disable for hotplug".

The Tegra114 support CPU0 hotplug function in HW physically, but it needs
other software to make it work normally after we add CPU idle power down
mode support. So remove them for now.

Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent f2bd77c8

arch/arm/mach-tegra/common.h

+0 −1
Original line number Diff line number Diff line
@@ -2,4 +2,3 @@ extern struct smp_operations tegra_smp_ops; 


extern int tegra_cpu_kill(unsigned int cpu);

extern void tegra_cpu_die(unsigned int cpu);
 
extern int tegra_cpu_disable(unsigned int cpu);

arch/arm/mach-tegra/hotplug.c

+0 −11
Original line number Diff line number Diff line
@@ -46,17 +46,6 @@ void __ref tegra_cpu_die(unsigned int cpu) 
	BUG();

}



int tegra_cpu_disable(unsigned int cpu)

{

	switch (tegra_chip_id) {

	case TEGRA20:

	case TEGRA30:

		return cpu == 0 ? -EPERM : 0;

	default:

		return 0;

	}

}



void __init tegra_hotplug_init(void)

{

	if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))

arch/arm/mach-tegra/platsmp.c

+0 −1
Original line number Diff line number Diff line
@@ -196,6 +196,5 @@ struct smp_operations tegra_smp_ops __initdata = { 
#ifdef CONFIG_HOTPLUG_CPU

	.cpu_kill		= tegra_cpu_kill,

	.cpu_die		= tegra_cpu_die,

	.cpu_disable		= tegra_cpu_disable,

#endif

};