Skip to contentSkip to conversation

memory: tegra: Changes for v5.14-rc1

GIT PULL Thierry Reding 3 participants 8 messages Jun 3, 2021 – Jun 7, 2021 Tegra architecture support

lore
Share & tools
lore
#0 lore raw

Hi Krzysztof,

The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:

Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.14-memory

for you to fetch changes up to b4f74b59b99fab61ab97fc0e506f349579d8fefc:

memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table() (2021-06-03 14:24:03 +0200)

Thanks,
Thierry

----------------------------------------------------------------
memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev() soc/tegra: regulators: Bump voltages on system reboot soc/tegra: Add stub for soc_is_tegra()
soc/tegra: Add devm_tegra_core_dev_init_opp_table() soc/tegra: fuse: Add stubs needed for compile-testing
clk: tegra: Add stubs needed for compile-testing
memory: tegra: Fix compilation warnings on 64bit platforms
memory: tegra: Enable compile testing for all drivers
memory: tegra20-emc: Use devm_tegra_core_dev_init_opp_table()
memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table()

Thierry Reding (3):

      Merge branch 'for-5.14/regulator' into for-5.14/soc
      Merge branch 'for-5.14/clk' into for-5.14/memory
      Merge branch 'for-5.14/soc' into for-5.14/memory
 drivers/clk/tegra/clk-periph-gate.c      |  80 +++++++++++++++----------
 drivers/clk/tegra/clk-periph.c           |  11 ++++
 drivers/clk/tegra/clk-pll.c              |  12 ++--
 drivers/clk/tegra/clk-tegra-periph.c     |   6 +-
 drivers/clk/tegra/clk-tegra-super-cclk.c |  16 ++++-
 drivers/clk/tegra/clk-tegra20.c          |   6 +-
 drivers/clk/tegra/clk-tegra30.c          |   6 +-
 drivers/clk/tegra/clk.h                  |   4 --
 drivers/memory/tegra/Kconfig             |  18 +++---
 drivers/memory/tegra/tegra124-emc.c      |   4 +-
 drivers/memory/tegra/tegra20-emc.c       |  48 ++-------------
 drivers/memory/tegra/tegra30-emc.c       |  52 ++--------------
 drivers/regulator/core.c                 |  23 +++++++
 drivers/soc/tegra/common.c               |  97 ++++++++++++++++++++++++++++++
 drivers/soc/tegra/pmc.c                  |   5 --
 drivers/soc/tegra/regulators-tegra20.c   |  75 ++++++++++++++++++++++-
 drivers/soc/tegra/regulators-tegra30.c   |  75 ++++++++++++++++++++++-
 include/linux/clk/tegra.h                | 100 ++++++++++++++++++++++++-------
 include/linux/regulator/driver.h         |   1 +
 include/soc/tegra/common.h               |  31 ++++++++++
 include/soc/tegra/fuse.h                 |  20 ++++++-
 21 files changed, 507 insertions(+), 183 deletions(-)
#1 lore raw
Quoted 44 lines · Thierry Reding

Hi Krzysztof,

The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:

Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/tegra-for-5.14-memory

for you to fetch changes up to b4f74b59b99fab61ab97fc0e506f349579d8fefc:

memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table() (2021-06-03 14:24:03 +0200)

Thanks,
Thierry

----------------------------------------------------------------
memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev() soc/tegra: regulators: Bump voltages on system reboot soc/tegra: Add stub for soc_is_tegra()
soc/tegra: Add devm_tegra_core_dev_init_opp_table() soc/tegra: fuse: Add stubs needed for compile-testing
clk: tegra: Add stubs needed for compile-testing
memory: tegra: Fix compilation warnings on 64bit platforms
memory: tegra: Enable compile testing for all drivers
memory: tegra20-emc: Use devm_tegra_core_dev_init_opp_table()
memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table()

Quoted 5 lines

