Merge branch 'for-5.8/arm/core' into for-5.8/cpuidle (1555547d) · Commits · 戴 / test

arch/arm/mach-tegra/pm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,8 @@ int tegra_pm_enter_lp2(void)
		restore_cpu_complex();
		cpu_cluster_pm_exit();

		call_firmware_op(prepare_idle, TF_PM_MODE_NONE);

		return err;
		}

		@@ -391,6 +393,8 @@ static int tegra_suspend_enter(suspend_state_t state)

		local_fiq_enable();

		call_firmware_op(prepare_idle, TF_PM_MODE_NONE);

		return 0;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,12 @@ ENTRY(tegra_resume_trusted_foundations)
		reteq lr

		.arch_extension sec
		/* First call after suspend wakes firmware. No arguments required. */
		/*
		* First call after suspend wakes firmware. No arguments required
		* for some firmware versions. Downstream kernel of ASUS TF300T uses
		* r0=3 for the wake-up notification.
		*/
		mov r0, #3
		smc #0

		b cpu_resume

+3 −6

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		#include <linux/clk/tegra.h>
		#include <linux/genalloc.h>
		#include <linux/mailbox_client.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/of_address.h>
		#include <linux/of_device.h>
		@@ -869,12 +870,8 @@ static struct platform_driver tegra_bpmp_driver = {
		.name = "tegra-bpmp",
		.of_match_table = tegra_bpmp_match,
		.pm = &tegra_bpmp_pm_ops,
		.suppress_bind_attrs = true,
		},
		.probe = tegra_bpmp_probe,
		};

		static int __init tegra_bpmp_init(void)
		{
		return platform_driver_register(&tegra_bpmp_driver);
		}
		core_initcall(tegra_bpmp_init);
		builtin_platform_driver(tegra_bpmp_driver);

+19 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@

		#define TF_CACHE_ENABLE 1
		#define TF_CACHE_DISABLE 2
		#define TF_CACHE_REENABLE 4

		#define TF_SET_CPU_BOOT_ADDR_SMC 0xfffff200

		@@ -29,6 +30,7 @@
		#define TF_CPU_PM_S1 0xffffffe4
		#define TF_CPU_PM_S1_NOFLUSH_L2 0xffffffe7

		static unsigned long tf_idle_mode = TF_PM_MODE_NONE;
		static unsigned long cpu_boot_addr;

		static void tf_generic_smc(u32 type, u32 arg1, u32 arg2)
		@@ -85,25 +87,40 @@ static int tf_prepare_idle(unsigned long mode)
		cpu_boot_addr);
		break;

		case TF_PM_MODE_NONE:
		break;

		default:
		return -EINVAL;
		}

		tf_idle_mode = mode;

		return 0;
		}

		#ifdef CONFIG_CACHE_L2X0
		static void tf_cache_write_sec(unsigned long val, unsigned int reg)
		{
		u32 l2x0_way_mask = 0xff;
		u32 enable_op, l2x0_way_mask = 0xff;

		switch (reg) {
		case L2X0_CTRL:
		if (l2x0_saved_regs.aux_ctrl & L310_AUX_CTRL_ASSOCIATIVITY_16)
		l2x0_way_mask = 0xffff;

		switch (tf_idle_mode) {
		case TF_PM_MODE_LP2:
		enable_op = TF_CACHE_REENABLE;
		break;

		default:
		enable_op = TF_CACHE_ENABLE;
		break;
		}

		if (val == L2X0_CTRL_EN)
		tf_generic_smc(TF_CACHE_MAINT, TF_CACHE_ENABLE,
		tf_generic_smc(TF_CACHE_MAINT, enable_op,
		l2x0_saved_regs.aux_ctrl);
		else
		tf_generic_smc(TF_CACHE_MAINT, TF_CACHE_DISABLE,

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#define TF_PM_MODE_LP1_NO_MC_CLK 2
		#define TF_PM_MODE_LP2 3
		#define TF_PM_MODE_LP2_NOFLUSH_L2 4
		#define TF_PM_MODE_NONE 5

		struct trusted_foundations_platform_data {
		unsigned int version_major;