rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
kernel/0358-WIN2030-16692-fix-improve-numa-node-id-of-each-modul.patch
Jason Montleon 1937e4ada0 Update to 6.6.81
2025-03-08 09:54:45 -05:00

1071 lines
31 KiB
Diff
Raw Blame History

From 44a40dfdc35f04ab3e67504ba2a810499e60c671 Mon Sep 17 00:00:00 2001
From: ningyu <ningyu@eswincomputing.com>
Date: Tue, 24 Dec 2024 20:19:31 +0800
Subject: [PATCH 358/416] WIN2030-16692:fix:improve numa-node-id of each module
Changelogs:
Change-Id: I1857860adc8af214d5faa6e342a644d748d2aacc
Signed-off-by: ningyu <ningyu@eswincomputing.com>
---
.../dts/eswin/eswin-win2030-arch-d2d.dtsi | 9 ++++
.../boot/dts/eswin/eswin-win2030-arch.dtsi | 9 ++++
.../dts/eswin/eswin-win2030-die0-noc.dtsi | 5 ++
.../dts/eswin/eswin-win2030-die0-soc.dtsi | 53 +++++++++++++++++++
.../dts/eswin/eswin-win2030-die1-noc.dtsi | 6 ++-
.../dts/eswin/eswin-win2030-die1-soc.dtsi | 51 ++++++++++++++++++
6 files changed, 132 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-arch-d2d.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-arch-d2d.dtsi
index f138a64dfd45..23eb2a5424d3 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-arch-d2d.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-arch-d2d.dtsi
@@ -272,6 +272,7 @@ PMU1: pmu@1 {
riscv,event-to-mhpmevent = <0x4 0x0 0x202 0x5 0x0 0x4000 0x6 0x0 0x2001 0x10009 0x0 0x102 0x10019 0x0 0x1002 0x10021 0x0 0x802>;
compatible = "riscv,pmu0", "riscv,pmu";
interrupts-extended = <&cpu4_intc 13 &cpu5_intc 13 &cpu6_intc 13 &cpu7_intc 13>;
+ numa-node-id = <1>;
};
d1_bus_err0: bus-error-unit@21700000 {
@@ -280,6 +281,7 @@ d1_bus_err0: bus-error-unit@21700000 {
interrupts = <517>;
reg = <0x0 0x21700000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <1>;
};
d1_bus_err1: bus-error-unit@21701000 {
compatible = "sifive,buserror";
@@ -287,6 +289,7 @@ d1_bus_err1: bus-error-unit@21701000 {
interrupts = <518>;
reg = <0x0 0x21701000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <1>;
};
d1_bus_err2: bus-error-unit@21702000 {
compatible = "sifive,buserror";
@@ -294,6 +297,7 @@ d1_bus_err2: bus-error-unit@21702000 {
interrupts = <519>;
reg = <0x0 0x21702000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <1>;
};
d1_bus_err3: bus-error-unit@21703000 {
compatible = "sifive,buserror";
@@ -301,6 +305,7 @@ d1_bus_err3: bus-error-unit@21703000 {
interrupts = <520>;
reg = <0x0 0x21703000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <1>;
};
D1CACHE: cache-controller@22010000 {
@@ -356,6 +361,7 @@ d1_l2_cache_0: pl2@20104000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <1>;
};
d1_l2_cache_1: pl2@20108000 {
cache-block-size = <64>;
@@ -369,6 +375,7 @@ d1_l2_cache_1: pl2@20108000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <1>;
};
d1_l2_cache_2: pl2@2010c000 {
cache-block-size = <64>;
@@ -382,6 +389,7 @@ d1_l2_cache_2: pl2@2010c000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <1>;
};
d1_l2_cache_3: pl2@20110000 {
cache-block-size = <64>;
@@ -395,6 +403,7 @@ d1_l2_cache_3: pl2@20110000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <1>;
};
};
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-arch.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-arch.dtsi
index 71b68bc3064e..1bcfba13d1a3 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-arch.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-arch.dtsi
@@ -248,6 +248,7 @@ PMU0: pmu@0 {
riscv,event-to-mhpmevent = <0x4 0x0 0x202 0x5 0x0 0x4000 0x6 0x0 0x2001 0x10009 0x0 0x102 0x10019 0x0 0x1002 0x10021 0x0 0x802>;
compatible = "riscv,pmu0", "riscv,pmu";
interrupts-extended = <&cpu0_intc 13 &cpu1_intc 13 &cpu2_intc 13 &cpu3_intc 13>;
+ numa-node-id = <0>;
};
L40: authentication-controller {
compatible = "sifive,authentication0";
@@ -293,6 +294,7 @@ d0_bus_err0: bus-error-unit@hart0 {
interrupts = <517>;
reg = <0x0 0x1700000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <0>;
};
d0_bus_err1: bus-error-unit@hart1 {
compatible = "sifive,buserror";
@@ -300,6 +302,7 @@ d0_bus_err1: bus-error-unit@hart1 {
interrupts = <518>;
reg = <0x0 0x1701000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <0>;
};
d0_bus_err2: bus-error-unit@hart2 {
compatible = "sifive,buserror";
@@ -307,6 +310,7 @@ d0_bus_err2: bus-error-unit@hart2 {
interrupts = <519>;
reg = <0x0 0x1702000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <0>;
};
d0_bus_err3: bus-error-unit@hart3 {
compatible = "sifive,buserror";
@@ -314,6 +318,7 @@ d0_bus_err3: bus-error-unit@hart3 {
interrupts = <520>;
reg = <0x0 0x1703000 0x0 0x1000>;
reg-names = "control";
+ numa-node-id = <0>;
};
D0CACHE: cache-controller@2010000 {
cache-block-size = <64>;
@@ -382,6 +387,7 @@ d0_l2_cache_0: pl2@104000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <0>;
};
d0_l2_cache_1: pl2@108000 {
cache-block-size = <64>;
@@ -395,6 +401,7 @@ d0_l2_cache_1: pl2@108000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <0>;
};
d0_l2_cache_2: pl2@10c000 {
cache-block-size = <64>;
@@ -408,6 +415,7 @@ d0_l2_cache_2: pl2@10c000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <0>;
};
d0_l2_cache_3: pl2@110000 {
cache-block-size = <64>;
@@ -421,6 +429,7 @@ d0_l2_cache_3: pl2@110000 {
reg-names = "control";
sifive,ecc-granularity = <16>;
sifive,perfmon-counters = <6>;
+ numa-node-id = <0>;
};
L10: rom@1a000000 {
compatible = "ucbbar,cacheable-zero0";
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-noc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-noc.dtsi
index fe81f8e622e6..77243ae1b93f 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-noc.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-noc.dtsi
@@ -24,6 +24,7 @@ d0_cfg_noc:d0_cfg_noc{
#size-cells = <2>;
ranges;
reg = <0 0x52060000 0 0x4000>;
+ numa-node-id = <0>;
interrupts = <446>;
interrupt-names = "error";
@@ -273,6 +274,7 @@ d0_llc_noc:d0_llc_noc@52081400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <0>;
reg = <0 0x52081400 0 0x4000>;
interrupts = <441>;
interrupt-names = "error";
@@ -548,6 +550,7 @@ d0_sys_noc:d0_sys_noc@52002C00 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <0>;
reg = <0 0x52002C00 0 0x4000>;
interrupts = <431>;
interrupt-names = "error";
@@ -2220,6 +2223,7 @@ d0_media_noc:d0_media_noc@52021400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <0>;
reg = <0 0x52021400 0 0x4000>;
interrupts = <454>;
interrupt-names = "error";
@@ -2530,6 +2534,7 @@ d0_realtime_noc:d0_realtime_noc@52041400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <0>;
reg = <0 0x52041400 0 0x4000>;
interrupts = <448>;
interrupt-names = "error";
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
index 03f878795dbc..88b00f5478cc 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die0-soc.dtsi
@@ -175,10 +175,12 @@ d0_sys_crg: sys-crg@51828000 {
d0_reset: reset-controller {
compatible = "eswin,win2030-reset";
#reset-cells = <2>;
+ numa-node-id = <0>;
};
d0_clock: clock-controller {
compatible = "eswin,win2030-clock";
#clock-cells = <1>;
+ numa-node-id = <0>;
};
};
@@ -187,10 +189,12 @@ hfclk: hfclk {
compatible = "fixed-clock";
clock-frequency = <LSPCLK_FREQ>;
clock-output-names = "hfclk";
+ numa-node-id = <0>;
};
d0_hsp_sp_csr: hsp_sp_top_csr@0x50440000 {
compatible = "eswin,win2030-hsp-sp-csr", "syscon";
+ numa-node-id = <0>;
#size-cells = <2>;
reg = <0x0 0x50440000 0x0 0x2000>;
};
@@ -466,6 +470,7 @@ noc {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <0>;
#include "eswin-win2030-die0-noc.dtsi"
};
@@ -535,6 +540,7 @@ d0_dsp_subsys:dsp_subsys@52280400 {
reg = <0x0 0x52280400 0x0 0x10000>,
<0x0 0x51810000 0x0 0x8000>;
ranges;
+ numa-node-id = <0>;
dma-ranges = <0x0 0x30000000 0x0 0xc0000000 0x0 0xce000000>;
compatible = "es-dsp-subsys", "simple-bus";
clocks = <&d0_clock WIN2030_CLK_DSPT_CFG_CLK>, <&d0_clock WIN2030_CLK_DSPT_ACLK>;
@@ -687,6 +693,7 @@ d0_sofdsp3: sofdsp@4 {
mailbox-u84-to-dsp-addr = <ESWIN_MAILBOX_U84_TO_DSP_3_REG_BASE>;
dsp-uart = <&d0_uart0>;
device-uart-mutex = <0x51820000>;
+ numa-node-id = <0>;
};
};
@@ -739,6 +746,7 @@ gpu0: gpu@51400000 {
interrupt-parent = <&plic0>;
interrupts = <15>;
dma-noncoherent;
+ numa-node-id = <0>;
#cooling-cells = <2>;
dynamic-power-coefficient = <0>; /*TBD*/
@@ -860,6 +868,7 @@ bootspi: spi@51800000 {
reset-names = "rst";
spi-max-frequency = <4800000>;
reg-io-width = <4>;
+ numa-node-id = <0>;
status = "disabled";
};
sdhci_emmc: mmc@50450000 {
@@ -1084,6 +1093,7 @@ d0_mbox0: mbox@50a00000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_SCPU_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1103,6 +1113,7 @@ d0_mbox1: mbox@50a20000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_LPCPU_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1122,6 +1133,7 @@ d0_mbox2: mbox@50a40000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_NPU_0_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1141,6 +1153,7 @@ d0_mbox3: mbox@50a60000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_NPU_1_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1160,6 +1173,7 @@ d0_mbox4: mbox@50a80000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_0_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1179,6 +1193,7 @@ d0_mbox5: mbox@50aa0000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_1_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1198,6 +1213,7 @@ d0_mbox6: mbox@50ac0000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_2_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1217,6 +1233,7 @@ d0_mbox7: mbox@50ae0000 {
reset-names = "rst", "rst_device";
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_3_IRQ_BIT>;
+ numa-node-id = <0>;
dma-noncoherent;
};
@@ -1272,6 +1289,7 @@ pvt0: pvt@0x50b00000 {
#thermal-sensor-cells = <0>;
status = "disabled";
label = "pvt0";
+ numa-node-id = <0>;
};
pvt1: pvt@0x52360000 {
compatible = "eswin,eswin-pvt-ddr";
@@ -1286,6 +1304,7 @@ pvt1: pvt@0x52360000 {
interrupt-parent = <&plic0>;
status = "disabled";
label = "pvt1";
+ numa-node-id = <0>;
};
fan_control: fan_control@50b50000 {
@@ -1305,6 +1324,7 @@ fan_control: fan_control@50b50000 {
pinctrl-0 = <&pinctrl_die0_fan_tach_default &pinctrl_die0_pwm0_default>;
status = "disabled";
label = "fan_control";
+ numa-node-id = <0>;
};
d0_i2c0: i2c@50950000 {
@@ -1319,6 +1339,7 @@ d0_i2c0: i2c@50950000 {
reg = <0x0 0x50950000 0x0 0x8000>;
interrupts = <105>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c1: i2c@50960000 {
compatible = "snps,designware-i2c";
@@ -1332,6 +1353,7 @@ d0_i2c1: i2c@50960000 {
reg = <0x0 0x50960000 0x0 0x10000>;
interrupts = <106>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c2: i2c@50970000 {
compatible = "snps,designware-i2c";
@@ -1345,6 +1367,7 @@ d0_i2c2: i2c@50970000 {
reg = <0x0 0x50970000 0x0 0x8000>;
interrupts = <107>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c3: i2c@50980000 {
compatible = "snps,designware-i2c";
@@ -1358,6 +1381,7 @@ d0_i2c3: i2c@50980000 {
reg = <0x0 0x50980000 0x0 0x8000>;
interrupts = <108>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c4: i2c@50990000 {
compatible = "snps,designware-i2c";
@@ -1371,6 +1395,7 @@ d0_i2c4: i2c@50990000 {
reg = <0x0 0x50990000 0x0 0x8000>;
interrupts = <109>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c5: i2c@509a0000 {
compatible = "snps,designware-i2c";
@@ -1384,6 +1409,7 @@ d0_i2c5: i2c@509a0000 {
reg = <0x0 0x509a0000 0x0 0x8000>;
interrupts = <110>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c6: i2c@509b0000 {
compatible = "snps,designware-i2c";
@@ -1397,6 +1423,7 @@ d0_i2c6: i2c@509b0000 {
reg = <0x0 0x509b0000 0x0 0x8000>;
interrupts = <111>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c7: i2c@509c0000 {
compatible = "snps,designware-i2c";
@@ -1410,6 +1437,7 @@ d0_i2c7: i2c@509c0000 {
reg = <0x0 0x509c0000 0x0 0x8000>;
interrupts = <112>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c8: i2c@509d0000 {
compatible = "snps,designware-i2c";
@@ -1423,6 +1451,7 @@ d0_i2c8: i2c@509d0000 {
reg = <0x0 0x509d0000 0x0 0x8000>;
interrupts = <113>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_i2c9: i2c@509e0000 {
compatible = "snps,designware-i2c";
@@ -1436,6 +1465,7 @@ d0_i2c9: i2c@509e0000 {
reg = <0x0 0x509e0000 0x0 0x8000>;
interrupts = <114>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
d0_aon_i2c0: i2c@51830000 {
compatible = "snps,designware-i2c";
@@ -1458,6 +1488,7 @@ d0_aon_i2c0: i2c@51830000 {
* 0xff : no need to select to dma controller
*/
dmas = <&d0_aon_dmac 41 0xff>, <&d0_aon_dmac 42 0xff>;
+ numa-node-id = <0>;
};
d0_aon_i2c1: i2c@51838000 {
compatible = "snps,designware-i2c";
@@ -1471,10 +1502,12 @@ d0_aon_i2c1: i2c@51838000 {
reg = <0x0 0x51838000 0x0 0x8000>;
interrupts = <291>;
interrupt-parent = <&plic0>;
+ numa-node-id = <0>;
};
pinctrl: pinctrl@0x51600080 {
compatible = "eswin,eic7x-pinctrl";
reg = <0x0 0x51600080 0x0 0x1FFF80>;
+ numa-node-id = <0>;
status = "disabled";
pinctrl_die0_pwm0_default: pwm0-default{
mux {
@@ -1495,6 +1528,7 @@ gpio0: gpio@51600000 {
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x0 0x51600000 0x0 0x80>;
+ numa-node-id = <0>;
porta: gpio-port@0 {
compatible = "snps,dw-apb-gpio-port";
@@ -1544,6 +1578,7 @@ pwm0: pwm@0x50818000 {
resets = <&d0_reset TIMER_RST_CTRL SW_TIMER_RST_N>;
reset-names = "rst";
status = "disabled";
+ numa-node-id = <0>;
};
wdt0: watchdog@0x50800000 {
@@ -1556,6 +1591,7 @@ wdt0: watchdog@0x50800000 {
interrupts = <87>;
interrupt-parent = <&plic0>;
status = "disabled";
+ numa-node-id = <0>;
};
wdt1: watchdog@0x50804000 {
@@ -1568,6 +1604,7 @@ wdt1: watchdog@0x50804000 {
interrupts = <88>;
interrupt-parent = <&plic0>;
status = "disabled";
+ numa-node-id = <0>;
};
wdt2: watchdog@0x50808000 {
@@ -1580,6 +1617,7 @@ wdt2: watchdog@0x50808000 {
interrupts = <89>;
interrupt-parent = <&plic0>;
status = "disabled";
+ numa-node-id = <0>;
};
wdt3: watchdog@0x5080c000 {
@@ -1592,6 +1630,7 @@ wdt3: watchdog@0x5080c000 {
interrupts = <90>;
interrupt-parent = <&plic0>;
status = "disabled";
+ numa-node-id = <0>;
};
timer0: timer@0x51840000 {
@@ -1700,6 +1739,7 @@ die0_rtc: rtc@51818000 {
resets = <&d0_reset RTC_RST_CTRL SW_RTC_RSTN>;
reset-names = "rtcrst";
status = "disabled";
+ numa-node-id = <0>;
};
d0_i2s0: i2s0@50200000 {
@@ -1719,6 +1759,7 @@ d0_i2s0: i2s0@50200000 {
<&d0_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <0>;
};
d0_i2s1: i2s1@50210000 {
@@ -1738,6 +1779,7 @@ d0_i2s1: i2s1@50210000 {
<&d0_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <0>;
};
d0_i2s2: i2s2@50220000 {
@@ -1757,23 +1799,28 @@ d0_i2s2: i2s2@50220000 {
<&d0_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <0>;
};
d0_soundcard: soundcard {
compatible = "simple-audio-card";
simple-audio-card,name = "Eswin sound card";
+ numa-node-id = <0>;
};
d0_graphcard0: graphcard0 {
compatible = "audio-graph-card";
+ numa-node-id = <0>;
};
d0_graphcard1: graphcard1 {
compatible = "audio-graph-card";
+ numa-node-id = <0>;
};
d0_graphcard2: graphcard2 {
compatible = "audio-graph-card";
+ numa-node-id = <0>;
};
video_output: display-subsystem@0 {
@@ -1786,6 +1833,7 @@ video_output: display-subsystem@0 {
dvb_widgets: dvb-subsystem {
compatible = "amlogic,dvb_widgets";
status = "disabled";
+ numa-node-id = <0>;
};
dc: display_control@502c0000 {
@@ -1909,6 +1957,7 @@ dc_test: dctest@502c0000 {
reg = <0x0 0x502c0000 0x0 0x10000>;
interrupt-parent = <&plic0>;
interrupts = <238>;
+ numa-node-id = <0>;
};
dw_hdmi: hdmi@502a0000 {
@@ -1968,6 +2017,7 @@ d0_usbdrd3_0: usb0@50480000 {
resets = <&d0_reset HSPDMA_RST_CTRL SW_USB0_VAUX_RSTN>;
reset-names = "vaux";
ranges;
+ numa-node-id = <0>;
status = "disabled";
d0_usbdrd_dwc3_0: dwc3@50480000 {
compatible = "snps,dwc3";
@@ -2007,6 +2057,7 @@ d0_usbdrd3_1: usb1@50490000 {
resets = <&d0_reset HSPDMA_RST_CTRL SW_USB1_VAUX_RSTN>;
reset-names = "vaux";
ranges;
+ numa-node-id = <0>;
status = "disabled";
d0_usbdrd_dwc3_1: dwc3@50490000 {
compatible = "snps,dwc3";
@@ -2073,6 +2124,7 @@ vi_top_csr: vi_common_top_csr@0x51030000 {
id = <0>;
#size-cells = <2>;
reg = <0x0 0x51030000 0x0 0x10000>;
+ numa-node-id = <0>;
};
@@ -2281,6 +2333,7 @@ dc_test: dctest@502c0000 {
reg = <0x0 0x502c0000 0x0 0x10000>;
interrupt-parent = <&plic0>;
interrupts = <238>;
+ numa-node-id = <0>;
};
d0_numa_sample:numa_sample@0 {
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-noc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-noc.dtsi
index e1f621d9889e..1f4a1a693b45 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-noc.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-noc.dtsi
@@ -29,7 +29,7 @@ d1_cfg_noc:d1_cfg_noc{
interrupt-names = "error";
interrupt-parent = <&plic1>;
errlogger,idx = <0 1 3 5>;
-
+ numa-node-id = <1>;
sideband_manager@72061000{
compatible = "eswin,win2xxx-noc-sideband-manager";
reg = <0 0x72061000 0 0x10>;
@@ -273,6 +273,7 @@ d1_llc_noc:d1_llc_noc@72081400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <1>;
reg = <0 0x72081400 0 0x4000>;
interrupts = <441>;
interrupt-names = "error";
@@ -548,6 +549,7 @@ d1_sys_noc:d1_sys_noc@72002C00 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <1>;
reg = <0 0x72002C00 0 0x4000>;
interrupts = <431>;
interrupt-names = "error";
@@ -2220,6 +2222,7 @@ d1_media_noc:d1_media_noc@72021400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <1>;
reg = <0 0x72021400 0 0x4000>;
interrupts = <454>;
interrupt-names = "error";
@@ -2530,6 +2533,7 @@ d1_realtime_noc:d1_realtime_noc@72041400 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <1>;
reg = <0 0x72041400 0 0x4000>;
interrupts = <448>;
interrupt-names = "error";
diff --git a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
index b7405c6d6e49..454427d67f0c 100644
--- a/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
+++ b/arch/riscv/boot/dts/eswin/eswin-win2030-die1-soc.dtsi
@@ -161,6 +161,7 @@ d1_noc_wdt:noc@71810324 {
<421>, <422>, <423>, <424>, <425>,
<426>;
eswin,syscrg_csr = <&d1_sys_crg 0x100 0xffff>; //timeout paramerter
+ numa-node-id = <1>;
};
};
@@ -171,10 +172,12 @@ d1_sys_crg: sys-crg@71828000 {
d1_reset: reset-controller {
compatible = "eswin,win2030-reset";
#reset-cells = <2>;
+ numa-node-id = <1>;
};
d1_clock: clock-controller {
compatible = "eswin,win2030-clock";
#clock-cells = <1>;
+ numa-node-id = <1>;
};
};
@@ -182,6 +185,7 @@ d1_hsp_sp_csr: hsp_sp_top_csr@0x70440000 {
compatible = "eswin,win2030-hsp-sp-csr", "syscon";
#size-cells = <2>;
reg = <0x0 0x70440000 0x0 0x2000>;
+ numa-node-id = <1>;
};
smmu1: iommu@70c00000 {
@@ -373,6 +377,7 @@ noc {
#address-cells = <2>;
#size-cells = <2>;
ranges;
+ numa-node-id = <1>;
#include "eswin-win2030-die1-noc.dtsi"
};
vdec1: video-decoder1@70100000 {
@@ -488,6 +493,7 @@ d1_mbox0: mbox@70a00000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_SCPU_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & lpcpu*/
@@ -507,6 +513,7 @@ d1_mbox1: mbox@70a20000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_LPCPU_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & npu_0*/
@@ -526,6 +533,7 @@ d1_mbox2: mbox@70a40000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_NPU_0_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & npu_1*/
@@ -545,6 +553,7 @@ d1_mbox3: mbox@70a60000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_NPU_1_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & dsp_0*/
@@ -564,6 +573,7 @@ d1_mbox4: mbox@70a80000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_0_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & dsp_1*/
@@ -583,6 +593,7 @@ d1_mbox5: mbox@70aa0000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_1_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & dsp_2*/
@@ -602,6 +613,7 @@ d1_mbox6: mbox@70ac0000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_2_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
/*mailbox between u84 & dsp_3*/
@@ -621,6 +633,7 @@ d1_mbox7: mbox@70ae0000 {
lock-bit = <ESWIN_MAILBOX_WR_LOCK_BIT_U84>;
irq-bit = <ESWIN_MAIBOX_DSP_3_IRQ_BIT>;
dma-noncoherent;
+ numa-node-id = <1>;
};
d1_ipc_scpu:ipc@1 {
@@ -674,6 +687,7 @@ d1_pvt0: pvt@0x70b00000 {
#thermal-sensor-cells = <0>;
status = "disabled";
label = "d1_pvt0";
+ numa-node-id = <1>;
};
d1_pvt1: pvt@0x72360000 {
compatible = "eswin,eswin-pvt-ddr";
@@ -688,6 +702,7 @@ d1_pvt1: pvt@0x72360000 {
interrupt-parent = <&plic1>;
status = "disabled";
label = "d1_pvt1";
+ numa-node-id = <1>;
};
d1_fan_control: fan_control@70b50000 {
@@ -705,6 +720,7 @@ d1_fan_control: fan_control@70b50000 {
pwms = <&d1_pwm0 0 100000>;
status = "disabled";
label = "d1_fan_control";
+ numa-node-id = <1>;
};
d1_i2c0: i2c@70950000 {
@@ -729,6 +745,7 @@ d1_i2c0: i2c@70950000 {
* 6 : i2c0 dma controller sel bit in sys_son dma_cfg reg(offset 0x370)
*/
dmas = <&d1_aon_dmac 24 6>, <&d1_aon_dmac 25 6>;
+ numa-node-id = <1>;
};
d1_i2c1: i2c@70960000 {
compatible = "snps,designware-i2c";
@@ -743,6 +760,7 @@ d1_i2c1: i2c@70960000 {
interrupts = <106>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c2: i2c@70970000 {
compatible = "snps,designware-i2c";
@@ -757,6 +775,7 @@ d1_i2c2: i2c@70970000 {
interrupts = <107>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
/*
d1_es8316: es8316@10 {
compatible = "everest,es8316";
@@ -786,6 +805,7 @@ d1_i2c3: i2c@70980000 {
interrupts = <108>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c4: i2c@70990000 {
compatible = "snps,designware-i2c";
@@ -800,6 +820,7 @@ d1_i2c4: i2c@70990000 {
interrupts = <109>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c5: i2c@709a0000 {
compatible = "snps,designware-i2c";
@@ -814,6 +835,7 @@ d1_i2c5: i2c@709a0000 {
interrupts = <110>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c6: i2c@709b0000 {
compatible = "snps,designware-i2c";
@@ -828,6 +850,7 @@ d1_i2c6: i2c@709b0000 {
interrupts = <111>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c7: i2c@709c0000 {
compatible = "snps,designware-i2c";
@@ -842,6 +865,7 @@ d1_i2c7: i2c@709c0000 {
interrupts = <112>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c8: i2c@709d0000 {
compatible = "snps,designware-i2c";
@@ -856,6 +880,7 @@ d1_i2c8: i2c@709d0000 {
interrupts = <113>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2c9: i2c@709e0000 {
compatible = "snps,designware-i2c";
@@ -870,6 +895,7 @@ d1_i2c9: i2c@709e0000 {
interrupts = <114>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_aon_i2c0: i2c@71830000 {
@@ -893,6 +919,7 @@ d1_aon_i2c0: i2c@71830000 {
* 0xff : no need to select to dma controller
*/
dmas = <&d1_aon_dmac 41 0xff>, <&d1_aon_dmac 42 0xff>;
+ numa-node-id = <1>;
};
d1_aon_i2c1: i2c@71838000 {
compatible = "snps,designware-i2c";
@@ -906,6 +933,7 @@ d1_aon_i2c1: i2c@71838000 {
reg = <0x0 0x71838000 0x0 0x10000>;
interrupts = <291>;
interrupt-parent = <&plic1>;
+ numa-node-id = <1>;
};
d1_npu: eswin-npu@71c00000 {
@@ -986,6 +1014,7 @@ d1_gpu: gpu@71400000 {
interrupt-parent = <&plic1>;
interrupts = <15>;
dma-noncoherent;
+ numa-node-id = <1>;
#cooling-cells = <2>;
dynamic-power-coefficient = <0>; /*TBD*/
@@ -1018,6 +1047,7 @@ d1_pinctrl: pinctrl@0x71600080 {
compatible = "eswin,eic7x-pinctrl";
reg = <0x0 0x71600080 0x0 0x1FFF80>;
status = "disabled";
+ numa-node-id = <1>;
d1_pinctrl_pwm0_default: pwm0-default{
mux{
groups = "pwm0_group";
@@ -1061,6 +1091,7 @@ d1_gpio0: gpio@71600000 {
#size-cells = <0>;
compatible = "snps,dw-apb-gpio";
reg = <0x0 0x71600000 0x0 0x80>;
+ numa-node-id = <1>;
d1_porta: gpio-port@0 {
compatible = "snps,dw-apb-gpio-port";
@@ -1207,6 +1238,7 @@ d1_pwm0: pwm@0x70818000 {
pinctrl-names = "default";
pinctrl-0 = <&d1_pinctrl_pwm0_default &d1_pinctrl_pwm1_default &d1_pinctrl_pwm2_default>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_i2s0: i2s0@70200000 {
@@ -1226,6 +1258,7 @@ d1_i2s0: i2s0@70200000 {
<&d1_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <1>;
};
d1_i2s1: i2s1@70210000 {
@@ -1245,6 +1278,7 @@ d1_i2s1: i2s1@70210000 {
<&d1_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <1>;
};
d1_i2s2: i2s@70220000 {
@@ -1264,18 +1298,22 @@ d1_i2s2: i2s@70220000 {
<&d1_reset VO_PHYRST_CTRL SW_VO_PRSTN>;
reset-names = "i2srst", "i2sprst", "voprst";
dma-noncoherent;
+ numa-node-id = <1>;
};
d1_graphcard0: graphcard4 {
compatible = "audio-graph-card";
+ numa-node-id = <1>;
};
d1_graphcard1: graphcard5 {
compatible = "audio-graph-card";
+ numa-node-id = <1>;
};
d1_graphcard2: graphcard6 {
compatible = "audio-graph-card";
+ numa-node-id = <1>;
};
d1_dsp_subsys:dsp_subsys@72280400 {
@@ -1296,6 +1334,7 @@ d1_dsp_subsys:dsp_subsys@72280400 {
<&d1_reset DSP_RST_CTRL SW_DSP_DIV_RSTN_2>,
<&d1_reset DSP_RST_CTRL SW_DSP_DIV_RSTN_3>;
reset-names = "axi", "cfg", "div4", "div_0", "div_1", "div_2","div_3";
+ numa-node-id = <1>;
d1_dsp0:es_dsp@0 {
#address-cells = <1>;
#size-cells = <1>;
@@ -1425,6 +1464,7 @@ d1_rtc: rtc@71818000 {
resets = <&d1_reset RTC_RST_CTRL SW_RTC_RSTN>;
reset-names = "rtcrst";
status = "disabled";
+ numa-node-id = <1>;
};
d1_pcie: pcie@0x74000000 {
@@ -1694,6 +1734,7 @@ d1_bootspi: spi@71800000 {
spi-max-frequency = <4800000>;
reg-io-width = <4>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_video_output: display-subsystem@1 {
@@ -1825,6 +1866,7 @@ d1_dc_test: dctest@702c0000 {
reg = <0x0 0x702c0000 0x0 0x10000>;
interrupt-parent = <&plic1>;
interrupts = <238>;
+ numa-node-id = <1>;
};
d1_dw_hdmi: hdmi@702a0000 {
@@ -1882,6 +1924,7 @@ d1_wdt0: watchdog@0x70800000 {
interrupts = <87>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_wdt1: watchdog@0x70804000 {
@@ -1894,6 +1937,7 @@ d1_wdt1: watchdog@0x70804000 {
interrupts = <88>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_wdt2: watchdog@0x70808000 {
@@ -1906,6 +1950,7 @@ d1_wdt2: watchdog@0x70808000 {
interrupts = <89>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_wdt3: watchdog@0x7080c000 {
@@ -1918,6 +1963,7 @@ d1_wdt3: watchdog@0x7080c000 {
interrupts = <90>;
interrupt-parent = <&plic1>;
status = "disabled";
+ numa-node-id = <1>;
};
d1_gc820: g2d@70140000 {
@@ -1989,6 +2035,7 @@ d1_sdhci_emmc: mmc@70450000 {
d1_graphcard: graphcard {
compatible = "audio-graph-card";
+ numa-node-id = <1>;
};
d1_usbdrd3_0: usb0@70480000 {
@@ -2004,6 +2051,7 @@ d1_usbdrd3_0: usb0@70480000 {
reset-names = "vaux";
ranges;
status = "disabled";
+ numa-node-id = <1>;
d1_usbdrd_dwc3_0: dwc3@70480000 {
compatible = "snps,dwc3";
reg = <0x0 0x70480000 0x0 0x10000>;
@@ -2043,6 +2091,7 @@ d1_usbdrd3_1: usb1@70490000 {
reset-names = "vaux";
ranges;
status = "disabled";
+ numa-node-id = <1>;
d1_usbdrd_dwc3_1: dwc3@70490000 {
compatible = "snps,dwc3";
reg = <0x0 0x70490000 0x0 0x10000>;
@@ -2107,6 +2156,7 @@ d1_vi_top_csr: vi_common_top_csr@0x71030000 {
id = <0>;
#size-cells = <2>;
reg = <0x0 0x71030000 0x0 0x10000>;
+ numa-node-id = <1>;
};
d1_isp_0: isp@0x71000000 {
@@ -2307,6 +2357,7 @@ d1_dc_test: dctest@702c0000 {
reg = <0x0 0x702c0000 0x0 0x10000>;
interrupt-parent = <&plic1>;
interrupts = <238>;
+ numa-node-id = <1>;
};
d1_numa_sample:numa_sample@1 {
--
2.48.1
Reference in New Issue View Git Blame Copy Permalink