Thierry Reding (3):

      Merge branch 'for-5.14/regulator' into for-5.14/soc
      Merge branch 'for-5.14/clk' into for-5.14/memory
      Merge branch 'for-5.14/soc' into for-5.14/memory

Thanks, pulled.

Best regards,
Krzysztof

#2 lore raw
In reply to Thierry Reding

03.06.2021 17:37, Thierry Reding пишет:

Quoted 17 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

#3 lore raw
Quoted 18 lines · Dmitry Osipenko

03.06.2021 17:37, Thierry Reding пишет:

Quoted 16 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 5 lines
Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

soc/tegra patches usually go in through ARM SoC. This is merely included here because it was part of the set of patches that were needed to enable compile testing for the memory controller drivers.

I've applied the remaining soc/tegra patches (12-14 of the series) to my for-5.14/soc branch but ended up not pulling that part in because it was unnecessary for the memory controller patches.

Thierry

#4 lore raw

04.06.2021 12:32, Thierry Reding пишет:

Quoted 25 lines · Dmitry Osipenko
Quoted 18 lines

03.06.2021 17:37, Thierry Reding пишет:

Quoted 16 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 5 lines
Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

Quoted 7 lines

soc/tegra patches usually go in through ARM SoC. This is merely included here because it was part of the set of patches that were needed to enable compile testing for the memory controller drivers.

I've applied the remaining soc/tegra patches (12-14 of the series) to my for-5.14/soc branch but ended up not pulling that part in because it was unnecessary for the memory controller patches.

Does this mean that if for-5.14/soc will be pulled first into mainline, then the patches will be applied in a wrong order?

#5 lore raw
Quoted 30 lines · Dmitry Osipenko

04.06.2021 12:32, Thierry Reding пишет:

Quoted 29 lines · Dmitry Osipenko
Quoted 18 lines

03.06.2021 17:37, Thierry Reding пишет:

Quoted 16 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 5 lines
Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

soc/tegra patches usually go in through ARM SoC. This is merely included here because it was part of the set of patches that were needed to enable compile testing for the memory controller drivers.

Quoted 6 lines
Quoted 3 lines

I've applied the remaining soc/tegra patches (12-14 of the series) to my for-5.14/soc branch but ended up not pulling that part in because it was unnecessary for the memory controller patches.

Does this mean that if for-5.14/soc will be pulled first into mainline, then the patches will be applied in a wrong order?

All of the branches of each maintainer should be bisectable, so order of pulling by Linus' should not matter. Assuming current Thierry's branches are bisectable, how Linus' tree can be broken after specific pull order?

Best regards,
Krzysztof

#6 lore raw
Quoted 35 lines · Krzysztof Kozlowski
Quoted 34 lines · Dmitry Osipenko

04.06.2021 12:32, Thierry Reding пишет:

Quoted 32 lines · Dmitry Osipenko
Quoted 18 lines

03.06.2021 17:37, Thierry Reding пишет:

Quoted 16 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 5 lines
Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

soc/tegra patches usually go in through ARM SoC. This is merely included here because it was part of the set of patches that were needed to enable compile testing for the memory controller drivers.

I've applied the remaining soc/tegra patches (12-14 of the series) to my for-5.14/soc branch but ended up not pulling that part in because it was unnecessary for the memory controller patches.

Quoted 6 lines
Quoted 2 lines

Does this mean that if for-5.14/soc will be pulled first into mainline, then the patches will be applied in a wrong order?

All of the branches of each maintainer should be bisectable, so order of pulling by Linus' should not matter. Assuming current Thierry's branches are bisectable, how Linus' tree can be broken after specific pull order?

Yeah, I don't see how there could be issues. The for-5.14/soc does have all the dependencies that it needs, as far as I can tell, as does the for-5.14/memory branch. If for-5.14/soc gets pulled first, then the sub-branch that's included in for-5.14/memory will end up in ARM SoC before for-5.14/memory, but that should be harmless. Once for-5.14/memory is then pulled in, it'll pull in all the dependencies with it, except that part of them will be there already from for-5.14/soc.

