Skip to content

rts on rs485 uarts is configured as gpio with default PD - #56

Merged
evgeny-boger merged 5 commits into
dev/v5.10from
feature/rs485-inverted-rts
Apr 29, 2021
Merged

rts on rs485 uarts is configured as gpio with default PD#56
evgeny-boger merged 5 commits into
dev/v5.10from
feature/rs485-inverted-rts

Conversation

@vdromanov

Copy link
Copy Markdown
Contributor

в ядре 5.10 появился механизм для решения старой проблемы с трансиверами rs485 (в idle удерживали шину в передающем состоянии)

rts у трансиверов теперь настроен, как gpio c подтяжкой вниз

@vdromanov
vdromanov requested a review from evgeny-boger April 22, 2021 15:18
@webconn

webconn commented Apr 22, 2021

Copy link
Copy Markdown
Contributor

Не забудь добавить запись в debian/changelog, теперь тут так принято )

@evgeny-boger evgeny-boger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

давай заодно для модулей расширения это сделаем. Я только не помню сходу, здесь это надо делать или только в оверлеях hwconf

@vdromanov

Copy link
Copy Markdown
Contributor Author

Сделал то же самое для модулей расширения. Со стороны hwconf ничего менять не надо: одни и те же pinctrl настроены по-разному в ядрах 4.9 и 5.10

Проблема с неработающими модулями расширения решалась Иваном Заенцевым в hwconf => нужно зависеть от hwconf.

Зависимость от нужного нам hwconf уже была реализована здесь. => пока прописал Conflicts: в скрипте сборки.
@webconn нужно не забыть перенести это в новую систему сборки ядра

@vdromanov
vdromanov requested a review from evgeny-boger April 29, 2021 13:50
@webconn

webconn commented Apr 29, 2021

Copy link
Copy Markdown
Contributor

@vdromanov, ты сам всё правильно сделал :)
Можешь тогда сразу эти строчки туда добавить, с остальными зависимостями?

diff --git a/scripts/package/wb/builddeb b/scripts/package/wb/builddeb
index 07523fb9225a..f95b1a355931 100755
--- a/scripts/package/wb/builddeb
+++ b/scripts/package/wb/builddeb
@@ -328,7 +328,8 @@ else
 Package: $packagename
 Provides: linux-image, linux-image-2.6, linux-modules-$version
 Breaks: linux-image-4.9.22-$wb_target (<< $packageversion)
-Replaces: linux-image-4.9.22-$wb_target (<< $packageversion)
+Replaces: linux-image-4.9.22-$wb_target (<< $packageversion), linux-image-4.1.15-imxv5-x0.1, linux-image-4.9.6-wb
+Conflicts: linux-image-4.1.15-imxv5-x0.1, linux-image-4.9.6-wb, wb-configs (<= 1.72), wb-hwconf-manager (<< 1.38.3)
 Suggests: $fwpackagename
 Architecture: any
 Description: Linux kernel, version $version, $wb_description

@evgeny-boger
evgeny-boger merged commit 5af1bf9 into dev/v5.10 Apr 29, 2021
@evgeny-boger
evgeny-boger deleted the feature/rs485-inverted-rts branch April 29, 2021 18:50
webconn pushed a commit that referenced this pull request Dec 15, 2023
…ress

If we specify a valid CQ ring address but an invalid SQ ring address,
we'll correctly spot this and free the allocated pages and clear them
to NULL. However, we don't clear the ring page count, and hence will
attempt to free the pages again. We've already cleared the address of
the page array when freeing them, but we don't check for that. This
causes the following crash:

Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
Oops [#1]
Modules linked in:
CPU: 0 PID: 20 Comm: kworker/u2:1 Not tainted 6.6.0-rc5-dirty #56
Hardware name: ucbbar,riscvemu-bare (DT)
Workqueue: events_unbound io_ring_exit_work
epc : io_pages_free+0x2a/0x58
 ra : io_rings_free+0x3a/0x50
 epc : ffffffff808811a2 ra : ffffffff80881406 sp : ffff8f80000c3cd0
 status: 0000000200000121 badaddr: 0000000000000000 cause: 000000000000000d
 [<ffffffff808811a2>] io_pages_free+0x2a/0x58
 [<ffffffff80881406>] io_rings_free+0x3a/0x50
 [<ffffffff80882176>] io_ring_exit_work+0x37e/0x424
 [<ffffffff80027234>] process_one_work+0x10c/0x1f4
 [<ffffffff8002756e>] worker_thread+0x252/0x31c
 [<ffffffff8002f5e4>] kthread+0xc4/0xe0
 [<ffffffff8000332a>] ret_from_fork+0xa/0x1c

Check for a NULL array in io_pages_free(), but also clear the page counts
when we free them to be on the safer side.

Reported-by: rtm@csail.mit.edu
Fixes: 03d89a2 ("io_uring: support for user allocated memory for rings/sqes")
Cc: stable@vger.kernel.org
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
evgeny-boger added a commit that referenced this pull request Mar 26, 2024
…file

arch/arm/boot/dts: Delete old dts.
Remove SPDIF block

WB6: imx6ul-wirenboard61.dts: Swap mmc0 and mmc1 aliases

В ядре 5.10-rc3 по-другому стало работать сопоставление устройств mmcblk0 и
mmcblk1 контроллерам usdhc1, usdhc2. На WB6
mmc0 = &usdhc1: usdhc@2190000 - выключен,
mmc1 = &usdhc2: usdhc@2194000 - eMMC
На ядре 5.8.9 eMMC связывается с mmc0,
на ядре 5.10-rc3 eMMC связывается с mmc1 и не загружается, зависает на
ожидании монтирования mmcblk0p3.

Поменять местами алиасы mmc0 и mmc1, при этом на ядре 5.8.9 связь
устройств не меняется, на 5.10 становится mmcblk0 -> usdhc2, как и
должно быть.

dts: wb6x: enable i2c bus recovery on WBIO bus

(cherry picked from commit f2f7290)

WB6: more strong pu for wbmz-slot pins also in wb6.x

Remove trailing spaces.

(cherry picked from commit 483523a)

WB5: Rename ocotp to efuse to accomodate upstream rename.

Rename ocotp@802c000 to efuse@802c000 in imx28-wirenboard*.dts

wb6.7.x: w1 and w2 changed places

(cherry picked from commit 659a010)

WB5: imx28-ev-dbg.dts: Fix compile warning

WB6: Fix leds-pwm - add the 3rd cell to pwms property

imx6ul.dtsi has changed in mainline fa28d82 (ARM: dts: imx: default to

[    2.009580] OF: /leds-pwm/green: #pwm-cells = 3 found -1
[    2.014926] of_pwm_get(): can't parse "pwms" property
[    2.020091] leds_pwm leds-pwm: error -EINVAL: unable to request PWM for green
[    2.028372] leds_pwm: probe of leds-pwm failed with error -22

Documentation/devicetree/bindings/pwm/imx-pwm.yaml says that #pwm-cells
should be 2 for i.MX1 and 3 for i.MX27 and newer SoCs.

The 3rd cell contains bit flags defined in <dt-bindings/pwm/pwm.h>
with only one available: PWM_POLARITY_INVERTED.

Add the 3rd cell with zero value.

rts on rs485 uarts is configured as gpio with default PD (#56)

* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script

wb6: dts: define clock for phy for proper reset

LAN8720A clock must be enabled during reset. This is handled
by hook on clock enable, which, in turn require clock being
defined for this phy despite the fact it's shared by two PHYs.

new dts for wb6.8.x (rtc_clkout is gpio)

dts: disable rts-gpios on WB6 modX uarts by default (#68)

* dts: disable rts-gpios on WB6 modX uarts by default

These rts-gpios are now set expicitly in wb-hwconf-manager overlays
where it is necessary.

introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720) (#69)

* introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720)

Co-authored-by: vdromanov <vdromanov@yahoo.com>

wb: add dts and defconfig for SoM testing

ARM: dts: r40: Add dts for Wiren Board 7

Wiren Board 7 is a building automation controller with a lot
of wired and wireless connectivity options.

It's based on Allwinner A40i SoC, which is industrial-grade
version of R40.

dts: fixed unstable eth connection on wb6.9 (#75)

wb6.9: fixed incorrect clk on fec2 (#79)

ARM: dts: r40: wb7: enable battery driver

Neither MFD core, nor AXP driver doesn't support dynamic device-tree
modification. So we have to enable the battery driver on boot time
even if no battery module is installed.

We also make sure to set charging voltage and current to safe values.

wb6.9: fixed incorrect clk on fec2 (#79)

wb6, wb7: rename onboard rtc

* wb6, wb7: renamed onboard-rtc label

wb6.7.x: added -nousbhub dts (wbc-modem is connected directly to SoC's usb) (#85)

wb6: dts: fix bootlet configuration and MMC pinctrl config (#89)

This commit fixes USB bootlet kernel:

    - fix kernel panic on g_mass_storage module removing
    by making configfs included (not as module);
    - fix LEDs by enabling PWM driver for i.MX6

Also it adds missing eMMC lanes pinctrls. Looks like it worked earlier
because Boot ROM initialized these pins (didn't work on USB boot though).

dts: rename wirenboard 7.2.0 dts file

dts: wb7: add dts for WB 7.3

which supports ultra high-speed SD cards

dts: add wirenboard6x-init DTS for 5.10 (#94)

wb:dts: fix annoying warning

wb:dts: move wb7.3.0 to include

wb: dts: disable CAN on WB7.3 and add WB7.3.1

See ERRWB73002 (https://wirenboard.com/wiki/WB_7:_Errata) for details.

fix userspace compatibility

arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs

arm: dts: wb7: change order of ethernet aliases

The alias order is not yet used by Linux, since udev rules on WB7 are
looking at full path. However, it is used in U-Boot and it is used to
assign factory-programmed MAC addresses on a Wiren Board factory.

Make the numbering consistent with userspace eth0/eth1 and
with the label.

This change shouldn't break anything, as it's only used for U-Boot to assign
factory-generated MAC addresses, which will be first introduced in in rev. 7.3.2

wb7: add support for hw rev. 7.3.3 (#105)

dts: wb7: add generic labels for ethernet adapters (#107)

wb: dts: adjust gpio line names (#116)

* Rename system gpios to upper case
* Watchdog input -> WATCHDOG OUT
* Add "SPI" to MOD SPI names
* 5Vout -> 5V_OUT as in wb-mqtt-gpio
* CAN_TX -> CAN TX, CAN_RX -> CAN RX
* PMIC_XXX -> PMIC XXX
* SODIMM:52 [NC[ -> SODIMM:52 [NC]
* MODX DE -> MODX RTS
* MODX SPI SS -> MODX SPI CS
* SoM PMIC_SCK -> SOM PMIC SCL
* W1-UP -> W1 UP

wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadget speed (#122)

arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile

arch/arm/boot/dts: Delete old dts.
Remove SPDIF block

WB6: imx6ul-wirenboard61.dts: Swap mmc0 and mmc1 aliases

В ядре 5.10-rc3 по-другому стало работать сопоставление устройств mmcblk0 и
mmcblk1 контроллерам usdhc1, usdhc2. На WB6
mmc0 = &usdhc1: usdhc@2190000 - выключен,
mmc1 = &usdhc2: usdhc@2194000 - eMMC
На ядре 5.8.9 eMMC связывается с mmc0,
на ядре 5.10-rc3 eMMC связывается с mmc1 и не загружается, зависает на
ожидании монтирования mmcblk0p3.

Поменять местами алиасы mmc0 и mmc1, при этом на ядре 5.8.9 связь
устройств не меняется, на 5.10 становится mmcblk0 -> usdhc2, как и
должно быть.

dts: wb6x: enable i2c bus recovery on WBIO bus

(cherry picked from commit f2f7290)

WB6: more strong pu for wbmz-slot pins also in wb6.x

Remove trailing spaces.

(cherry picked from commit 483523a)

WB5: Rename ocotp to efuse to accomodate upstream rename.

Rename ocotp@802c000 to efuse@802c000 in imx28-wirenboard*.dts

wb6.7.x: w1 and w2 changed places

(cherry picked from commit 659a010)

WB5: imx28-ev-dbg.dts: Fix compile warning

WB6: Fix leds-pwm - add the 3rd cell to pwms property

imx6ul.dtsi has changed in mainline fa28d82 (ARM: dts: imx: default to

[    2.009580] OF: /leds-pwm/green: #pwm-cells = 3 found -1
[    2.014926] of_pwm_get(): can't parse "pwms" property
[    2.020091] leds_pwm leds-pwm: error -EINVAL: unable to request PWM for green
[    2.028372] leds_pwm: probe of leds-pwm failed with error -22

Documentation/devicetree/bindings/pwm/imx-pwm.yaml says that #pwm-cells
should be 2 for i.MX1 and 3 for i.MX27 and newer SoCs.

The 3rd cell contains bit flags defined in <dt-bindings/pwm/pwm.h>
with only one available: PWM_POLARITY_INVERTED.

Add the 3rd cell with zero value.

rts on rs485 uarts is configured as gpio with default PD (#56)

* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script

wb6: dts: define clock for phy for proper reset

LAN8720A clock must be enabled during reset. This is handled
by hook on clock enable, which, in turn require clock being
defined for this phy despite the fact it's shared by two PHYs.

new dts for wb6.8.x (rtc_clkout is gpio)

dts: disable rts-gpios on WB6 modX uarts by default (#68)

* dts: disable rts-gpios on WB6 modX uarts by default

These rts-gpios are now set expicitly in wb-hwconf-manager overlays
where it is necessary.

introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720) (#69)

* introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720)

Co-authored-by: vdromanov <vdromanov@yahoo.com>

wb: add dts and defconfig for SoM testing

ARM: dts: r40: Add dts for Wiren Board 7

Wiren Board 7 is a building automation controller with a lot
of wired and wireless connectivity options.

It's based on Allwinner A40i SoC, which is industrial-grade
version of R40.

dts: fixed unstable eth connection on wb6.9 (#75)

wb6.9: fixed incorrect clk on fec2 (#79)

ARM: dts: r40: wb7: enable battery driver

Neither MFD core, nor AXP driver doesn't support dynamic device-tree
modification. So we have to enable the battery driver on boot time
even if no battery module is installed.

We also make sure to set charging voltage and current to safe values.

wb6.9: fixed incorrect clk on fec2 (#79)

wb6, wb7: rename onboard rtc

* wb6, wb7: renamed onboard-rtc label

wb6.7.x: added -nousbhub dts (wbc-modem is connected directly to SoC's usb) (#85)

wb6: dts: fix bootlet configuration and MMC pinctrl config (#89)

This commit fixes USB bootlet kernel:

    - fix kernel panic on g_mass_storage module removing
    by making configfs included (not as module);
    - fix LEDs by enabling PWM driver for i.MX6

Also it adds missing eMMC lanes pinctrls. Looks like it worked earlier
because Boot ROM initialized these pins (didn't work on USB boot though).

dts: rename wirenboard 7.2.0 dts file

dts: wb7: add dts for WB 7.3

which supports ultra high-speed SD cards

dts: add wirenboard6x-init DTS for 5.10 (#94)

wb:dts: fix annoying warning

wb:dts: move wb7.3.0 to include

wb: dts: disable CAN on WB7.3 and add WB7.3.1

See ERRWB73002 (https://wirenboard.com/wiki/WB_7:_Errata) for details.

fix userspace compatibility

arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs

arm: dts: wb7: change order of ethernet aliases

The alias order is not yet used by Linux, since udev rules on WB7 are
looking at full path. However, it is used in U-Boot and it is used to
assign factory-programmed MAC addresses on a Wiren Board factory.

Make the numbering consistent with userspace eth0/eth1 and
with the label.

This change shouldn't break anything, as it's only used for U-Boot to assign
factory-generated MAC addresses, which will be first introduced in in rev. 7.3.2

wb7: add support for hw rev. 7.3.3 (#105)

dts: wb7: add generic labels for ethernet adapters (#107)

wb: dts: adjust gpio line names (#116)

* Rename system gpios to upper case
* Watchdog input -> WATCHDOG OUT
* Add "SPI" to MOD SPI names
* 5Vout -> 5V_OUT as in wb-mqtt-gpio
* CAN_TX -> CAN TX, CAN_RX -> CAN RX
* PMIC_XXX -> PMIC XXX
* SODIMM:52 [NC[ -> SODIMM:52 [NC]
* MODX DE -> MODX RTS
* MODX SPI SS -> MODX SPI CS
* SoM PMIC_SCK -> SOM PMIC SCL
* W1-UP -> W1 UP

wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadget speed (#122)

dts: use bitbanged MDIO on eth0

built-in EMAC MDIO fails to read phy_id which leads to
generic phy driver being used instead of icplus.

wb7: dts: add cpu opp tables

dts: add missing wirenboard-7xx compatible strings for 7.2.x

missing makefile

ARM: dts: r40: Add dts for Wiren Board 7.4

Wiren Board 7.4 is a building automation controller with a lot
of wired and wireless connectivity options.

It's based on Allwinner A40i SoC, which is industrial-grade
version of R40.

The main difference from Wiren Board 7.3 or older is the Embedded
Controller - a chip with such function as RTC, ADC, GPIO, watchdog
and power control

add WBEC support for wb7 bootlet

wb7: disable microsd card detect gpio

dts: wb7: add WB 7.4.2 revision with different ADC resistor divider

dts add wireboard min dts
taraant pushed a commit that referenced this pull request May 19, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request May 19, 2025
Original commits:
  .gitignore
    9d7ac38: wb-deb: linux 5.10 (#54)
    324edfb: wb-deb: add debian files exceptions to .gitignore
    39f9574: wb: add more build artifacts to gitignore
  .gitmodules
    97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
  Jenkinsfile
    9d7ac38: wb-deb: linux 5.10 (#54)
    c6a7634: jenkinsfile: rename contactless folder to wirenboard (#59)
    be8355f: jenkinsfile: replace manual deployment with one from library (#61)
    2f63eae: wb: jenkins: add wb7 to target list
    3bcadf6: Jenkinsfile: move pipeline to library (#99)
    7863007: Jenkinsfile: build bootlets by default
  scripts/Makefile.kasan
    393200a: kasan: fix hwasan build for gcc
  scripts/Makefile.package
    9d7ac38: wb-deb: linux 5.10 (#54)
  scripts/package/wb/builddeb
    9d7ac38: wb-deb: linux 5.10 (#54)
    8b7ff1b: rts on rs485 uarts is configured as gpio with default PD (#56)
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    fc8da1c: builddeb: conflict on linux-image to forbid multiple images (#77)
    bf2dfdc: fix build with recent dpkg (ubuntu 22.04)
    f3e93d5: wb builddeb: add wireguard-required packages to "Provides:" section (#129)
  scripts/package/wb/common.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_bootpart.sh
    efbe2be: add wb7min defconfig
  scripts/package/wb/do_build_deb.sh
    9d7ac38: wb-deb: linux 5.10 (#54)
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
  scripts/package/wb/version.sh
    9d7ac38: wb-deb: linux 5.10 (#54)
    7edec46: add support for wb7 in custom build scripts
    efbe2be: add wb7min defconfig
    13c5c77: initial commit of bootlet in package
    90a0ec9: scripts: make wb7x-factory-bootlet not work as regular bootlet; no functional changes
taraant pushed a commit that referenced this pull request May 19, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request May 19, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request May 19, 2025
Original commits:
  arch/arm/Makefile
    dd9d47a: ARM: 9156/1: drop cc-option fallbacks for architecture selection
  arch/arm/boot/dts/Makefile
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
    6e40c49: new dts for wb6.8.x (rtc_clkout is gpio)
    757ff51: introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720) (#69)
    82d206f: wb: add dts and defconfig for SoM testing
    41efdbd: ARM: dts: r40: Add dts for Wiren Board 7
    a490e92: wb6.7.x: added -nousbhub dts (wbc-modem is connected directly to SoC's usb) (#85)
    a047e1e: dts: wb7: add dts for WB 7.3
    b4c9015: dts: add wirenboard6x-init DTS for 5.10 (#94)
    dcb2d34: wb: dts: disable CAN on WB7.3 and add WB7.3.1
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
    e6227e4: wb7: add support for hw rev. 7.3.3 (#105)
    3ea1b23: wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadget speed (#122)
    efbe2be: add wb7min defconfig
    06dad6d: ARM: dts: r40: Add dts for Wiren Board 7.4
    37d87c1: add WBEC support for wb7 bootlet
    0349992: dts: wb7: add WB 7.4.2 revision with different ADC resistor divider
    6430e72: wb74: add 38071cb dts
  arch/arm/boot/dts/imx23-audio.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx23-olinuxino.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx23.dtsi
    52e1e85: mxs: imx23: use microseconds counter from DIGCTL block as a clocksource instead of 32kHz timer
  arch/arm/boot/dts/imx28-ev-dbg.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard50.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard52-functest.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard52.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard55.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard58.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28-wirenboard5x-usbfw.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx28.dtsi
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx6ul-pinfunc.h
    9c04994: ARM: dts: imx6ul: properly initialize UART7/8 RTS input regs
  arch/arm/boot/dts/imx6ul-wirenboard-evk.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx6ul-wirenboard61.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
    8b7ff1b: rts on rs485 uarts is configured as gpio with default PD (#56)
    c336a5a: wb6: dts: define clock for phy for proper reset
    6e40c49: new dts for wb6.8.x (rtc_clkout is gpio)
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    ad93eeb: wb7: defined proper modem's gpios and usb-soc addr (#78)
    2a813ac: wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
    567646d: wb6: fix bootlet configuration and MMC pinctrl config (#89)
    a5a031d: wb: dts: adjust gpio line names (#116)
  arch/arm/boot/dts/imx6ul-wirenboard65.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
    a5a031d: wb: dts: adjust gpio line names (#116)
  arch/arm/boot/dts/imx6ul-wirenboard660.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
  arch/arm/boot/dts/imx6ul-wirenboard670-nousbhub.dts
    a490e92: wb6.7.x: added -nousbhub dts (wbc-modem is connected directly to SoC's usb) (#85)
  arch/arm/boot/dts/imx6ul-wirenboard670.dts
    b672c11: arch/arm/boot/dts: WB5, WB6: Add all .dts and corresponding Makefile
    8b7ff1b: rts on rs485 uarts is configured as gpio with default PD (#56)
    b042223: dts: disable rts-gpios on WB6 modX uarts by default (#68)
    ad93eeb: wb7: defined proper modem's gpios and usb-soc addr (#78)
    a5a031d: wb: dts: adjust gpio line names (#116)
  arch/arm/boot/dts/imx6ul-wirenboard680.dts
    6e40c49: new dts for wb6.8.x (rtc_clkout is gpio)
    2a813ac: wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
  arch/arm/boot/dts/imx6ul-wirenboard690.dts
    757ff51: introduced a new model wb6.9: changed wdg-gpio; new eth phy (lan8720) (#69)
    d2deca0: dts: fixed unstable eth connection on wb6.9 (#75)
    42e6bec: wb6.9: fixed incorrect clk on fec2 (#79)
    a5a031d: wb: dts: adjust gpio line names (#116)
  arch/arm/boot/dts/imx6ul-wirenboard6x-init.dts
    b4c9015: dts: add wirenboard6x-init DTS for 5.10 (#94)
  arch/arm/boot/dts/imx6ul.dtsi
    955fa47: dts: imx6ul(l): add LDP_1P1 regulator
  arch/arm/boot/dts/omap3.dtsi
    6ce6443: ARM: dts: Fix swapped mmc order for omap3
  arch/arm/boot/dts/omap4.dtsi
    a55de4f: ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
  arch/arm/boot/dts/omap44xx-clocks.dtsi
    9f399a9: ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
  arch/arm/boot/dts/omap5.dtsi
    a55de4f: ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
  arch/arm/boot/dts/sun8i-r40-wirenboard-som-test.dts
    82d206f: wb: add dts and defconfig for SoM testing
    a5a031d: wb: dts: adjust gpio line names (#116)
  arch/arm/boot/dts/sun8i-r40-wirenboard720.dts
    41efdbd: ARM: dts: r40: Add dts for Wiren Board 7
    b905f07: ARM: dts: r40: wb7: enable battery driver
    ad93eeb: wb7: defined proper modem's gpios and usb-soc addr (#78)
    2a813ac: wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
    e0c49db: dts: rename wirenboard 7.2.0 dts file
    a047e1e: dts: wb7: add dts for WB 7.3
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
    8dd7b01: dts: add missing wirenboard-7xx compatible strings for 7.2.x
  arch/arm/boot/dts/sun8i-r40-wirenboard72x-eui-eeprom.dtsi
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
  arch/arm/boot/dts/sun8i-r40-wirenboard72x-factory.dts
    37d87c1: add WBEC support for wb7 bootlet
  arch/arm/boot/dts/sun8i-r40-wirenboard72x-initram.dts
    3ea1b23: wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadget speed (#122)
    8dd7b01: dts: add missing wirenboard-7xx compatible strings for 7.2.x
    37d87c1: add WBEC support for wb7 bootlet
  arch/arm/boot/dts/sun8i-r40-wirenboard72x-initram.dtsi
    37d87c1: add WBEC support for wb7 bootlet
    5c684d2: dts: fix microsd on 7.3+ boards in bootlet
  arch/arm/boot/dts/sun8i-r40-wirenboard72x.dtsi
    e0c49db: dts: rename wirenboard 7.2.0 dts file
    a047e1e: dts: wb7: add dts for WB 7.3
    bf5df80: wb:dts: fix annoying warning
    0bc316f: arm: dts: wb7: change order of ethernet aliases
    4cd32ad: dts: wb7: add generic labels for ethernet adapters (#107)
    a5a031d: wb: dts: adjust gpio line names (#116)
    3ea1b23: wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadget speed (#122)
    b334992: wb7: dts: work around wrong LED mode on 2nd eth
    0cbd16d: wb7: disable microsd card detect gpio
    fe28816: add regulator-boot-on in dts
    ca89d0b: wb7 dts: add wbio-i2c-recovery pins
  arch/arm/boot/dts/sun8i-r40-wirenboard730.dts
    a047e1e: dts: wb7: add dts for WB 7.3
    e89aa80: wb:dts: move wb7.3.0 to include
    dcb2d34: wb: dts: disable CAN on WB7.3 and add WB7.3.1
    1e5bc22: fix userspace compatibility
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
  arch/arm/boot/dts/sun8i-r40-wirenboard731.dts
    dcb2d34: wb: dts: disable CAN on WB7.3 and add WB7.3.1
    1e5bc22: fix userspace compatibility
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
  arch/arm/boot/dts/sun8i-r40-wirenboard732.dts
    bd7d6f2: arm: dts: wb7: add 7.3.2 w/o eth MAC EEPROMs
  arch/arm/boot/dts/sun8i-r40-wirenboard733.dts
    e6227e4: wb7: add support for hw rev. 7.3.3 (#105)
  arch/arm/boot/dts/sun8i-r40-wirenboard734-38071cb.dts
    efbe2be: add wb7min defconfig
  arch/arm/boot/dts/sun8i-r40-wirenboard73x.dtsi
    e89aa80: wb:dts: move wb7.3.0 to include
  arch/arm/boot/dts/sun8i-r40-wirenboard741.dts
    06dad6d: ARM: dts: r40: Add dts for Wiren Board 7.4
    0349992: dts: wb7: add WB 7.4.2 revision with different ADC resistor divider
  arch/arm/boot/dts/sun8i-r40-wirenboard742-38071cb.dts
    6430e72: wb74: add 38071cb dts
    e5de9a0: add necessary wbec modules to 38071cb defconfig; add modules to dts
  arch/arm/boot/dts/sun8i-r40-wirenboard742.dts
    0349992: dts: wb7: add WB 7.4.2 revision with different ADC resistor divider
  arch/arm/boot/dts/sun8i-r40-wirenboard74x.dtsi
    06dad6d: ARM: dts: r40: Add dts for Wiren Board 7.4
    758f443: wirenboard74x.dtsi: fix `V_OUT ON` gpio name
    0349992: dts: wb7: add WB 7.4.2 revision with different ADC resistor divider
    091e719: wb74: disable microsd card detect gpio
    5ce47c0: dts: wb74x: fix 1-Wire pins
    fe28816: add regulator-boot-on in dts
    ca89d0b: wb7 dts: add wbio-i2c-recovery pins
  arch/arm/boot/dts/sun8i-r40-wirenboard7xx-38071cb.dtsi
    efbe2be: add wb7min defconfig
  arch/arm/boot/dts/sun8i-r40.dtsi
    686a254: ARM: dts: sun8i: r40: add node for CAN controller
    f815c6d: ARM: dts: sun8i: r40: Add timer node
    a86742b: ARM: dtsi: add pwm node for sun8i R40.
    f500a4a: ARM: dts: sun8i: r40: add second ethernet support (submitted to upstream)
    8278a35: ARM: dts: sun8i: r40: add rtp node (submitted to upstream)
    796285b: ARM: dts: sun8i: r40: add child iio node for gpadc
    359abbb: ARM: dts: sun8i: r40: add usb0 dual role support
    3a20b97: WIP: r40 sid
    154bb8b: ARM: dts: sun8i: r40: add cpufreq tables
    2de4fb0: dts: arm: r40: add various pins to pinctrl
    2b4ba7f: ARM: dts: sun4i: r40: change uart compatible
    6cdef71: dts: arm: r40: add various pins to pinctrl
  arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts
    286c39d: arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
    edc5d16: arm64: dts: allwinner: Revert SD card CD GPIO for Pine64-LTS
  arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
    286c39d: arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
  arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
    a4a7cf6: arm64: dts: allwinner: a64: Sort watchdog node
    e0475ad: arm64: dts: allwinner: Add sun4i MMIO timer nodes
  arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts
    8d7906c: arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference
  arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
    e0475ad: arm64: dts: allwinner: Add sun4i MMIO timer nodes
  drivers/of/overlay.c
    ad88b84: of: overlay: kobjectify overlay objects
    860cbed: of: overlay: global sysfs enable attribute
    b446483: of: overlay: add per overlay sysfs attributes
    68bb5b9: wb: workaround: disable memory leak warning in runtime dt overlays
taraant pushed a commit that referenced this pull request Jun 9, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Jun 9, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Jun 9, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Jul 29, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Jul 29, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Jul 29, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Oct 31, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Oct 31, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Oct 31, 2025
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Apr 14, 2026
commit 4487571ef17a30d274600b3bd6965f497a881299 upstream.

Currently, AMDGPU_VA_RESERVED_TRAP_SIZE is hardcoded to 8KB, while
KFD_CWSR_TBA_TMA_SIZE is defined as 2 * PAGE_SIZE. On systems with
4K pages, both values match (8KB), so allocation and reserved space
are consistent.

However, on 64K page-size systems, KFD_CWSR_TBA_TMA_SIZE becomes 128KB,
while the reserved trap area remains 8KB. This mismatch causes the
kernel to crash when running rocminfo or rccl unit tests.

Kernel attempted to read user page (2) - exploit attempt? (uid: 1001)
BUG: Kernel NULL pointer dereference on read at 0x00000002
Faulting instruction address: 0xc0000000002c8a64
Oops: Kernel access of bad area, sig: 11 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries
CPU: 34 UID: 1001 PID: 9379 Comm: rocminfo Tainted: G E
6.19.0-rc4-amdgpu-00320-gf23176405700 #56 VOLUNTARY
Tainted: [E]=UNSIGNED_MODULE
Hardware name: IBM,9105-42A POWER10 (architected) 0x800200 0xf000006
of:IBM,FW1060.30 (ML1060_896) hv:phyp pSeries
NIP:  c0000000002c8a64 LR: c00000000125dbc8 CTR: c00000000125e730
REGS: c0000001e0957580 TRAP: 0300 Tainted: G E
MSR:  8000000000009033 <SF,EE,ME,IR,DR,RI,LE> CR: 24008268
XER: 00000036
CFAR: c00000000125dbc4 DAR: 0000000000000002 DSISR: 40000000
IRQMASK: 1
GPR00: c00000000125d908 c0000001e0957820 c0000000016e8100
c00000013d814540
GPR04: 0000000000000002 c00000013d814550 0000000000000045
0000000000000000
GPR08: c00000013444d000 c00000013d814538 c00000013d814538
0000000084002268
GPR12: c00000000125e730 c000007e2ffd5f00 ffffffffffffffff
0000000000020000
GPR16: 0000000000000000 0000000000000002 c00000015f653000
0000000000000000
GPR20: c000000138662400 c00000013d814540 0000000000000000
c00000013d814500
GPR24: 0000000000000000 0000000000000002 c0000001e0957888
c0000001e0957878
GPR28: c00000013d814548 0000000000000000 c00000013d814540
c0000001e0957888
NIP [c0000000002c8a64] __mutex_add_waiter+0x24/0xc0
LR [c00000000125dbc8] __mutex_lock.constprop.0+0x318/0xd00
Call Trace:
0xc0000001e0957890 (unreliable)
__mutex_lock.constprop.0+0x58/0xd00
amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu+0x6fc/0xb60 [amdgpu]
kfd_process_alloc_gpuvm+0x54/0x1f0 [amdgpu]
kfd_process_device_init_cwsr_dgpu+0xa4/0x1a0 [amdgpu]
kfd_process_device_init_vm+0xd8/0x2e0 [amdgpu]
kfd_ioctl_acquire_vm+0xd0/0x130 [amdgpu]
kfd_ioctl+0x514/0x670 [amdgpu]
sys_ioctl+0x134/0x180
system_call_exception+0x114/0x300
system_call_vectored_common+0x15c/0x2ec

This patch changes AMDGPU_VA_RESERVED_TRAP_SIZE to 64 KB and
KFD_CWSR_TBA_TMA_SIZE to the AMD GPU page size. This means we reserve
64 KB for the trap in the address space, but only allocate 8 KB within
it. With this approach, the allocation size never exceeds the reserved
area.

Fixes: 34a1de0 ("drm/amdkfd: Relocate TBA/TMA to opposite side of VM hole")
Reviewed-by: Christian König <christian.koenig@amd.com>
Suggested-by: Felix Kuehling <felix.kuehling@amd.com>
Suggested-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 31b8de5e55666f26ea7ece5f412b83eab3f56dbb)
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
taraant pushed a commit that referenced this pull request Apr 14, 2026
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Apr 14, 2026
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
taraant pushed a commit that referenced this pull request Apr 14, 2026
* rts on rs485 uarts is configured as gpio with default PD

* bumped version

* rts as gpio with default pd on rs485-modules

* added dependancy of wb-hwconf-manager

* dependencies from build_kernel repo have migrated into builddeb script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants