Skip to content

wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadge… - #122

Merged
vdromanov merged 2 commits into
dev/v5.10.yfrom
feature/usbgadget_lowspeed_dts
Jan 18, 2023
Merged

wb7: dts: lower usb-gadget speed; add initram-dts with high usb-gadge…#122
vdromanov merged 2 commits into
dev/v5.10.yfrom
feature/usbgadget_lowspeed_dts

Conversation

@vdromanov

Copy link
Copy Markdown
Contributor

…t speed

прописал меньшую скорость для usb; сделал отдельную initram-dts, чтобы точно ничего не поломать

на инитноуте пока не гонял

@vdromanov
vdromanov requested a review from webconn January 17, 2023 23:00
@vdromanov
vdromanov merged commit 3ea1b23 into dev/v5.10.y Jan 18, 2023
@vdromanov
vdromanov deleted the feature/usbgadget_lowspeed_dts branch January 18, 2023 14:18
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 16, 2025
taraant pushed a commit that referenced this pull request May 16, 2025
taraant pushed a commit that referenced this pull request May 16, 2025
taraant pushed a commit that referenced this pull request May 19, 2025
taraant pushed a commit that referenced this pull request May 19, 2025
taraant pushed a commit that referenced this pull request May 19, 2025
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
taraant pushed a commit that referenced this pull request Jun 9, 2025
taraant pushed a commit that referenced this pull request Jun 9, 2025
taraant pushed a commit that referenced this pull request Jul 29, 2025
taraant pushed a commit that referenced this pull request Jul 29, 2025
taraant pushed a commit that referenced this pull request Jul 29, 2025
taraant pushed a commit that referenced this pull request Oct 31, 2025
taraant pushed a commit that referenced this pull request Oct 31, 2025
taraant pushed a commit that referenced this pull request Oct 31, 2025
taraant pushed a commit that referenced this pull request Apr 14, 2026
commit baa35a698cea26930679a20a7550bbb4c8319725 upstream.

Access to net_device::ip_ptr and its associated members must be
protected by an RCU lock. Since we are modifying this piece of code,
let's also move it to execute only when WAKE_ARP is enabled.

To minimize the duration of the RCU lock, a local variable is used to
temporarily store the IP address. This change resolves the following
RCU check warning:
  WARNING: suspicious RCU usage
  7.0.0-rc3-next-20260310-yocto-standard+ #122 Not tainted
  -----------------------------
  drivers/net/ethernet/cadence/macb_main.c:5944 suspicious rcu_dereference_check() usage!

  other info that might help us debug this:

  rcu_scheduler_active = 2, debug_locks = 1
  5 locks held by rtcwake/518:
   #0: ffff000803ab1408 (sb_writers#5){.+.+}-{0:0}, at: vfs_write+0xf8/0x368
   #1: ffff0008090bf088 (&of->mutex#2){+.+.}-{4:4}, at: kernfs_fop_write_iter+0xbc/0x1c8
   #2: ffff00080098d588 (kn->active#70){.+.+}-{0:0}, at: kernfs_fop_write_iter+0xcc/0x1c8
   #3: ffff800081c84888 (system_transition_mutex){+.+.}-{4:4}, at: pm_suspend+0x1ec/0x290
   #4: ffff0008009ba0f8 (&dev->mutex){....}-{4:4}, at: device_suspend+0x118/0x4f0

  stack backtrace:
  CPU: 3 UID: 0 PID: 518 Comm: rtcwake Not tainted 7.0.0-rc3-next-20260310-yocto-standard+ #122 PREEMPT
  Hardware name: ZynqMP ZCU102 Rev1.1 (DT)
  Call trace:
   show_stack+0x24/0x38 (C)
   __dump_stack+0x28/0x38
   dump_stack_lvl+0x64/0x88
   dump_stack+0x18/0x24
   lockdep_rcu_suspicious+0x134/0x1d8
   macb_suspend+0xd8/0x4c0
   device_suspend+0x218/0x4f0
   dpm_suspend+0x244/0x3a0
   dpm_suspend_start+0x50/0x78
   suspend_devices_and_enter+0xec/0x560
   pm_suspend+0x194/0x290
   state_store+0x110/0x158
   kobj_attr_store+0x1c/0x30
   sysfs_kf_write+0xa8/0xd0
   kernfs_fop_write_iter+0x11c/0x1c8
   vfs_write+0x248/0x368
   ksys_write+0x7c/0xf8
   __arm64_sys_write+0x28/0x40
   invoke_syscall+0x4c/0xe8
   el0_svc_common+0x98/0xf0
   do_el0_svc+0x28/0x40
   el0_svc+0x54/0x1e0
   el0t_64_sync_handler+0x84/0x130
   el0t_64_sync+0x198/0x1a0

Fixes: 0cb8de3 ("net: macb: Add ARP support to WOL")
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Cc: stable@vger.kernel.org
Reviewed-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://patch.msgid.link/20260318-macb-irq-v2-2-f1179768ab24@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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