Commit 6d5edfac authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Updated Xilinx patch to include remoteproc

parent 0b31cf48
diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/iwaveg35m.dts diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/iwaveg35m.dts
--- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts 1970-01-01 00:00:00.000000000 +0000 --- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts 1970-01-01 00:00:00.000000000 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/iwaveg35m.dts 2025-01-26 04:19:56.061592446 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/iwaveg35m.dts 2025-02-28 11:46:51.728298292 +0000
@@ -0,0 +1,490 @@ @@ -0,0 +1,490 @@
+/dts-v1/; +/dts-v1/;
+#include "zynqmp.dtsi" +#include "zynqmp.dtsi"
...@@ -75,7 +75,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5. ...@@ -75,7 +75,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.
+ }; + };
+ }; + };
+ +
+ tcm_0a@ffe00000 { + tcm_0a: tcm_0a@ffe00000 {
+ no-map; + no-map;
+ reg = <0x00 0xffe00000 0x00 0x10000>; + reg = <0x00 0xffe00000 0x00 0x10000>;
+ status = "okay"; + status = "okay";
...@@ -83,7 +83,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5. ...@@ -83,7 +83,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.
+ power-domain = <&zynqmp_firmware 0x0f>; + power-domain = <&zynqmp_firmware 0x0f>;
+ }; + };
+ +
+ tcm_0b@ffe20000 { + tcm_0b: tcm_0b@ffe20000 {
+ no-map; + no-map;
+ reg = <0x00 0xffe20000 0x00 0x10000>; + reg = <0x00 0xffe20000 0x00 0x10000>;
+ status = "okay"; + status = "okay";
...@@ -104,7 +104,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5. ...@@ -104,7 +104,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.
+ #address-cells = <2>; + #address-cells = <2>;
+ #size-cells = <2>; + #size-cells = <2>;
+ ranges; + ranges;
+ sram = <0x40 0x41>; + sram = <&tcm_0a &tcm_0b>;
+ memory-region = <&rproc &rpu0vdev0buffer &rpu0vdev0vring0 &rpu0vdev0vring1>; + memory-region = <&rproc &rpu0vdev0buffer &rpu0vdev0vring0 &rpu0vdev0vring1>;
+ power-domain = <&zynqmp_firmware 0x07>; + power-domain = <&zynqmp_firmware 0x07>;
+ mboxes = <&ipi1_mailbox_pmu1 0>, <&ipi1_mailbox_pmu1 1>; + mboxes = <&ipi1_mailbox_pmu1 0>, <&ipi1_mailbox_pmu1 1>;
...@@ -493,33 +493,19 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5. ...@@ -493,33 +493,19 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/iwaveg35m.dts linux-5.
+ clock-frequency = <33333000>; + clock-frequency = <33333000>;
+}; +};
diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/Makefile linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/Makefile diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/Makefile linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/Makefile
--- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/Makefile 2025-01-26 04:22:12.308369464 +0000 --- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/Makefile 2025-02-27 19:12:19.225581266 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/Makefile 2025-01-26 04:19:56.061592446 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/Makefile 2025-02-28 11:46:51.732298378 +0000
@@ -88,3 +88,6 @@ @@ -20,3 +20,6 @@
dtb-$(CONFIG_ARCH_ZYNQMP) += versal-net-emu-rev1.9.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu1285-revA.dtb
dtb-$(CONFIG_ARCH_ZYNQMP) += versal-net-ipp-rev1.9-ospi.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu208-revA.dtb
dtb-$(CONFIG_ARCH_ZYNQMP) += versal-net-ipp-rev1.9.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-zcu216-revA.dtb
+ +
+# iWave Systems +# iWave Systems
+dtb-$(CONFIG_ARCH_ZYNQMP) += iwaveg35m.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += iwaveg35m.dtb
diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
--- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi 2025-01-26 04:22:12.336370034 +0000 --- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi 2025-02-27 19:12:19.241581597 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi 2025-01-26 04:19:56.061592446 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi 2025-02-28 11:46:51.732298378 +0000
@@ -67,13 +67,6 @@ @@ -133,7 +133,7 @@
#clock-cells = <0>;
clock-frequency = <27000000>;
};
-
- dp_aclk: dp_aclk {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <100000000>;
- clock-accuracy = <100>;
- };
};
&zynqmp_firmware {
@@ -133,7 +126,7 @@
}; };
&gpu { &gpu {
...@@ -528,49 +514,39 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi li ...@@ -528,49 +514,39 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi li
}; };
&lpd_dma_chan1 { &lpd_dma_chan1 {
@@ -176,24 +169,28 @@ @@ -181,6 +181,7 @@
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM0_REF>,
<&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>, <&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+ assigned-clocks = <&zynqmp_clk GEM_TSU>; + assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem1 { &gem1 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>, @@ -188,6 +189,7 @@
<&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>, <&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+ assigned-clocks = <&zynqmp_clk GEM_TSU>; + assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem2 { &gem2 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM2_REF>, @@ -195,6 +197,7 @@
<&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>, <&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+ assigned-clocks = <&zynqmp_clk GEM_TSU>; + assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gem3 { &gem3 {
clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM3_REF>, @@ -202,6 +205,7 @@
<&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>, <&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>,
<&zynqmp_clk GEM_TSU>; <&zynqmp_clk GEM_TSU>;
clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
+ assigned-clocks = <&zynqmp_clk GEM_TSU>; + assigned-clocks = <&zynqmp_clk GEM_TSU>;
}; };
&gpio { &gpio {
@@ -314,9 +311,9 @@ @@ -335,7 +339,3 @@
};
&zynqmp_dpsub {
- clocks = <&dp_aclk>,
- <&zynqmp_clk DP_AUDIO_REF>,
- <&zynqmp_clk DP_VIDEO_REF>;
+ clocks = <&zynqmp_clk TOPSW_LSBUS>,
+ <&zynqmp_clk DP_AUDIO_REF>,
+ <&zynqmp_clk DP_VIDEO_REF>;
assigned-clocks = <&zynqmp_clk DP_STC_REF>,
<&zynqmp_clk DP_AUDIO_REF>,
<&zynqmp_clk DP_VIDEO_REF>; /* rpll, rpll, vpll */
@@ -325,7 +322,3 @@
&zynqmp_dp_snd_codec0 { &zynqmp_dp_snd_codec0 {
clocks = <&zynqmp_clk DP_AUDIO_REF>; clocks = <&zynqmp_clk DP_AUDIO_REF>;
}; };
...@@ -578,26 +554,9 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi li ...@@ -578,26 +554,9 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi li
-&zynqmp_pcap { -&zynqmp_pcap {
- clocks = <&zynqmp_clk PCAP>; - clocks = <&zynqmp_clk PCAP>;
-}; -};
diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi
--- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi 2025-01-26 04:22:12.340370116 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp-clk.dtsi 2025-01-26 04:19:56.065592527 +0000
@@ -47,13 +47,6 @@
clock-frequency = <600000000>;
};
- dp_aclk: clock0 {
- compatible = "fixed-clock";
- #clock-cells = <0>;
- clock-frequency = <100000000>;
- clock-accuracy = <100>;
- };
-
dp_aud_clk: clock1 {
compatible = "fixed-clock";
#clock-cells = <0>;
diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp.dtsi diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
--- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi 2025-01-26 04:22:12.344370197 +0000 --- linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi 2022-10-03 07:47:31.000000000 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp.dtsi 2025-01-26 04:19:56.065592527 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/boot/dts/xilinx/zynqmp.dtsi 2025-02-28 11:46:51.736298465 +0000
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
operating-points-v2 = <&cpu_opp_table>; operating-points-v2 = <&cpu_opp_table>;
reg = <0x0>; reg = <0x0>;
...@@ -1239,7 +1198,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi linux-5.12 ...@@ -1239,7 +1198,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/boot/dts/xilinx/zynqmp.dtsi linux-5.12
<&zynqmp_dp_snd_pcm1>; <&zynqmp_dp_snd_pcm1>;
diff -uNr linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig linux-5.12.10-iwaveg35m/arch/arm64/configs/zynqmp_iwg35m_defconfig diff -uNr linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig linux-5.12.10-iwaveg35m/arch/arm64/configs/zynqmp_iwg35m_defconfig
--- linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000 --- linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/configs/zynqmp_iwg35m_defconfig 2025-01-26 04:19:56.069592609 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/configs/zynqmp_iwg35m_defconfig 2025-02-28 11:46:51.740298552 +0000
@@ -0,0 +1,412 @@ @@ -0,0 +1,412 @@
+# CONFIG_XEN is not set +# CONFIG_XEN is not set
+# CONFIG_ARM64_CRYPTO is not set +# CONFIG_ARM64_CRYPTO is not set
...@@ -1655,7 +1614,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig linux- ...@@ -1655,7 +1614,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/configs/zynqmp_iwg35m_defconfig linux-
+CONFIG_SPI_SPIDEV=y +CONFIG_SPI_SPIDEV=y
diff -uNr linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms linux-5.12.10-iwaveg35m/arch/arm64/Kconfig.platforms diff -uNr linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms linux-5.12.10-iwaveg35m/arch/arm64/Kconfig.platforms
--- linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/arch/arm64/Kconfig.platforms 2025-01-26 04:19:56.069592609 +0000 +++ linux-5.12.10-iwaveg35m/arch/arm64/Kconfig.platforms 2025-02-28 11:46:51.740298552 +0000
@@ -331,4 +331,11 @@ @@ -331,4 +331,11 @@
help help
This enables support for Xilinx ZynqMP Family This enables support for Xilinx ZynqMP Family
...@@ -1670,7 +1629,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms linux-5.12.10-iwaveg ...@@ -1670,7 +1629,7 @@ diff -uNr linux-5.12.10-xilinx/arch/arm64/Kconfig.platforms linux-5.12.10-iwaveg
endmenu endmenu
diff -uNr linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c linux-5.12.10-iwaveg35m/drivers/gpu/drm/drm_atomic_helper.c diff -uNr linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c linux-5.12.10-iwaveg35m/drivers/gpu/drm/drm_atomic_helper.c
--- linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/gpu/drm/drm_atomic_helper.c 2025-01-26 04:19:56.073592690 +0000 +++ linux-5.12.10-iwaveg35m/drivers/gpu/drm/drm_atomic_helper.c 2025-02-28 11:46:51.776299335 +0000
@@ -1509,8 +1509,8 @@ @@ -1509,8 +1509,8 @@
drm_crtc_vblank_count(crtc), drm_crtc_vblank_count(crtc),
msecs_to_jiffies(100)); msecs_to_jiffies(100));
...@@ -1684,7 +1643,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c linux-5.12.10 ...@@ -1684,7 +1643,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/gpu/drm/drm_atomic_helper.c linux-5.12.10
} }
diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/device.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/device.c diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/device.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/device.c
--- linux-5.12.10-xilinx/drivers/infiniband/core/device.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/infiniband/core/device.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/device.c 2025-01-26 04:19:56.077592772 +0000 +++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/device.c 2025-02-28 11:46:51.812300118 +0000
@@ -2695,6 +2695,7 @@ @@ -2695,6 +2695,7 @@
SET_DEVICE_OP(dev_ops, read_counters); SET_DEVICE_OP(dev_ops, read_counters);
SET_DEVICE_OP(dev_ops, reg_dm_mr); SET_DEVICE_OP(dev_ops, reg_dm_mr);
...@@ -1695,7 +1654,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/device.c linux-5.12.10-iw ...@@ -1695,7 +1654,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/device.c linux-5.12.10-iw
SET_DEVICE_OP(dev_ops, req_notify_cq); SET_DEVICE_OP(dev_ops, req_notify_cq);
diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/rdma_core.c diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/rdma_core.c
--- linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/rdma_core.c 2025-01-26 04:19:56.077592772 +0000 +++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/rdma_core.c 2025-02-28 11:46:51.824300378 +0000
@@ -899,7 +899,9 @@ @@ -899,7 +899,9 @@
* if we hit this WARN_ON, that means we are * if we hit this WARN_ON, that means we are
* racing with a lookup_get. * racing with a lookup_get.
...@@ -1708,7 +1667,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c linux-5.12.10 ...@@ -1708,7 +1667,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/rdma_core.c linux-5.12.10
if (!uverbs_destroy_uobject(obj, reason, &attrs)) if (!uverbs_destroy_uobject(obj, reason, &attrs))
diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/uverbs_cmd.c diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c linux-5.12.10-iwaveg35m/drivers/infiniband/core/uverbs_cmd.c
--- linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/uverbs_cmd.c 2025-01-26 04:19:56.081592853 +0000 +++ linux-5.12.10-iwaveg35m/drivers/infiniband/core/uverbs_cmd.c 2025-02-28 11:46:51.844300813 +0000
@@ -692,6 +692,83 @@ @@ -692,6 +692,83 @@
return 0; return 0;
} }
...@@ -1808,7 +1767,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c linux-5.12.1 ...@@ -1808,7 +1767,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/infiniband/core/uverbs_cmd.c linux-5.12.1
UAPI_DEF_WRITE_UDATA_IO(struct ib_uverbs_rereg_mr, UAPI_DEF_WRITE_UDATA_IO(struct ib_uverbs_rereg_mr,
diff -uNr linux-5.12.10-xilinx/drivers/mfd/da9062-core.c linux-5.12.10-iwaveg35m/drivers/mfd/da9062-core.c diff -uNr linux-5.12.10-xilinx/drivers/mfd/da9062-core.c linux-5.12.10-iwaveg35m/drivers/mfd/da9062-core.c
--- linux-5.12.10-xilinx/drivers/mfd/da9062-core.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/mfd/da9062-core.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/mfd/da9062-core.c 2025-01-26 04:20:30.342291417 +0000 +++ linux-5.12.10-iwaveg35m/drivers/mfd/da9062-core.c 2025-02-28 11:46:51.848300900 +0000
@@ -24,6 +24,17 @@ @@ -24,6 +24,17 @@
#define DA9062_IRQ_LOW 0 #define DA9062_IRQ_LOW 0
#define DA9062_IRQ_HIGH 1 #define DA9062_IRQ_HIGH 1
...@@ -1911,8 +1870,8 @@ diff -uNr linux-5.12.10-xilinx/drivers/mfd/da9062-core.c linux-5.12.10-iwaveg35m ...@@ -1911,8 +1870,8 @@ diff -uNr linux-5.12.10-xilinx/drivers/mfd/da9062-core.c linux-5.12.10-iwaveg35m
} }
diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg35m/drivers/net/can/xilinx_can.c diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg35m/drivers/net/can/xilinx_can.c
--- linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c 2025-01-26 04:22:12.924382014 +0000 --- linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c 2025-02-27 19:12:52.062260000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/net/can/xilinx_can.c 2025-01-26 04:19:56.085592935 +0000 +++ linux-5.12.10-iwaveg35m/drivers/net/can/xilinx_can.c 2025-02-28 11:46:52.000304205 +0000
@@ -28,6 +28,9 @@ @@ -28,6 +28,9 @@
#include <linux/can/error.h> #include <linux/can/error.h>
#include <linux/can/led.h> #include <linux/can/led.h>
...@@ -1923,7 +1882,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg ...@@ -1923,7 +1882,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg
#define DRIVER_NAME "xilinx_can" #define DRIVER_NAME "xilinx_can"
@@ -1693,6 +1696,7 @@ @@ -1675,6 +1678,7 @@
int rx_max, tx_max; int rx_max, tx_max;
u32 hw_tx_max = 0, hw_rx_max = 0; u32 hw_tx_max = 0, hw_rx_max = 0;
const char *hw_tx_max_property; const char *hw_tx_max_property;
...@@ -1931,7 +1890,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg ...@@ -1931,7 +1890,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg
/* Get the virtual base address for the device */ /* Get the virtual base address for the device */
addr = devm_platform_ioremap_resource(pdev, 0); addr = devm_platform_ioremap_resource(pdev, 0);
@@ -1724,6 +1728,13 @@ @@ -1706,6 +1710,13 @@
goto err; goto err;
} }
...@@ -1946,9 +1905,9 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg ...@@ -1946,9 +1905,9 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/can/xilinx_can.c linux-5.12.10-iwaveg
* *
* There is no way to directly figure out how many frames have been * There is no way to directly figure out how many frames have been
diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5.12.10-iwaveg35m/drivers/net/ethernet/cadence/macb_main.c diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5.12.10-iwaveg35m/drivers/net/ethernet/cadence/macb_main.c
--- linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c 2025-02-27 19:12:52.102260826 +0000
+++ linux-5.12.10-iwaveg35m/drivers/net/ethernet/cadence/macb_main.c 2025-01-26 04:19:56.085592935 +0000 +++ linux-5.12.10-iwaveg35m/drivers/net/ethernet/cadence/macb_main.c 2025-02-28 11:46:52.036304987 +0000
@@ -3683,6 +3683,41 @@ @@ -3722,6 +3722,41 @@
dev_dbg(&bp->pdev->dev, "Cadence caps 0x%08x\n", bp->caps); dev_dbg(&bp->pdev->dev, "Cadence caps 0x%08x\n", bp->caps);
} }
...@@ -1990,7 +1949,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5. ...@@ -1990,7 +1949,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5.
static void macb_probe_queues(void __iomem *mem, static void macb_probe_queues(void __iomem *mem,
bool native_io, bool native_io,
unsigned int *queue_mask, unsigned int *queue_mask,
@@ -4752,6 +4787,7 @@ @@ -4803,6 +4838,7 @@
bp->phy_interface = PHY_INTERFACE_MODE_MII; bp->phy_interface = PHY_INTERFACE_MODE_MII;
else else
bp->phy_interface = interface; bp->phy_interface = interface;
...@@ -2000,7 +1959,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5. ...@@ -2000,7 +1959,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/net/ethernet/cadence/macb_main.c linux-5.
err = init(pdev); err = init(pdev);
diff -uNr linux-5.12.10-xilinx/drivers/usb/core/hub.c linux-5.12.10-iwaveg35m/drivers/usb/core/hub.c diff -uNr linux-5.12.10-xilinx/drivers/usb/core/hub.c linux-5.12.10-iwaveg35m/drivers/usb/core/hub.c
--- linux-5.12.10-xilinx/drivers/usb/core/hub.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/usb/core/hub.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/usb/core/hub.c 2025-01-26 04:19:56.097593180 +0000 +++ linux-5.12.10-iwaveg35m/drivers/usb/core/hub.c 2025-02-28 11:46:52.064305596 +0000
@@ -30,6 +30,9 @@ @@ -30,6 +30,9 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>
...@@ -2037,7 +1996,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/usb/core/hub.c linux-5.12.10-iwaveg35m/dr ...@@ -2037,7 +1996,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/usb/core/hub.c linux-5.12.10-iwaveg35m/dr
* this device (and any of its children) will fail immediately. * this device (and any of its children) will fail immediately.
diff -uNr linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c linux-5.12.10-iwaveg35m/drivers/usb/typec/tcpm/fusb302.c diff -uNr linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c linux-5.12.10-iwaveg35m/drivers/usb/typec/tcpm/fusb302.c
--- linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/drivers/usb/typec/tcpm/fusb302.c 2025-01-26 04:19:56.097593180 +0000 +++ linux-5.12.10-iwaveg35m/drivers/usb/typec/tcpm/fusb302.c 2025-02-28 11:46:52.152307509 +0000
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
...@@ -2105,7 +2064,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c linux-5.12.10-iw ...@@ -2105,7 +2064,7 @@ diff -uNr linux-5.12.10-xilinx/drivers/usb/typec/tcpm/fusb302.c linux-5.12.10-iw
diff -uNr linux-5.12.10-xilinx/include/rdma/ib_verbs.h linux-5.12.10-iwaveg35m/include/rdma/ib_verbs.h diff -uNr linux-5.12.10-xilinx/include/rdma/ib_verbs.h linux-5.12.10-iwaveg35m/include/rdma/ib_verbs.h
--- linux-5.12.10-xilinx/include/rdma/ib_verbs.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/include/rdma/ib_verbs.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/include/rdma/ib_verbs.h 2025-01-26 04:19:56.101593261 +0000 +++ linux-5.12.10-iwaveg35m/include/rdma/ib_verbs.h 2025-02-28 11:46:52.320311160 +0000
@@ -43,6 +43,8 @@ @@ -43,6 +43,8 @@
#include <uapi/rdma/rdma_user_ioctl.h> #include <uapi/rdma/rdma_user_ioctl.h>
#include <uapi/rdma/ib_user_ioctl_verbs.h> #include <uapi/rdma/ib_user_ioctl_verbs.h>
...@@ -2155,7 +2114,7 @@ diff -uNr linux-5.12.10-xilinx/include/rdma/ib_verbs.h linux-5.12.10-iwaveg35m/i ...@@ -2155,7 +2114,7 @@ diff -uNr linux-5.12.10-xilinx/include/rdma/ib_verbs.h linux-5.12.10-iwaveg35m/i
int mr_access_flags, int mr_access_flags,
diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_ioctl_verbs.h diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_ioctl_verbs.h
--- linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_ioctl_verbs.h 2025-01-26 04:19:56.105593343 +0000 +++ linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_ioctl_verbs.h 2025-02-28 11:46:52.336311508 +0000
@@ -249,6 +249,7 @@ @@ -249,6 +249,7 @@
RDMA_DRIVER_QIB, RDMA_DRIVER_QIB,
RDMA_DRIVER_EFA, RDMA_DRIVER_EFA,
...@@ -2166,7 +2125,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h linux-5.1 ...@@ -2166,7 +2125,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_ioctl_verbs.h linux-5.1
enum ib_uverbs_gid_type { enum ib_uverbs_gid_type {
diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_verbs.h diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_verbs.h
--- linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_verbs.h 2025-01-26 04:19:56.105593343 +0000 +++ linux-5.12.10-iwaveg35m/include/uapi/rdma/ib_user_verbs.h 2025-02-28 11:46:52.384312552 +0000
@@ -87,6 +87,7 @@ @@ -87,6 +87,7 @@
IB_USER_VERBS_CMD_OPEN_XRCD, IB_USER_VERBS_CMD_OPEN_XRCD,
IB_USER_VERBS_CMD_CLOSE_XRCD, IB_USER_VERBS_CMD_CLOSE_XRCD,
...@@ -2177,7 +2136,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h linux-5.12.10-i ...@@ -2177,7 +2136,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/ib_user_verbs.h linux-5.12.10-i
diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h linux-5.12.10-iwaveg35m/include/uapi/rdma/xib-abi.h diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h linux-5.12.10-iwaveg35m/include/uapi/rdma/xib-abi.h
--- linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h 1970-01-01 00:00:00.000000000 +0000 --- linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h 1970-01-01 00:00:00.000000000 +0000
+++ linux-5.12.10-iwaveg35m/include/uapi/rdma/xib-abi.h 2025-01-26 04:19:56.109593424 +0000 +++ linux-5.12.10-iwaveg35m/include/uapi/rdma/xib-abi.h 2025-02-28 11:46:52.384312552 +0000
@@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
+/* +/*
...@@ -2256,7 +2215,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h linux-5.12.10-iwaveg3 ...@@ -2256,7 +2215,7 @@ diff -uNr linux-5.12.10-xilinx/include/uapi/rdma/xib-abi.h linux-5.12.10-iwaveg3
+#endif /* XIB_ABI_USER_H */ +#endif /* XIB_ABI_USER_H */
diff -uNr linux-5.12.10-xilinx/mm/Kconfig linux-5.12.10-iwaveg35m/mm/Kconfig diff -uNr linux-5.12.10-xilinx/mm/Kconfig linux-5.12.10-iwaveg35m/mm/Kconfig
--- linux-5.12.10-xilinx/mm/Kconfig 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/mm/Kconfig 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/mm/Kconfig 2025-01-26 04:19:56.109593424 +0000 +++ linux-5.12.10-iwaveg35m/mm/Kconfig 2025-02-28 11:46:52.392312725 +0000
@@ -280,6 +280,9 @@ @@ -280,6 +280,9 @@
config PHYS_ADDR_T_64BIT config PHYS_ADDR_T_64BIT
def_bool 64BIT def_bool 64BIT
...@@ -2269,7 +2228,7 @@ diff -uNr linux-5.12.10-xilinx/mm/Kconfig linux-5.12.10-iwaveg35m/mm/Kconfig ...@@ -2269,7 +2228,7 @@ diff -uNr linux-5.12.10-xilinx/mm/Kconfig linux-5.12.10-iwaveg35m/mm/Kconfig
default y default y
diff -uNr linux-5.12.10-xilinx/sound/soc/soc-dai.c linux-5.12.10-iwaveg35m/sound/soc/soc-dai.c diff -uNr linux-5.12.10-xilinx/sound/soc/soc-dai.c linux-5.12.10-iwaveg35m/sound/soc/soc-dai.c
--- linux-5.12.10-xilinx/sound/soc/soc-dai.c 2021-06-10 11:41:49.000000000 +0000 --- linux-5.12.10-xilinx/sound/soc/soc-dai.c 2021-06-10 11:41:49.000000000 +0000
+++ linux-5.12.10-iwaveg35m/sound/soc/soc-dai.c 2025-01-26 04:19:56.109593424 +0000 +++ linux-5.12.10-iwaveg35m/sound/soc/soc-dai.c 2025-02-28 11:46:52.400312899 +0000
@@ -24,9 +24,12 @@ @@ -24,9 +24,12 @@
case -ENOTSUPP: case -ENOTSUPP:
break; break;
...@@ -2284,9 +2243,9 @@ diff -uNr linux-5.12.10-xilinx/sound/soc/soc-dai.c linux-5.12.10-iwaveg35m/sound ...@@ -2284,9 +2243,9 @@ diff -uNr linux-5.12.10-xilinx/sound/soc/soc-dai.c linux-5.12.10-iwaveg35m/sound
return ret; return ret;
diff -uNr linux-5.12.10-xilinx/sound/soc/xilinx/xlnx_formatter_pcm.c linux-5.12.10-iwaveg35m/sound/soc/xilinx/xlnx_formatter_pcm.c diff -uNr linux-5.12.10-xilinx/sound/soc/xilinx/xlnx_formatter_pcm.c linux-5.12.10-iwaveg35m/sound/soc/xilinx/xlnx_formatter_pcm.c
--- linux-5.12.10-xilinx/sound/soc/xilinx/xlnx_formatter_pcm.c 2025-01-26 04:22:13.220388045 +0000 --- linux-5.12.10-xilinx/sound/soc/xilinx/xlnx_formatter_pcm.c 2025-02-27 19:13:04.986526792 +0000
+++ linux-5.12.10-iwaveg35m/sound/soc/xilinx/xlnx_formatter_pcm.c 2025-01-26 04:19:56.113593506 +0000 +++ linux-5.12.10-iwaveg35m/sound/soc/xilinx/xlnx_formatter_pcm.c 2025-02-28 11:46:52.408313073 +0000
@@ -389,11 +389,12 @@ @@ -379,11 +379,12 @@
stream_data->xfer_mode = (val & data_xfer_mode) >> data_xfer_shift; stream_data->xfer_mode = (val & data_xfer_mode) >> data_xfer_shift;
stream_data->ch_limit = (val & ch_count_mask) >> ch_count_shift; stream_data->ch_limit = (val & ch_count_mask) >> ch_count_shift;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment