mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git
synced 2026-09-09 00:07:04 +08:00
CKI KWF Bot
45868ac72b
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2950 ## Summary of Changes Update `nxp-sar-adc`, `i2c-imx`, `fsl-edma`, and S32G-related devicetree files to v7.2-rc3. Commits are grouped by subsystem affected: * 1-5 are `i2c-imx` * 6-15 are `fsl-edma` * 16-29 are `nxp-sar-adc` * Within this range, 16-26 are relevant IIO core updates * 30 is a devicetree fix ## Testing I tested this as follows: <details> <summary>Test logs</summary> ``` # cat run-tests.sh #!/bin/bash set -eu trace() { echo "+ $*" "$@" } for bus in $(i2cdetect -l | awk -F'[\t-]' '{print $2}'); do trace i2cdetect -y "$bus" done printf '\nADC channels\n~~~~~~~~~~~~\n' for f in /sys/bus/iio/devices/iio:device*/*_raw; do printf '==> %s <==\n%d -> %d\n\n' "$f" "$(cat "$f")" "$(sleep 0.5s; cat "$f")" done dmesg -n debug trace modprobe dmatest iterations=10 run=1 # ./run-tests.sh + i2cdetect -y 0 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: -- -- -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 20: -- -- UU -- -- -- -- -- -- -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: -- -- -- -- -- -- -- -- 48 -- -- -- -- -- -- -- 50: -- 51 -- -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- + i2cdetect -y 1 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: -- -- -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- + i2cdetect -y 2 0 1 2 3 4 5 6 7 8 9 a b c d e f 00: 08 09 -- -- -- -- -- -- 10: -- -- -- -- -- -- -- -- 18 -- -- -- -- -- -- -- 20: 20 21 -- -- -- -- -- -- 28 -- -- -- -- -- -- -- 30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 40: 40 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 70: -- -- -- -- -- -- -- -- ADC channels ~~~~~~~~~~~~ ==> /sys/bus/iio/devices/iio:device0/in_voltage0_raw <== 1856 -> 1834 ==> /sys/bus/iio/devices/iio:device0/in_voltage1_raw <== 1806 -> 1826 ==> /sys/bus/iio/devices/iio:device0/in_voltage2_raw <== 1794 -> 1832 ==> /sys/bus/iio/devices/iio:device0/in_voltage3_raw <== 1816 -> 1828 ==> /sys/bus/iio/devices/iio:device0/in_voltage4_raw <== 17 -> 16 ==> /sys/bus/iio/devices/iio:device0/in_voltage5_raw <== 3128 -> 3167 ==> /sys/bus/iio/devices/iio:device0/in_voltage6_raw <== 11 -> 9 ==> /sys/bus/iio/devices/iio:device0/in_voltage7_raw <== 1661 -> 1824 ==> /sys/bus/iio/devices/iio:device1/in_voltage0_raw <== 17 -> 17 ==> /sys/bus/iio/devices/iio:device1/in_voltage1_raw <== 15 -> 16 ==> /sys/bus/iio/devices/iio:device1/in_voltage2_raw <== 16 -> 16 ==> /sys/bus/iio/devices/iio:device1/in_voltage3_raw <== 16 -> 16 ==> /sys/bus/iio/devices/iio:device1/in_voltage4_raw <== 15 -> 16 ==> /sys/bus/iio/devices/iio:device1/in_voltage5_raw <== 3126 -> 3167 ==> /sys/bus/iio/devices/iio:device1/in_voltage6_raw <== 10 -> 7 ==> /sys/bus/iio/devices/iio:device1/in_voltage7_raw <== 1651 -> 1812 + modprobe dmatest iterations=10 run=1 [ 361.554637] dmatest: No channels configured, continue with any [ 361.554890] dmatest: Added 1 threads using dma0chan0 [ 361.555003] dmatest: Added 1 threads using dma0chan1 [ 361.555120] dmatest: Added 1 threads using dma0chan2 [ 361.555238] dmatest: Added 1 threads using dma0chan3 [ 361.555353] dmatest: Added 1 threads using dma0chan4 [ 361.555470] dmatest: Added 1 threads using dma0chan5 [ 361.555593] dmatest: Added 1 threads using dma0chan6 [ 361.555708] dmatest: Added 1 threads using dma0chan7 [ 361.555829] dmatest: Added 1 threads using dma0chan8 [ 361.555946] dmatest: Added 1 threads using dma0chan9 [ 361.556062] dmatest: Added 1 threads using dma0chan10 [ 361.556177] dmatest: Added 1 threads using dma0chan11 [ 361.556293] dmatest: Added 1 threads using dma0chan12 [ 361.556409] dmatest: Added 1 threads using dma0chan13 [ 361.556529] dmatest: Added 1 threads using dma0chan14 [ 361.556643] dmatest: Added 1 threads using dma0chan15 [ 361.556759] dmatest: Added 1 threads using dma0chan16 [ 361.556878] dmatest: Added 1 threads using dma0chan17 [ 361.556994] dmatest: Added 1 threads using dma0chan18 [ 361.557109] dmatest: Added 1 threads using dma0chan19 [ 361.557226] dmatest: Added 1 threads using dma0chan20 [ 361.557342] dmatest: Added 1 threads using dma0chan21 [ 361.557462] dmatest: Added 1 threads using dma0chan22 [ 361.557579] dmatest: Added 1 threads using dma0chan23 [ 361.557698] dmatest: Added 1 threads using dma0chan24 [ 361.557814] dmatest: Added 1 threads using dma0chan25 [ 361.557934] dmatest: Added 1 threads using dma0chan26 [ 361.558055] dmatest: Added 1 threads using dma0chan27 [ 361.558211] dmatest: Added 1 threads using dma0chan28 [ 361.558327] dmatest: Added 1 threads using dma0chan29 [ 361.558445] dmatest: Added 1 threads using dma0chan30 [ 361.558561] dmatest: Added 1 threads using dma0chan31 [ 361.558700] dmatest: Added 1 threads using dma1chan0 [ 361.558815] dmatest: Added 1 threads using dma1chan1 [ 361.558933] dmatest: Added 1 threads using dma1chan2 [ 361.559053] dmatest: Added 1 threads using dma1chan3 [ 361.559168] dmatest: Added 1 threads using dma1chan4 [ 361.559285] dmatest: Added 1 threads using dma1chan5 [ 361.559400] dmatest: Added 1 threads using dma1chan6 [ 361.559530] dmatest: Added 1 threads using dma1chan7 [ 361.559641] dmatest: Added 1 threads using dma1chan8 [ 361.559754] dmatest: Added 1 threads using dma1chan9 [ 361.559869] dmatest: Added 1 threads using dma1chan10 [ 361.560017] dmatest: Added 1 threads using dma1chan11 [ 361.560140] dmatest: Added 1 threads using dma1chan12 [ 361.560253] dmatest: Added 1 threads using dma1chan13 [ 361.560369] dmatest: Added 1 threads using dma1chan14 [ 361.560564] dmatest: Added 1 threads using dma1chan15 [ 361.560701] dmatest: Added 1 threads using dma1chan16 [ 361.560822] dmatest: Added 1 threads using dma1chan17 [ 361.560937] dmatest: Added 1 threads using dma1chan18 [ 361.561048] dmatest: Added 1 threads using dma1chan19 [ 361.561163] dmatest: Added 1 threads using dma1chan20 [ 361.561274] dmatest: Added 1 threads using dma1chan21 [ 361.561392] dmatest: Added 1 threads using dma1chan22 [ 361.561503] dmatest: Added 1 threads using dma1chan23 [ 361.561615] dmatest: Added 1 threads using dma1chan24 [ 361.561729] dmatest: Added 1 threads using dma1chan25 [ 361.561841] dmatest: Added 1 threads using dma1chan26 [ 361.561959] dmatest: Added 1 threads using dma1chan27 [ 361.562072] dmatest: Added 1 threads using dma1chan28 [ 361.562183] dmatest: Added 1 threads using dma1chan29 [ 361.562294] dmatest: Added 1 threads using dma1chan30 [ 361.562401] dmatest: Added 1 threads using dma1chan31 [ 361.563180] dmatest: Started 1 threads using dma0chan0 [ 361.563195] dmatest: Started 1 threads using dma0chan1 [ 361.563208] dmatest: Started 1 threads using dma0chan2 [ 361.563224] dmatest: Started 1 threads using dma0chan3 [ 361.563238] dmatest: Started 1 threads using dma0chan4 [ 361.563254] dmatest: Started 1 threads using dma0chan5 [ 361.563267] dmatest: Started 1 threads using dma0chan6 [ 361.563282] dmatest: Started 1 threads using dma0chan7 [ 361.563294] dmatest: Started 1 threads using dma0chan8 [ 361.563306] dmatest: Started 1 threads using dma0chan9 [ 361.563321] dmatest: Started 1 threads using dma0chan10 [ 361.563334] dmatest: Started 1 threads using dma0chan11 [ 361.563355] dmatest: Started 1 threads using dma0chan12 [ 361.563368] dmatest: Started 1 threads using dma0chan13 [ 361.563390] dmatest: Started 1 threads using dma0chan14 [ 361.563409] dmatest: Started 1 threads using dma0chan15 [ 361.563424] dmatest: Started 1 threads using dma0chan16 [ 361.563443] dmatest: Started 1 threads using dma0chan17 [ 361.563461] dmatest: Started 1 threads using dma0chan18 [ 361.563476] dmatest: Started 1 threads using dma0chan19 [ 361.563490] dmatest: Started 1 threads using dma0chan20 [ 361.563503] dmatest: Started 1 threads using dma0chan21 [ 361.563516] dmatest: Started 1 threads using dma0chan22 [ 361.563529] dmatest: Started 1 threads using dma0chan23 [ 361.563541] dmatest: Started 1 threads using dma0chan24 [ 361.563554] dmatest: Started 1 threads using dma0chan25 [ 361.563571] dmatest: Started 1 threads using dma0chan26 [ 361.563582] dmatest: Started 1 threads using dma0chan27 [ 361.563594] dmatest: Started 1 threads using dma0chan28 [ 361.563609] dmatest: Started 1 threads using dma0chan29 [ 361.563621] dmatest: Started 1 threads using dma0chan30 [ 361.563635] dmatest: Started 1 threads using dma0chan31 [ 361.563649] dmatest: Started 1 threads using dma1chan0 [ 361.563666] dmatest: Started 1 threads using dma1chan1 [ 361.563683] dmatest: Started 1 threads using dma1chan2 [ 361.563705] dmatest: Started 1 threads using dma1chan3 [ 361.563724] dmatest: Started 1 threads using dma1chan4 [ 361.563743] dmatest: Started 1 threads using dma1chan5 [ 361.563756] dmatest: Started 1 threads using dma1chan6 [ 361.563769] dmatest: Started 1 threads using dma1chan7 [ 361.563785] dmatest: Started 1 threads using dma1chan8 [ 361.563800] dmatest: Started 1 threads using dma1chan9 [ 361.563812] dmatest: Started 1 threads using dma1chan10 [ 361.563827] dmatest: Started 1 threads using dma1chan11 [ 361.563842] dmatest: Started 1 threads using dma1chan12 [ 361.563857] dmatest: Started 1 threads using dma1chan13 [ 361.563869] dmatest: Started 1 threads using dma1chan14 [ 361.563881] dmatest: Started 1 threads using dma1chan15 [ 361.563892] dmatest: Started 1 threads using dma1chan16 [ 361.563902] dmatest: Started 1 threads using dma1chan17 [ 361.563926] dmatest: Started 1 threads using dma1chan18 [ 361.563937] dmatest: Started 1 threads using dma1chan19 [ 361.563958] dmatest: Started 1 threads using dma1chan20 [ 361.563970] dmatest: Started 1 threads using dma1chan21 [ 361.563987] dmatest: Started 1 threads using dma1chan22 [ 361.563999] dmatest: Started 1 threads using dma1chan23 [ 361.564010] dmatest: Started 1 threads using dma1chan24 [ 361.564021] dmatest: Started 1 threads using dma1chan25 [ 361.564032] dmatest: Started 1 threads using dma1chan26 [ 361.564043] dmatest: Started 1 threads using dma1chan27 [ 361.564055] dmatest: Started 1 threads using dma1chan28 [ 361.564069] dmatest: Started 1 threads using dma1chan29 [ 361.564081] dmatest: Started 1 threads using dma1chan30 [ 361.564090] dmatest: Started 1 threads using dma1chan31 [ 361.571861] dmatest: dma0chan4-copy0: summary 10 tests, 0 failures 3552.39 iops 22735 KB/s (0) [ 361.572094] dmatest: dma0chan24-copy: summary 10 tests, 0 failures 3322.25 iops 23920 KB/s (0) [ 361.579068] dmatest: dma1chan23-copy: summary 10 tests, 0 failures 963.57 iops 6263 KB/s (0) [ 361.579830] dmatest: dma0chan22-copy: summary 10 tests, 0 failures 938.34 iops 6474 KB/s (0) [ 361.580205] dmatest: dma0chan21-copy: summary 10 tests, 0 failures 811.35 iops 6977 KB/s (0) [ 361.580771] dmatest: dma0chan9-copy0: summary 10 tests, 0 failures 3466.20 iops 12478 KB/s (0) [ 361.581762] dmatest: dma0chan1-copy0: summary 10 tests, 0 failures 683.52 iops 4921 KB/s (0) [ 361.581907] dmatest: dma1chan6-copy0: summary 10 tests, 0 failures 757.11 iops 8403 KB/s (0) [ 361.583870] dmatest: dma0chan2-copy0: summary 10 tests, 0 failures 586.57 iops 5689 KB/s (0) [ 361.584173] dmatest: dma1chan7-copy0: summary 10 tests, 0 failures 604.37 iops 4230 KB/s (0) [ 361.588799] dmatest: dma0chan19-copy: summary 10 tests, 0 failures 1208.45 iops 10392 KB/s (0) [ 361.591837] dmatest: dma1chan27-copy: summary 10 tests, 0 failures 496.03 iops 3323 KB/s (0) [ 361.592008] dmatest: dma1chan29-copy: summary 10 tests, 0 failures 477.69 iops 4872 KB/s (0) [ 361.593353] dmatest: dma1chan22-copy: summary 10 tests, 0 failures 495.17 iops 3713 KB/s (0) [ 361.594774] dmatest: dma1chan8-copy0: summary 10 tests, 0 failures 511.50 iops 4705 KB/s (0) [ 361.595471] dmatest: dma0chan18-copy: summary 10 tests, 0 failures 560.16 iops 4537 KB/s (0) [ 361.595741] dmatest: dma1chan17-copy: summary 10 tests, 0 failures 433.12 iops 3205 KB/s (0) [ 361.595896] dmatest: dma1chan25-copy: summary 10 tests, 0 failures 427.96 iops 2182 KB/s (0) [ 361.596355] dmatest: dma1chan21-copy: summary 10 tests, 0 failures 450.08 iops 3285 KB/s (0) [ 361.599117] dmatest: dma1chan18-copy: summary 10 tests, 0 failures 727.21 iops 6326 KB/s (0) [ 361.602161] dmatest: dma1chan9-copy0: summary 10 tests, 0 failures 378.69 iops 2840 KB/s (0) [ 361.603420] dmatest: dma0chan15-copy: summary 10 tests, 0 failures 407.39 iops 3177 KB/s (0) [ 361.607563] dmatest: dma1chan10-copy: summary 10 tests, 0 failures 311.81 iops 2026 KB/s (0) [ 361.610657] dmatest: dma1chan16-copy: summary 10 tests, 0 failures 391.44 iops 3444 KB/s (0) [ 361.611444] dmatest: dma1chan24-copy: summary 10 tests, 0 failures 531.68 iops 4625 KB/s (0) [ 361.611946] dmatest: dma0chan23-copy: summary 10 tests, 0 failures 422.50 iops 4267 KB/s (0) [ 361.613644] dmatest: dma1chan31-copy: summary 10 tests, 0 failures 412.23 iops 3256 KB/s (0) [ 361.617070] dmatest: dma0chan16-copy: summary 10 tests, 0 failures 257.57 iops 1983 KB/s (0) [ 361.617534] dmatest: dma0chan3-copy0: summary 10 tests, 0 failures 492.55 iops 3497 KB/s (0) [ 361.618139] dmatest: dma0chan20-copy: summary 10 tests, 0 failures 197.39 iops 2427 KB/s (0) [ 361.618922] dmatest: dma1chan5-copy0: summary 10 tests, 0 failures 196.98 iops 1240 KB/s (0) [ 361.619239] dmatest: dma1chan14-copy: summary 10 tests, 0 failures 195.01 iops 1462 KB/s (0) [ 361.619977] dmatest: dma1chan15-copy: summary 10 tests, 0 failures 202.11 iops 1899 KB/s (0) [ 361.620118] dmatest: dma1chan3-copy0: summary 10 tests, 0 failures 198.68 iops 1450 KB/s (0) [ 361.620340] dmatest: dma1chan2-copy0: summary 10 tests, 0 failures 203.02 iops 1258 KB/s (0) [ 361.620905] dmatest: dma1chan0-copy0: summary 10 tests, 0 failures 188.02 iops 1240 KB/s (0) [ 361.620926] dmatest: dma0chan26-copy: summary 10 tests, 0 failures 542.03 iops 4390 KB/s (0) [ 361.621337] dmatest: dma1chan1-copy0: summary 10 tests, 0 failures 210.33 iops 2040 KB/s (0) [ 361.621768] dmatest: dma0chan0-copy0: summary 10 tests, 0 failures 210.72 iops 1959 KB/s (0) [ 361.622201] dmatest: dma1chan12-copy: summary 10 tests, 0 failures 198.12 iops 2040 KB/s (0) [ 361.622524] dmatest: dma1chan4-copy0: summary 10 tests, 0 failures 191.98 iops 1958 KB/s (0) [ 361.623273] dmatest: dma1chan11-copy: summary 10 tests, 0 failures 221.58 iops 2193 KB/s (0) [ 361.623467] dmatest: dma1chan13-copy: summary 10 tests, 0 failures 239.81 iops 2206 KB/s (0) [ 361.625524] dmatest: dma0chan11-copy: summary 10 tests, 0 failures 531.88 iops 3138 KB/s (0) [ 361.625545] dmatest: dma1chan20-copy: summary 10 tests, 0 failures 370.91 iops 2448 KB/s (0) [ 361.625928] dmatest: dma1chan19-copy: summary 10 tests, 0 failures 503.90 iops 2922 KB/s (0) [ 361.625932] dmatest: dma1chan28-copy: summary 10 tests, 0 failures 288.44 iops 1903 KB/s (0) [ 361.626245] dmatest: dma1chan30-copy: summary 10 tests, 0 failures 423.60 iops 2329 KB/s (0) [ 361.627880] dmatest: dma0chan5-copy0: summary 10 tests, 0 failures 224.42 iops 1997 KB/s (0) [ 361.629161] dmatest: dma0chan25-copy: summary 10 tests, 0 failures 194.36 iops 1010 KB/s (0) [ 361.629790] dmatest: dma0chan13-copy: summary 10 tests, 0 failures 194.27 iops 1282 KB/s (0) [ 361.629924] dmatest: dma0chan17-copy: summary 10 tests, 0 failures 190.17 iops 1065 KB/s (0) [ 361.630250] dmatest: dma0chan30-copy: summary 10 tests, 0 failures 168.07 iops 1176 KB/s (0) [ 361.631541] dmatest: dma0chan27-copy: summary 10 tests, 0 failures 167.47 iops 1557 KB/s (0) [ 361.631866] dmatest: dma0chan10-copy: summary 10 tests, 0 failures 182.36 iops 2006 KB/s (0) [ 361.631982] dmatest: dma0chan6-copy0: summary 10 tests, 0 failures 164.75 iops 1318 KB/s (0) [ 361.632682] dmatest: dma0chan29-copy: summary 10 tests, 0 failures 162.12 iops 1442 KB/s (0) [ 361.632939] dmatest: dma0chan12-copy: summary 10 tests, 0 failures 190.41 iops 1542 KB/s (0) [ 361.633016] dmatest: dma0chan7-copy0: summary 10 tests, 0 failures 162.98 iops 1792 KB/s (0) [ 361.633343] dmatest: dma0chan8-copy0: summary 10 tests, 0 failures 163.24 iops 1289 KB/s (0) [ 361.633658] dmatest: dma0chan28-copy: summary 10 tests, 0 failures 160.62 iops 1590 KB/s (0) [ 361.633841] dmatest: dma0chan14-copy: summary 10 tests, 0 failures 191.89 iops 1151 KB/s (0) [ 361.633898] dmatest: dma0chan31-copy: summary 10 tests, 0 failures 161.47 iops 1437 KB/s (0) [ 361.634983] dmatest: dma1chan26-copy: summary 10 tests, 0 failures 198.35 iops 1805 KB/s (0) # modprobe -r dmatest # modprobe -r fsl-edma ``` </details> Note that with the backport of `666c53e94c1d` ("dmaengine: fsl-edma: don't explicitly disable clocks in .remove()"), removing `fsl-edma` no longer logs a warning. ## Approved Development Ticket(s) JIRA: https://redhat.atlassian.net/browse/RHEL-212089 Signed-off-by: Jared Kangas <jkangas@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Enric Balletbo i Serra <eballetbo@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>