diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 22:59:21 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 22:59:21 +0200 |
commit | 78aee16af9c83f17d13752433650d11d4f959312 (patch) | |
tree | c07999aba8659c9b38b450819d203b77d8fdbb81 | |
parent | 9e6e423a3665b82ad2c7b83a51eccc903982f737 (diff) | |
parent | f344675a34383ae26a8230f4b1cd99cbd0defebd (diff) |
Merge tag 'tegra-for-6.7-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers
memory: tegra: Changes for v6.7-rc1
Contains a fix for a long timeout that can make it seems like the system
is hanging during early resume.
* tag 'tegra-for-6.7-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
memory: tegra: Set BPMP msg flags to reset IPC channels
Link: https://lore.kernel.org/r/20231013153723.1729109-4-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | drivers/memory/tegra/tegra234.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 9e5b5dbd9c8d..2845041f32d6 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -986,6 +986,10 @@ static int tegra234_mc_icc_set(struct icc_node *src, struct icc_node *dst) msg.rx.data = &bwmgr_resp; msg.rx.size = sizeof(bwmgr_resp); + if (pclient->bpmp_id >= TEGRA_ICC_BPMP_CPU_CLUSTER0 && + pclient->bpmp_id <= TEGRA_ICC_BPMP_CPU_CLUSTER2) + msg.flags = TEGRA_BPMP_MESSAGE_RESET; + ret = tegra_bpmp_transfer(mc->bpmp, &msg); if (ret < 0) { dev_err(mc->dev, "BPMP transfer failed: %d\n", ret); |