Patch "soc/tegra: Fix link errors with PMC disabled" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
soc/tegra: Fix link errors with PMC disabled
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
soc-tegra-fix-link-errors-with-pmc-disabled.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Sun Mar 18 16:55:33 CET 2018
From: Arnd Bergmann <[email protected]>
Date: Mon, 20 Mar 2017 10:13:06 +0100
Subject: soc/tegra: Fix link errors with PMC disabled
From: Arnd Bergmann <[email protected]>
[ Upstream commit bd737038d555468198495230f4233b9ba92e774c ]
With the new Tegra186 PMC driver merged, anything that relies on the previous PMC driver fails to link when that is disabled:
arch/arm/mach-tegra/pm.o: In function `tegra_pm_set':
pm.c:(.text.tegra_pm_set+0x3c): undefined reference to tegra_pmc_enter_suspend_mode' arch/arm/mach-tegra/pm.o: In function tegra_suspend_enter':
pm.c:(.text.tegra_suspend_enter+0x4): undefined reference to tegra_pmc_get_suspend_mode' arch/arm/mach-tegra/pm.o: In function tegra_init_suspend':
pm.c:(.init.text+0x1c): undefined reference to tegra_pmc_get_suspend_mode' pm.c:(.init.text+0x74): undefined reference to tegra_pmc_set_suspend_mode'
ERROR: tegra_powergate_sequence_power_up [drivers/ata/ahci_tegra.ko] undefined!
ERROR: tegra_powergate_power_off [drivers/ata/ahci_tegra.ko] undefined!
Making the definition depend on the presence of the driver makes it build again, though that might not be the correct fix.
--- include/soc/tegra/pmc.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
include/soc/tegra/pmc.h +21 -8
@@ -26,12 +26,6 @@struct clk ;struct reset_control ; -#ifdef CONFIG_PM_SLEEP -enum tegra_suspend_mode tegra_pmc_get_suspend_mode (void ); -void tegra_pmc_set_suspend_mode (enum tegra_suspend_mode mode); -void tegra_pmc_enter_suspend_mode (enum tegra_suspend_mode mode); -#endif /* CONFIG_PM_SLEEP */ -#ifdef CONFIG_SMP bool tegra_pmc_cpu_is_powered (unsigned int cpuid);int tegra_pmc_cpu_power_on (unsigned int cpuid);
@@ -108,7 +102,7 @@ int tegra_pmc_cpu_remove_clamping(unsign#define TEGRA_IO_RAIL_LVDS 57#define TEGRA_IO_RAIL_SYS_DDC 58 -#ifdef CONFIG_ARCH_TEGRA +#ifdef CONFIG_SOC_TEGRA_PMC int tegra_powergate_is_powered (unsigned int id);int tegra_powergate_power_on (unsigned int id);int tegra_powergate_power_off (unsigned int id);
@@ -120,6 +114,11 @@ int tegra_powergate_sequence_power_up(unint tegra_io_rail_power_on (unsigned int id);int tegra_io_rail_power_off (unsigned int id); + +enum tegra_suspend_mode tegra_pmc_get_suspend_mode (void ); +void tegra_pmc_set_suspend_mode (enum tegra_suspend_mode mode); +void tegra_pmc_enter_suspend_mode (enum tegra_suspend_mode mode); +#else static inline int tegra_powergate_is_powered (unsigned int id) {
@@ -157,6 +156,20 @@ static inline int tegra_io_rail_power_of {return -ENOSYS ; } -#endif /* CONFIG_ARCH_TEGRA */ + +static inline enum tegra_suspend_mode tegra_pmc_get_suspend_mode (void ) +{ +return TEGRA_SUSPEND_NONE ; +} + +static inline void tegra_pmc_set_suspend_mode (enum tegra_suspend_mode mode) +{ +} + +static inline void tegra_pmc_enter_suspend_mode (enum tegra_suspend_mode mode) +{ +} + +#endif /* CONFIG_SOC_TEGRA_PMC */ #endif /* __SOC_TEGRA_PMC_H__ */
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/lkdtm-turn-off-kcov-for-lkdtm_rodata_do_nothing.patch queue-4.9/soc-tegra-fix-link-errors-with-pmc-disabled.patch