Unverified Commit 78aee16a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.7-memory' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 9e6e423a f344675a

drivers/memory/tegra/tegra234.c

+4 −0
Original line number Diff line number Diff line
@@ -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);