Skip to content

Commit 2838cfd

Browse files
thierryredingthierryreding
committed
arm64: tegra: Bump #address-cells and #size-cells
The #address-cells and #size-cells properties for the top-level bus were set to 1 because that was enough to represent the register ranges of all the IP blocks on that bus. However, most of these devices can do DMA to a larger address space, so translation of DMA addresses needs to happen in a 64-bit address space. Partially this was already done by the memory controller increasing that address space by setting #address-cells and #size-cells to 2, but a full DMA address translation would still cause truncation when traversing to the top-level bus. Fix this by setting #address-cells = <2> and #size-cells = <2> on the top-level bus and adjusting all "reg" and "ranges" properties of its children. While at it, also move the PCI and GPU nodes back under the top-level bus where they belong. The were put outside of it to work around this same problem. Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent c71e189 commit 2838cfd

5 files changed

Lines changed: 1453 additions & 1445 deletions

File tree

‎arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,67 +2184,67 @@
21842184
GPIO_ACTIVE_LOW>;
21852185
};
21862186
};
2187-
};
21882187

2189-
pcie@14100000 {
2190-
status = "okay";
2188+
pcie@14100000 {
2189+
status = "okay";
21912190

2192-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2191+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
21932192

2194-
phys = <&p2u_hsio_0>;
2195-
phy-names = "p2u-0";
2196-
};
2193+
phys = <&p2u_hsio_0>;
2194+
phy-names = "p2u-0";
2195+
};
21972196

2198-
pcie@14140000 {
2199-
status = "okay";
2197+
pcie@14140000 {
2198+
status = "okay";
22002199

2201-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2200+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22022201

2203-
phys = <&p2u_hsio_7>;
2204-
phy-names = "p2u-0";
2205-
};
2202+
phys = <&p2u_hsio_7>;
2203+
phy-names = "p2u-0";
2204+
};
22062205

2207-
pcie@14180000 {
2208-
status = "okay";
2206+
pcie@14180000 {
2207+
status = "okay";
22092208

2210-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2209+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22112210

2212-
phys = <&p2u_hsio_2>, <&p2u_hsio_3>, <&p2u_hsio_4>,
2213-
<&p2u_hsio_5>;
2214-
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";
2215-
};
2211+
phys = <&p2u_hsio_2>, <&p2u_hsio_3>, <&p2u_hsio_4>,
2212+
<&p2u_hsio_5>;
2213+
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3";
2214+
};
22162215

2217-
pcie@141a0000 {
2218-
status = "okay";
2216+
pcie@141a0000 {
2217+
status = "okay";
22192218

2220-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2221-
vpcie3v3-supply = <&vdd_3v3_pcie>;
2222-
vpcie12v-supply = <&vdd_12v_pcie>;
2219+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2220+
vpcie3v3-supply = <&vdd_3v3_pcie>;
2221+
vpcie12v-supply = <&vdd_12v_pcie>;
22232222

2224-
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2225-
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2226-
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
2223+
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2224+
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2225+
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
22272226

2228-
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2229-
"p2u-5", "p2u-6", "p2u-7";
2230-
};
2227+
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2228+
"p2u-5", "p2u-6", "p2u-7";
2229+
};
22312230

2232-
pcie-ep@141a0000 {
2233-
status = "disabled";
2231+
pcie-ep@141a0000 {
2232+
status = "disabled";
22342233

2235-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2234+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22362235

2237-
reset-gpios = <&gpio TEGRA194_MAIN_GPIO(GG, 1) GPIO_ACTIVE_LOW>;
2236+
reset-gpios = <&gpio TEGRA194_MAIN_GPIO(GG, 1) GPIO_ACTIVE_LOW>;
22382237

2239-
nvidia,refclk-select-gpios = <&gpio_aon TEGRA194_AON_GPIO(AA, 5)
2240-
GPIO_ACTIVE_HIGH>;
2238+
nvidia,refclk-select-gpios = <&gpio_aon TEGRA194_AON_GPIO(AA, 5)
2239+
GPIO_ACTIVE_HIGH>;
22412240

2242-
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2243-
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2244-
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
2241+
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2242+
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2243+
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
22452244

2246-
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2247-
"p2u-5", "p2u-6", "p2u-7";
2245+
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2246+
"p2u-5", "p2u-6", "p2u-7";
2247+
};
22482248
};
22492249

22502250
fan: pwm-fan {

‎arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,46 +2209,46 @@
22092209
GPIO_ACTIVE_LOW>;
22102210
};
22112211
};
2212-
};
22132212

2214-
pcie@14160000 {
2215-
status = "okay";
2213+
pcie@14160000 {
2214+
status = "okay";
22162215

2217-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2216+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22182217

2219-
phys = <&p2u_hsio_11>;
2220-
phy-names = "p2u-0";
2221-
};
2218+
phys = <&p2u_hsio_11>;
2219+
phy-names = "p2u-0";
2220+
};
22222221

2223-
pcie@141a0000 {
2224-
status = "okay";
2222+
pcie@141a0000 {
2223+
status = "okay";
22252224

2226-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2225+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22272226

2228-
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2229-
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2230-
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
2227+
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2228+
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2229+
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
22312230

2232-
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2233-
"p2u-5", "p2u-6", "p2u-7";
2234-
};
2231+
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2232+
"p2u-5", "p2u-6", "p2u-7";
2233+
};
22352234

2236-
pcie-ep@141a0000 {
2237-
status = "disabled";
2235+
pcie-ep@141a0000 {
2236+
status = "disabled";
22382237

2239-
vddio-pex-ctl-supply = <&vdd_1v8ao>;
2238+
vddio-pex-ctl-supply = <&vdd_1v8ao>;
22402239

2241-
reset-gpios = <&gpio TEGRA194_MAIN_GPIO(GG, 1) GPIO_ACTIVE_LOW>;
2240+
reset-gpios = <&gpio TEGRA194_MAIN_GPIO(GG, 1) GPIO_ACTIVE_LOW>;
22422241

2243-
nvidia,refclk-select-gpios = <&gpio_aon TEGRA194_AON_GPIO(AA, 5)
2244-
GPIO_ACTIVE_HIGH>;
2242+
nvidia,refclk-select-gpios = <&gpio_aon TEGRA194_AON_GPIO(AA, 5)
2243+
GPIO_ACTIVE_HIGH>;
22452244

2246-
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2247-
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2248-
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
2245+
phys = <&p2u_nvhs_0>, <&p2u_nvhs_1>, <&p2u_nvhs_2>,
2246+
<&p2u_nvhs_3>, <&p2u_nvhs_4>, <&p2u_nvhs_5>,
2247+
<&p2u_nvhs_6>, <&p2u_nvhs_7>;
22492248

2250-
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2251-
"p2u-5", "p2u-6", "p2u-7";
2249+
phy-names = "p2u-0", "p2u-1", "p2u-2", "p2u-3", "p2u-4",
2250+
"p2u-5", "p2u-6", "p2u-7";
2251+
};
22522252
};
22532253

22542254
fan: pwm-fan {

0 commit comments

Comments
 (0)