The only way this could break is if either the original series wasn't bisectible, or if some of the later SoC patches rely on patches from the memory portion of that, which rely on the earlier SoC patches. That'd be a very odd circular dependency and would add to the complexity on how to handle this. But given that all these branches seem to be building fine, I don't think that's the case.

If something like that ever happens within a series, please make sure to point that out. In general a good way to manage such circular dependencies is to post subseries separately and make a note of the dependencies in the cover letter to make that clearer. That's also why it's usually a good idea to send series such that the patches within are ordered by tree. That way it's trivial to find out if there are any such circular dependencies by doing a bisectibility build on the branch.

Thierry

#7 lore raw

07.06.2021 16:26, Thierry Reding пишет:

Quoted 59 lines · Krzysztof Kozlowski
Quoted 35 lines · Dmitry Osipenko
Quoted 34 lines

04.06.2021 12:32, Thierry Reding пишет:

Quoted 32 lines · Dmitry Osipenko
Quoted 18 lines

03.06.2021 17:37, Thierry Reding пишет:

Quoted 16 lines

memory: tegra: Changes for v5.14-rc1

This stable tag contains Dmitry's power domain work, including all the necessary dependencies from the regulator, clock and ARM SoC trees.

----------------------------------------------------------------
Dmitry Osipenko (18):
clk: tegra30: Use 300MHz for video decoder by default
clk: tegra: Fix refcounting of gate clocks
clk: tegra: Ensure that PLLU configuration is applied properly
clk: tegra: Halve SCLK rate on Tegra20
clk: tegra: Don't allow zero clock rate for PLLs
clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling
clk: tegra: Mark external clocks as not having reset control
clk: tegra: Don't deassert reset on enabling clocks
regulator: core: Add regulator_sync_voltage_rdev()

Quoted 5 lines
Quoted 1 line

soc/tegra: regulators: Bump voltages on system reboot

This patch is a build dependency prerequisite for the "soc/tegra:
regulators: Support core domain state syncing" patch. Will you send a new PR to Krzysztof with the remaining soc/tegra patches?

soc/tegra patches usually go in through ARM SoC. This is merely included here because it was part of the set of patches that were needed to enable compile testing for the memory controller drivers.

I've applied the remaining soc/tegra patches (12-14 of the series) to my for-5.14/soc branch but ended up not pulling that part in because it was unnecessary for the memory controller patches.

Quoted 6 lines
Quoted 2 lines

Does this mean that if for-5.14/soc will be pulled first into mainline, then the patches will be applied in a wrong order?

All of the branches of each maintainer should be bisectable, so order of pulling by Linus' should not matter. Assuming current Thierry's branches are bisectable, how Linus' tree can be broken after specific pull order?

Yeah, I don't see how there could be issues. The for-5.14/soc does have all the dependencies that it needs, as far as I can tell, as does the for-5.14/memory branch. If for-5.14/soc gets pulled first, then the sub-branch that's included in for-5.14/memory will end up in ARM SoC before for-5.14/memory, but that should be harmless. Once for-5.14/memory is then pulled in, it'll pull in all the dependencies with it, except that part of them will be there already from for-5.14/soc.

The only way this could break is if either the original series wasn't bisectible, or if some of the later SoC patches rely on patches from the memory portion of that, which rely on the earlier SoC patches. That'd be a very odd circular dependency and would add to the complexity on how to handle this. But given that all these branches seem to be building fine, I don't think that's the case.

Quoted 7 lines

If something like that ever happens within a series, please make sure to point that out. In general a good way to manage such circular dependencies is to post subseries separately and make a note of the dependencies in the cover letter to make that clearer. That's also why it's usually a good idea to send series such that the patches within are ordered by tree. That way it's trivial to find out if there are any such circular dependencies by doing a bisectibility build on the branch.

I see now that for-5.14/soc has the "Bump voltages on system reboot" patch, so it should be okay.