memory: tegra: Miscellaneous Tegra124 improvements
cover memory: tegra: Miscellaneous Tegra124 improvements
From: Thierry Reding <[email protected]>
Hi,
this set of changes improves the EMC bindings on Tegra124 and Tegra132. The goal is to bring them up to par with the bindings on Tegra20 and Tegra30 and future bindings that will be introduced for Tegra210 and later.
Note that there's a tiny bit of ABI break here in that new device trees will cause existing debugfs support from working. Since the EMC driver doesn't do anything other than provide a backend for the debugfs interface, I think that's something that we can live with.
A new debugfs interface is introduced in this series and it replaces the existing one, which turns out to be too limited looking forward to plans to make the EMC act as an interconnect provider.
Thierry
Thierry Reding (6):
dt-bindings: memory-controller: Convert Tegra124 EMC to json-schema
memory: tegra: Refashion EMC debugfs interface on Tegra124
ARM: tegra: Let the EMC hardware use the EMC clock
arm64: tegra: Let the EMC hardware use the EMC clock
ARM: tegra: Rename EMC on Tegra124
arm64: tegra: Rename EMC on Tegra132
.../nvidia,tegra124-emc.txt | 374 ------------- .../nvidia,tegra124-emc.yaml | 528 ++++++++++++++++++ arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 2 +- .../arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2 +- .../arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124.dtsi | 4 +- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- drivers/memory/tegra/tegra124-emc.c | 185 ++++-- 9 files changed, 681 insertions(+), 422 deletions(-) delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
Signature · 1 line
2.24.1
PATCH 1/6 dt-bindings: memory-controller: Convert Tegra124 EMC to json-schema
From: Thierry Reding <[email protected]>
Convert the device tree bindings for the Tegra124 EMC controller to the DT schema format using json-schema. While at it, clean up the binding a little bit by removing any mention of how RAM code and clock frequency are represented in unit-addresses (which they aren't) and by adding the EMC clock without which the EMC controller can't change the frequency at which the external memory is clocked. While this is technically an ABI break (the clock was not required before), this should be fine because there isn't much that the EMC driver can do without access to the EMC clock.
--- .../nvidia,tegra124-emc.txt | 374 ------------- .../nvidia,tegra124-emc.yaml | 528 ++++++++++++++++++ 2 files changed, 528 insertions(+), 374 deletions(-) delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt deleted +0 -374
@@ -1,374 +0,0 @@ -NVIDIA Tegra124 SoC EMC (external memory controller) -==================================================== - -Required properties : -- compatible : Should be "nvidia,tegra124-emc". -- reg : physical base address and length of the controller's registers. -- nvidia,memory-controller : phandle of the MC driver. - -The node should contain a "emc-timings" subnode for each supported RAM type -(see field RAM_CODE in register PMC_STRAPPING_OPT_A), with its unit address -being its RAM_CODE. - -Required properties for "emc-timings" nodes : -- nvidia,ram-code : Should contain the value of RAM_CODE this timing set is -used for. - -Each "emc-timings" node should contain a "timing" subnode for every supported -EMC clock rate. The "timing" subnodes should have the clock rate in Hz as -their unit address. - -Required properties for "timing" nodes : -- clock-frequency : Should contain the memory clock rate in Hz. -- The following properties contain EMC timing characterization values -(specified in the board documentation) : - - nvidia,emc-auto-cal-config : EMC_AUTO_CAL_CONFIG - - nvidia,emc-auto-cal-config2 : EMC_AUTO_CAL_CONFIG2 - - nvidia,emc-auto-cal-config3 : EMC_AUTO_CAL_CONFIG3 - - nvidia,emc-auto-cal-interval : EMC_AUTO_CAL_INTERVAL - - nvidia,emc-bgbias-ctl0 : EMC_BGBIAS_CTL0 - - nvidia,emc-cfg : EMC_CFG - - nvidia,emc-cfg-2 : EMC_CFG_2 - - nvidia,emc-ctt-term-ctrl : EMC_CTT_TERM_CTRL - - nvidia,emc-mode-1 : Mode Register 1 - - nvidia,emc-mode-2 : Mode Register 2 - - nvidia,emc-mode-4 : Mode Register 4 - - nvidia,emc-mode-reset : Mode Register 0 - - nvidia,emc-mrs-wait-cnt : EMC_MRS_WAIT_CNT - - nvidia,emc-sel-dpd-ctrl : EMC_SEL_DPD_CTRL - - nvidia,emc-xm2dqspadctrl2 : EMC_XM2DQSPADCTRL2 - - nvidia,emc-zcal-cnt-long : EMC_ZCAL_WAIT_CNT after clock change - - nvidia,emc-zcal-interval : EMC_ZCAL_INTERVAL -- nvidia,emc-configuration : EMC timing characterization data. These are the -registers (see section "15.6.2 EMC Registers" in the TRM) whose values need to -be specified, according to the board documentation: - - EMC_RC - EMC_RFC - EMC_RFC_SLR - EMC_RAS - EMC_RP - EMC_R2W - EMC_W2R - EMC_R2P - EMC_W2P - EMC_RD_RCD - EMC_WR_RCD - EMC_RRD - EMC_REXT - EMC_WEXT - EMC_WDV - EMC_WDV_MASK - EMC_QUSE - EMC_QUSE_WIDTH - EMC_IBDLY - EMC_EINPUT - EMC_EINPUT_DURATION - EMC_PUTERM_EXTRA - EMC_PUTERM_WIDTH - EMC_PUTERM_ADJ - EMC_CDB_CNTL_1 - EMC_CDB_CNTL_2 - EMC_CDB_CNTL_3 - EMC_QRST - EMC_QSAFE - EMC_RDV - EMC_RDV_MASK - EMC_REFRESH - EMC_BURST_REFRESH_NUM - EMC_PRE_REFRESH_REQ_CNT - EMC_PDEX2WR - EMC_PDEX2RD - EMC_PCHG2PDEN - EMC_ACT2PDEN - EMC_AR2PDEN - EMC_RW2PDEN - EMC_TXSR - EMC_TXSRDLL - EMC_TCKE - EMC_TCKESR - EMC_TPD - EMC_TFAW - EMC_TRPAB - EMC_TCLKSTABLE - EMC_TCLKSTOP - EMC_TREFBW - EMC_FBIO_CFG6 - EMC_ODT_WRITE - EMC_ODT_READ - EMC_FBIO_CFG5 - EMC_CFG_DIG_DLL - EMC_CFG_DIG_DLL_PERIOD - EMC_DLL_XFORM_DQS0 - EMC_DLL_XFORM_DQS1 - EMC_DLL_XFORM_DQS2 - EMC_DLL_XFORM_DQS3 - EMC_DLL_XFORM_DQS4 - EMC_DLL_XFORM_DQS5 - EMC_DLL_XFORM_DQS6 - EMC_DLL_XFORM_DQS7 - EMC_DLL_XFORM_DQS8 - EMC_DLL_XFORM_DQS9 - EMC_DLL_XFORM_DQS10 - EMC_DLL_XFORM_DQS11 - EMC_DLL_XFORM_DQS12 - EMC_DLL_XFORM_DQS13 - EMC_DLL_XFORM_DQS14 - EMC_DLL_XFORM_DQS15 - EMC_DLL_XFORM_QUSE0 - EMC_DLL_XFORM_QUSE1 - EMC_DLL_XFORM_QUSE2 - EMC_DLL_XFORM_QUSE3 - EMC_DLL_XFORM_QUSE4 - EMC_DLL_XFORM_QUSE5 - EMC_DLL_XFORM_QUSE6 - EMC_DLL_XFORM_QUSE7 - EMC_DLL_XFORM_ADDR0 - EMC_DLL_XFORM_ADDR1 - EMC_DLL_XFORM_ADDR2 - EMC_DLL_XFORM_ADDR3 - EMC_DLL_XFORM_ADDR4 - EMC_DLL_XFORM_ADDR5 - EMC_DLL_XFORM_QUSE8 - EMC_DLL_XFORM_QUSE9 - EMC_DLL_XFORM_QUSE10 - EMC_DLL_XFORM_QUSE11 - EMC_DLL_XFORM_QUSE12 - EMC_DLL_XFORM_QUSE13 - EMC_DLL_XFORM_QUSE14 - EMC_DLL_XFORM_QUSE15 - EMC_DLI_TRIM_TXDQS0 - EMC_DLI_TRIM_TXDQS1 - EMC_DLI_TRIM_TXDQS2 - EMC_DLI_TRIM_TXDQS3 - EMC_DLI_TRIM_TXDQS4 - EMC_DLI_TRIM_TXDQS5 - EMC_DLI_TRIM_TXDQS6 - EMC_DLI_TRIM_TXDQS7 - EMC_DLI_TRIM_TXDQS8 - EMC_DLI_TRIM_TXDQS9 - EMC_DLI_TRIM_TXDQS10 - EMC_DLI_TRIM_TXDQS11 - EMC_DLI_TRIM_TXDQS12 - EMC_DLI_TRIM_TXDQS13 - EMC_DLI_TRIM_TXDQS14 - EMC_DLI_TRIM_TXDQS15 - EMC_DLL_XFORM_DQ0 - EMC_DLL_XFORM_DQ1 - EMC_DLL_XFORM_DQ2 - EMC_DLL_XFORM_DQ3 - EMC_DLL_XFORM_DQ4 - EMC_DLL_XFORM_DQ5 - EMC_DLL_XFORM_DQ6 - EMC_DLL_XFORM_DQ7 - EMC_XM2CMDPADCTRL - EMC_XM2CMDPADCTRL4 - EMC_XM2CMDPADCTRL5 - EMC_XM2DQPADCTRL2 - EMC_XM2DQPADCTRL3 - EMC_XM2CLKPADCTRL - EMC_XM2CLKPADCTRL2 - EMC_XM2COMPPADCTRL - EMC_XM2VTTGENPADCTRL - EMC_XM2VTTGENPADCTRL2 - EMC_XM2VTTGENPADCTRL3 - EMC_XM2DQSPADCTRL3 - EMC_XM2DQSPADCTRL4 - EMC_XM2DQSPADCTRL5 - EMC_XM2DQSPADCTRL6 - EMC_DSR_VTTGEN_DRV - EMC_TXDSRVTTGEN - EMC_FBIO_SPARE - EMC_ZCAL_WAIT_CNT - EMC_MRS_WAIT_CNT2 - EMC_CTT - EMC_CTT_DURATION - EMC_CFG_PIPE - EMC_DYN_SELF_REF_CONTROL - EMC_QPOP - -Example SoC include file: - -/ { - emc@7001b000 { - compatible = "nvidia,tegra124-emc"; - reg = <0x0 0x7001b000 0x0 0x1000>; - - nvidia,memory-controller = <&mc>; - }; -}; - -Example board file: - -/ { - emc@7001b000 { - emc-timings-3 { - nvidia,ram-code = <3>; - - timing-12750000 { - clock-frequency = <12750000>; - - nvidia,emc-zcal-cnt-long = <0x00000042>; - nvidia,emc-auto-cal-interval = <0x001fffff>; - nvidia,emc-ctt-term-ctrl = <0x00000802>; - nvidia,emc-cfg = <0x73240000>; - nvidia,emc-cfg-2 = <0x000008c5>; - nvidia,emc-sel-dpd-ctrl = <0x00040128>; - nvidia,emc-bgbias-ctl0 = <0x00000008>; - nvidia,emc-auto-cal-config = <0xa1430000>; - nvidia,emc-auto-cal-config2 = <0x00000000>; - nvidia,emc-auto-cal-config3 = <0x00000000>; - nvidia,emc-mode-reset = <0x80001221>; - nvidia,emc-mode-1 = <0x80100003>; - nvidia,emc-mode-2 = <0x80200008>; - nvidia,emc-mode-4 = <0x00000000>; - - nvidia,emc-configuration = < - 0x00000000 /* EMC_RC */ - 0x00000003 /* EMC_RFC */ - 0x00000000 /* EMC_RFC_SLR */ - 0x00000000 /* EMC_RAS */ - 0x00000000 /* EMC_RP */ - 0x00000004 /* EMC_R2W */ - 0x0000000a /* EMC_W2R */ - 0x00000003 /* EMC_R2P */ - 0x0000000b /* EMC_W2P */ - 0x00000000 /* EMC_RD_RCD */ - 0x00000000 /* EMC_WR_RCD */ - 0x00000003 /* EMC_RRD */ - 0x00000003 /* EMC_REXT */ - 0x00000000 /* EMC_WEXT */ - 0x00000006 /* EMC_WDV */ - 0x00000006 /* EMC_WDV_MASK */ - 0x00000006 /* EMC_QUSE */ - 0x00000002 /* EMC_QUSE_WIDTH */ - 0x00000000 /* EMC_IBDLY */ - 0x00000005 /* EMC_EINPUT */ - 0x00000005 /* EMC_EINPUT_DURATION */ - 0x00010000 /* EMC_PUTERM_EXTRA */ - 0x00000003 /* EMC_PUTERM_WIDTH */ - 0x00000000 /* EMC_PUTERM_ADJ */ - 0x00000000 /* EMC_CDB_CNTL_1 */ - 0x00000000 /* EMC_CDB_CNTL_2 */ - 0x00000000 /* EMC_CDB_CNTL_3 */ - 0x00000004 /* EMC_QRST */ - 0x0000000c /* EMC_QSAFE */ - 0x0000000d /* EMC_RDV */ - 0x0000000f /* EMC_RDV_MASK */ - 0x00000060 /* EMC_REFRESH */ - 0x00000000 /* EMC_BURST_REFRESH_NUM */ - 0x00000018 /* EMC_PRE_REFRESH_REQ_CNT */ - 0x00000002 /* EMC_PDEX2WR */ - 0x00000002 /* EMC_PDEX2RD */ - 0x00000001 /* EMC_PCHG2PDEN */ - 0x00000000 /* EMC_ACT2PDEN */ - 0x00000007 /* EMC_AR2PDEN */ - 0x0000000f /* EMC_RW2PDEN */ - 0x00000005 /* EMC_TXSR */ - 0x00000005 /* EMC_TXSRDLL */ - 0x00000004 /* EMC_TCKE */ - 0x00000005 /* EMC_TCKESR */ - 0x00000004 /* EMC_TPD */ - 0x00000000 /* EMC_TFAW */ - 0x00000000 /* EMC_TRPAB */ - 0x00000005 /* EMC_TCLKSTABLE */ - 0x00000005 /* EMC_TCLKSTOP */ - 0x00000064 /* EMC_TREFBW */ - 0x00000000 /* EMC_FBIO_CFG6 */ - 0x00000000 /* EMC_ODT_WRITE */ - 0x00000000 /* EMC_ODT_READ */ - 0x106aa298 /* EMC_FBIO_CFG5 */ - 0x002c00a0 /* EMC_CFG_DIG_DLL */ - 0x00008000 /* EMC_CFG_DIG_DLL_PERIOD */ - 0x00064000 /* EMC_DLL_XFORM_DQS0 */ - 0x00064000 /* EMC_DLL_XFORM_DQS1 */ - 0x00064000 /* EMC_DLL_XFORM_DQS2 */ - 0x00064000 /* EMC_DLL_XFORM_DQS3 */ - 0x00064000 /* EMC_DLL_XFORM_DQS4 */ - 0x00064000 /* EMC_DLL_XFORM_DQS5 */ - 0x00064000 /* EMC_DLL_XFORM_DQS6 */ - 0x00064000 /* EMC_DLL_XFORM_DQS7 */ - 0x00064000 /* EMC_DLL_XFORM_DQS8 */ - 0x00064000 /* EMC_DLL_XFORM_DQS9 */ - 0x00064000 /* EMC_DLL_XFORM_DQS10 */ - 0x00064000 /* EMC_DLL_XFORM_DQS11 */ - 0x00064000 /* EMC_DLL_XFORM_DQS12 */ - 0x00064000 /* EMC_DLL_XFORM_DQS13 */ - 0x00064000 /* EMC_DLL_XFORM_DQS14 */ - 0x00064000 /* EMC_DLL_XFORM_DQS15 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE0 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE1 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE2 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE3 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE4 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE5 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE6 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE7 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR0 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR1 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR2 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR3 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR4 */ - 0x00000000 /* EMC_DLL_XFORM_ADDR5 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE8 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE9 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE10 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE11 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE12 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE13 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE14 */ - 0x00000000 /* EMC_DLL_XFORM_QUSE15 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS0 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS1 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS2 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS3 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS4 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS5 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS6 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS7 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS8 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS9 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS10 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS11 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS12 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS13 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS14 */ - 0x00000000 /* EMC_DLI_TRIM_TXDQS15 */ - 0x000fc000 /* EMC_DLL_XFORM_DQ0 */ - 0x000fc000 /* EMC_DLL_XFORM_DQ1 */ - 0x000fc000 /* EMC_DLL_XFORM_DQ2 */ - 0x000fc000 /* EMC_DLL_XFORM_DQ3 */ - 0x0000fc00 /* EMC_DLL_XFORM_DQ4 */ - 0x0000fc00 /* EMC_DLL_XFORM_DQ5 */ - 0x0000fc00 /* EMC_DLL_XFORM_DQ6 */ - 0x0000fc00 /* EMC_DLL_XFORM_DQ7 */ - 0x10000280 /* EMC_XM2CMDPADCTRL */ - 0x00000000 /* EMC_XM2CMDPADCTRL4 */ - 0x00111111 /* EMC_XM2CMDPADCTRL5 */ - 0x00000000 /* EMC_XM2DQPADCTRL2 */ - 0x00000000 /* EMC_XM2DQPADCTRL3 */ - 0x77ffc081 /* EMC_XM2CLKPADCTRL */ - 0x00000e0e /* EMC_XM2CLKPADCTRL2 */ - 0x81f1f108 /* EMC_XM2COMPPADCTRL */ - 0x07070004 /* EMC_XM2VTTGENPADCTRL */ - 0x0000003f /* EMC_XM2VTTGENPADCTRL2 */ - 0x016eeeee /* EMC_XM2VTTGENPADCTRL3 */ - 0x51451400 /* EMC_XM2DQSPADCTRL3 */ - 0x00514514 /* EMC_XM2DQSPADCTRL4 */ - 0x00514514 /* EMC_XM2DQSPADCTRL5 */ - 0x51451400 /* EMC_XM2DQSPADCTRL6 */ - 0x0000003f /* EMC_DSR_VTTGEN_DRV */ - 0x00000007 /* EMC_TXDSRVTTGEN */ - 0x00000000 /* EMC_FBIO_SPARE */ - 0x00000042 /* EMC_ZCAL_WAIT_CNT */ - 0x000e000e /* EMC_MRS_WAIT_CNT2 */ - 0x00000000 /* EMC_CTT */ - 0x00000003 /* EMC_CTT_DURATION */ - 0x0000f2f3 /* EMC_CFG_PIPE */ - 0x800001c5 /* EMC_DYN_SELF_REF_CONTROL */ - 0x0000000a /* EMC_QPOP */ - >; - }; - }; - }; -};
Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml new file +528 -0
528 lines not on this page · raw message
Signature · 1 line
2.24.1
Re: [PATCH 1/6] dt-bindings: memory-controller: Convert Tegra124 EMC to json-schema
Quoted 12 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Convert the device tree bindings for the Tegra124 EMC controller to the DT schema format using json-schema. While at it, clean up the binding a little bit by removing any mention of how RAM code and clock frequency are represented in unit-addresses (which they aren't) and by adding the EMC clock without which the EMC controller can't change the frequency at which the external memory is clocked. While this is technically an ABI break (the clock was not required before), this should be fine because there isn't much that the EMC driver can do without access to the EMC clock.
Quoted 8 lines
Signed-off-by Thierry Reding <[email protected]>--- .../nvidia,tegra124-emc.txt | 374 ------------- .../nvidia,tegra124-emc.yaml | 528 ++++++++++++++++++ 2 files changed, 528 insertions(+), 374 deletions(-) delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
Re: [PATCH 1/6] dt-bindings: memory-controller: Convert Tegra124 EMC to json-schema
In reply to Thierry RedingQuoted 13 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Convert the device tree bindings for the Tegra124 EMC controller to the DT schema format using json-schema. While at it, clean up the binding a little bit by removing any mention of how RAM code and clock frequency are represented in unit-addresses (which they aren't) and by adding the EMC clock without which the EMC controller can't change the frequency at which the external memory is clocked. While this is technically an ABI break (the clock was not required before), this should be fine because there isn't much that the EMC driver can do without access to the EMC clock.
Quoted 7 lines
Signed-off-by Thierry Reding <[email protected]>--- .../nvidia,tegra124-emc.txt | 374 ------------- .../nvidia,tegra124-emc.yaml | 528 ++++++++++++++++++ 2 files changed, 528 insertions(+), 374 deletions(-) delete mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.yaml
The example fails 'make dt_binding_check':
/home/rob/proj/git/linux-dt/.build-arm64/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.example.dt.yaml:
memory-controller@70019000: '#reset-cells' is a required property /home/rob/proj/git/linux-dt/.build-arm64/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.example.dt.yaml:
external-memory-controller@7001b000: emc-timings-0:timing-0:
'nvidia,emc-mrs-wait-cnt' is a required property /home/rob/proj/git/linux-dt/.build-arm64/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.example.dt.yaml:
external-memory-controller@7001b000: emc-timings-0:timing-0:
'nvidia,emc-xm2dqspadctrl2' is a required property /home/rob/proj/git/linux-dt/.build-arm64/Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.example.dt.yaml:
external-memory-controller@7001b000: emc-timings-0:timing-0:
'nvidia,emc-zcal-interval' is a required property
Rob
PATCH 2/6 memory: tegra: Refashion EMC debugfs interface on Tegra124
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The current debugfs interface is only partially useful. While it allows listing supported frequencies and testing individual clock rates, it is limited in that it can't be used to restrict the range of frequencies that the driver is allowed to set. This is something we may want to use to test adaptive scaling once that's implemented.
--- drivers/memory/tegra/tegra124-emc.c | 185 +++++++++++++++++++++------- 1 file changed, 143 insertions(+), 42 deletions(-)
drivers/memory/tegra/tegra124-emc.c +143 -42
@@ -467,12 +467,20 @@ struct tegra_emc {void __iomem *regs; +struct clk *clk; +enum emc_dram_type dram_type;unsigned int dram_num;struct emc_timing last_timing;struct emc_timing *timings;unsigned int num_timings; + +struct { +struct dentry *root; +unsigned long min_rate; +unsigned long max_rate; + } debugfs; };/* Timing change sequence functions */
@@ -998,38 +1006,51 @@ tegra_emc_find_node_by_ram_code(struct device_node *node, u32 ram_code)return NULL ; } -/* Debugfs entry */ +/* +* debugfs interface +* +* The memory controller driver exposes some files in debugfs that can be used +* to control the EMC frequency. The top-level directory can be found here: +* +* /sys/kernel/debug/emc +* +* It contains the following files: +* +* - available_rates: This file contains a list of valid, space-separated +* EMC frequencies. +* +* - min_rate: Writing a value to this file sets the given frequency as the +* floor of the permitted range. If this is higher than the currently +* configured EMC frequency, this will cause the frequency to be +* increased so that it stays within the valid range. +* +* - max_rate: Similarily to the min_rate file, writing a value to this file +* sets the given frequency as the ceiling of the permitted range. If +* the value is lower than the currently configured EMC frequency, this +* will cause the frequency to be decreased so that it stays within the +* valid range. +*/ -static int emc_debug_rate_get (void *data,u64 *rate) +static bool tegra_emc_validate_rate (struct tegra_emc *emc,unsigned long rate) { -struct clk *c = data; - - *rate =clk_get_rate (c); - -return 0 ; -} +unsigned int i; -static int emc_debug_rate_set (void *data,u64 rate) -{ -struct clk *c = data; +for (i =0 ; i < emc->num_timings; i++) +if (rate == emc->timings[i].rate) +return true; -return clk_set_rate (c, rate); +return false; } -DEFINE_SIMPLE_ATTRIBUTE (emc_debug_rate_fops, emc_debug_rate_get, - emc_debug_rate_set,"%lld\n" ); - -static int emc_debug_supported_rates_show (struct seq_file *s,void *data) +static int tegra_emc_debug_available_rates_show (struct seq_file *s, +void *data) {struct tegra_emc *emc = s->private;const char *prefix ="" ;unsigned int i;for (i =0 ; i < emc->num_timings; i++) { -struct emc_timing *timing = &emc->timings[i]; - -seq_printf (s,"%s%lu" , prefix, timing->rate); - +seq_printf (s,"%s%lu" , prefix, emc->timings[i].rate); prefix =" " ; }
@@ -1038,46 +1059,126 @@ static int emc_debug_supported_rates_show(struct seq_file *s, void *data)return 0 ; } -static int emc_debug_supported_rates_open (struct inode *inode, -struct file *file) +static int tegra_emc_debug_available_rates_open (struct inode *inode, +struct file *file) { -return single_open (file, emc_debug_supported_rates_show, +return single_open (file, tegra_emc_debug_available_rates_show, inode->i_private); } -static const struct file_operations emc_debug_supported_rates_fops = { - .open = emc_debug_supported_rates_open, +static const struct file_operations tegra_emc_debug_available_rates_fops = { + .open = tegra_emc_debug_available_rates_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; +static int tegra_emc_debug_min_rate_get (void *data,u64 *rate) +{ +struct tegra_emc *emc = data; + + *rate = emc->debugfs.min_rate; + +return 0 ; +} + +static int tegra_emc_debug_min_rate_set (void *data,u64 rate) +{ +struct tegra_emc *emc = data; +int err; + +if (!tegra_emc_validate_rate (emc, rate)) +return -EINVAL ; + + err =clk_set_min_rate (emc->clk, rate); +if (err <0 ) +return err; + + emc->debugfs.min_rate = rate; + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (tegra_emc_debug_min_rate_fops, + tegra_emc_debug_min_rate_get, + tegra_emc_debug_min_rate_set,"%llu\n" ); + +static int tegra_emc_debug_max_rate_get (void *data,u64 *rate) +{ +struct tegra_emc *emc = data; + + *rate = emc->debugfs.max_rate; + +return 0 ; +} + +static int tegra_emc_debug_max_rate_set (void *data,u64 rate) +{ +struct tegra_emc *emc = data; +int err; + +if (!tegra_emc_validate_rate (emc, rate)) +return -EINVAL ; + + err =clk_set_max_rate (emc->clk, rate); +if (err <0 ) +return err; + + emc->debugfs.max_rate = rate; + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (tegra_emc_debug_max_rate_fops, + tegra_emc_debug_max_rate_get, + tegra_emc_debug_max_rate_set,"%llu\n" ); +static void emc_debugfs_init (struct device *dev,struct tegra_emc *emc) { -struct dentry *root, *file; -struct clk *clk; +unsigned int i; +int err; - root =debugfs_create_dir ("emc" ,NULL ); -if (!root) { -dev_err (dev,"failed to create debugfs directory\n" ); -return ; + emc->clk =devm_clk_get (dev,"emc" ); +if (IS_ERR (emc->clk)) { +if (PTR_ERR (emc->clk) != -ENODEV ) { +dev_err (dev,"failed to get EMC clock: %ld\n" , +PTR_ERR (emc->clk)); +return ; + } } - clk =clk_get_sys ("tegra-clk-debug" ,"emc" ); -if (IS_ERR (clk)) { -dev_err (dev,"failed to get debug clock: %ld\n" ,PTR_ERR (clk)); + emc->debugfs.min_rate =ULONG_MAX ; + emc->debugfs.max_rate =0 ; + +for (i =0 ; i < emc->num_timings; i++) { +if (emc->timings[i].rate < emc->debugfs.min_rate) + emc->debugfs.min_rate = emc->timings[i].rate; + +if (emc->timings[i].rate > emc->debugfs.max_rate) + emc->debugfs.max_rate = emc->timings[i].rate; + } + + err =clk_set_rate_range (emc->clk, emc->debugfs.min_rate, + emc->debugfs.max_rate); +if (err <0 ) { +dev_err (dev,"failed to set rate range [%lu-%lu] for %pC\n" , + emc->debugfs.min_rate, emc->debugfs.max_rate, + emc->clk);return ; } - file =debugfs_create_file ("rate" ,S_IRUGO |S_IWUSR , root, clk, - &emc_debug_rate_fops); -if (!file) -dev_err (dev,"failed to create debugfs entry\n" ); + emc->debugfs.root =debugfs_create_dir ("emc" ,NULL ); +if (!emc->debugfs.root) { +dev_err (dev,"failed to create debugfs directory\n" ); +return ; + } - file =debugfs_create_file ("supported_rates" ,S_IRUGO , root, emc, - &emc_debug_supported_rates_fops); -if (!file) -dev_err (dev,"failed to create debugfs entry\n" ); +debugfs_create_file ("available_rates" ,S_IRUGO , emc->debugfs.root, emc, + &tegra_emc_debug_available_rates_fops); +debugfs_create_file ("min_rate" ,S_IRUGO |S_IWUSR , emc->debugfs.root, + emc, &tegra_emc_debug_min_rate_fops); +debugfs_create_file ("max_rate" ,S_IRUGO |S_IWUSR , emc->debugfs.root, + emc, &tegra_emc_debug_max_rate_fops); }static int tegra_emc_probe (struct platform_device *pdev)
Signature · 1 line
2.24.1
PATCH 3/6 ARM: tegra: Let the EMC hardware use the EMC clock
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The EMC hardware block needs access to the EMC clock in order to scale the external memory frequency. Add the clocks property so that drivers for the EMC can acquire a reference to the EMC clock.
--- arch/arm/boot/dts/tegra124.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/tegra124.dtsi +2 -0
@@ -625,6 +625,8 @@ mc: memory-controller@70019000 { emc: emc@7001b000 { compatible = "nvidia,tegra124-emc"; reg = <0x0 0x7001b000 0x0 0x1000>; + clocks = <&tegra_car TEGRA124_CLK_EMC>; + clock-names = "emc"; nvidia,memory-controller = <&mc>; };
Signature · 1 line
2.24.1
PATCH 4/6 arm64: tegra: Let the EMC hardware use the EMC clock
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
The EMC hardware block needs access to the EMC clock in order to scale the external memory frequency. Add the clocks property so that drivers for the EMC can acquire a reference to the EMC clock.
--- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +2 -0
@@ -605,6 +605,8 @@ mc: memory-controller@70019000 { emc: emc@7001b000 { compatible = "nvidia,tegra132-emc", "nvidia,tegra124-emc"; reg = <0x0 0x7001b000 0x0 0x1000>; + clocks = <&tegra_car TEGRA124_CLK_EMC>; + clock-names = "emc"; nvidia,memory-controller = <&mc>; };
Signature · 1 line
2.24.1
PATCH 5/6 ARM: tegra: Rename EMC on Tegra124
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Rename the EMC node to external-memory-controller according to device tree best practices.
--- arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 2 +- arch/arm/boot/dts/tegra124.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/tegra124-apalis-emc.dtsi +1 -1
@@ -84,7 +84,7 @@ timing-924000000 { }; }; - emc@7001b000 { + external-memory-controller@7001b000 { emc-timings-1 { nvidia,ram-code = <1>;
arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi +1 -1
@@ -79,7 +79,7 @@ timing-924000000 { }; }; - emc@7001b000 { + external-memory-controller@7001b000 { emc-timings-3 { nvidia,ram-code = <3>;
arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi +1 -1
@@ -219,7 +219,7 @@ timing-792000000 { }; }; - emc@7001b000 { + external-memory-controller@7001b000 { emc-timings-1 { nvidia,ram-code = <1>;
arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi +1 -1
@@ -68,7 +68,7 @@ timing-792000000 { }; }; - emc@7001b000 { + external-memory-controller@7001b000 { emc-timings-1 { nvidia,ram-code = <1>;
arch/arm/boot/dts/tegra124.dtsi +1 -1
@@ -622,7 +622,7 @@ mc: memory-controller@70019000 { #iommu-cells = <1>; }; - emc: emc@7001b000 { + emc: external-memory-controller@7001b000 { compatible = "nvidia,tegra124-emc"; reg = <0x0 0x7001b000 0x0 0x1000>; clocks = <&tegra_car TEGRA124_CLK_EMC>;
Signature · 1 line
2.24.1
PATCH 6/6 arm64: tegra: Rename EMC on Tegra132
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Rename the EMC node to external-memory-controller according to device tree best practices.
--- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra132.dtsi +1 -1
@@ -602,7 +602,7 @@ mc: memory-controller@70019000 { #iommu-cells = <1>; }; - emc: emc@7001b000 { + emc: external-memory-controller@7001b000 { compatible = "nvidia,tegra132-emc", "nvidia,tegra124-emc"; reg = <0x0 0x7001b000 0x0 0x1000>; clocks = <&tegra_car TEGRA124_CLK_EMC>;
Signature · 1 line
2.24.1