Skip to content

memory: tegra: Restore MC state on system resume

Ashish Mhetre linux-tegra lkml 3 versions – Applied

Status from this message: Applied, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 4 repliesApplied
  2. v22 patches 2 repliesSuperseded
  3. v11 patch 2 repliesSuperseded

Changes in v3 from the cover letter

- New patch 1 to change the SoC ->resume() callback return type from int to void, so the wrapper in patch 2 does not need to deal with an err value that is always 0. (Jon Hunter)
- Patches 2 and 3 simplified accordingly, no other functional change.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/3memory: tegra: Make ->resume() callback return voiddrivers/memory/tegra/tegra186.c include/soc/tegra/mc.h+2 -40 replies
2/3memory: tegra: Wire up system sleep PM opsdrivers/memory/tegra/mc.c+14 -00 replies
3/3memory: tegra: Restore MC interrupt masks on resumedrivers/memory/tegra/mc.c+16 -72 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJon Hunter
SeriesR-b
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH V3 0/3] memory: tegra: Restore MC state on system resume

The tegra-mc platform driver does not register any dev_pm_ops, so the SoC-specific ->resume() is never invoked (e.g. tegra186_mc_resume) on system wake. On Tegra186 and later this means MC client Stream-ID override registers are not reprogrammed, and clients behind the ARM SMMU fault on the first DMA after resume.

Patch 1 makes the SoC-level ->resume() callback return void, since the sole implementation never fails. This simplifies the wrapper added in the next patch.

Patch 2 registers a dev_pm_ops on the tegra-mc driver and routes the system resume callback into mc->soc->ops->resume() so the existing SID restore path runs again on wake.

Patch 3 factors the existing intmask programming out of tegra_mc_probe() into a helper and reuses it from the resume path so the MC interrupt mask state, which is also lost across SC7, is restored on wake too.

Changes in V3:
- New patch 1 to change the SoC ->resume() callback return type from int to void, so the wrapper in patch 2 does not need to deal with an err value that is always 0. (Jon Hunter)
- Patches 2 and 3 simplified accordingly, no other functional change.

Changes in V2:
- Split the original single patch into two - register the PM ops and reprogram the MC interrupt masks on resume.

Ashish Mhetre (3):
memory: tegra: Make ->resume() callback return void
memory: tegra: Wire up system sleep PM ops
memory: tegra: Restore MC interrupt masks on resume

 drivers/memory/tegra/mc.c       | 37 ++++++++++++++++++++++++++-------
 drivers/memory/tegra/tegra186.c |  4 +---
 include/soc/tegra/mc.h          |  2 +-
 3 files changed, 32 insertions(+), 11 deletions(-)
Signature · 1 line
2.50.1