Add support for WASP SoC on AVM router boards
Subsystems (2)
v2 cover Add support for WASP SoC on AVM router boards
There is a popular set of Lantiq xrx200 router boards by AVM in Germany (AVM Fritzbox 3390, 3490, 5490, 5491 and 7490) which have the strange implementation of having the wifi cards connected to a separate memory only ATH79 based SoC. It has no persistent storage and no access to any resource on the Lantiq host, but is connect to the Lantiq GSWIP switch on an additional fixed internal network port.
This kernel module is to support booting the secondary SoC called Wireless Assistant Support Processor (WASP).
After turning it on, a small network boot firmware is sent to the SoC by using mdio and when it is started, an initramfs linux image is sent to the SoC using raw ethernet frames.
The whole procedure takes about 6 seconds, if there is no error. So far tested on 3490, 5490 and 7490 devices based on OpenWrt.
Patch 1/3 adds the vendor name
Patch 2/3 adds the dt-bindings
Patch 3/3 adds the remoteproc driver
To build and run, there is OpenWrt PR 5075.
Please review.
Changes in v2:
- Remove firmware names from dt-binding and add as kmod parameters
- Rename other bindings with vender prefix and fix gpios suffix
- Change descriptions in dt-binding
- Replace/Remove asynch load of firmware with request_firmware_direct
- Fix comments to use the errno define instead of the number
- Implement wait loops with read_poll_timeout() macro
- Wrap read_poll_timeout() macro in function saving 6k module size
- Return -ETIMEDOUT for all errors returned by read_poll_timeout
- Replace mdio writes/reads with mdiobus_write and mdiobus_read and add return codes and their handling
- Remove mutex for mdiobus_lock and add return code checking for mdio ops
- Replaced the mdio register array with directly specifying registers
- As a result of the previous 3 changes remove the functions for mdio
- Consolidate error messages for mdio writes into a single one saved 1k for module size
- Replaced mdelay with usleep_range saved 0,7k module size
- Remove unneeded include <linux/interrupt.h> and <linux/error.h>
- Wrap all blocks with {} and fix some indentation errors
- Change const len in to size_t in avm_wasp_netboot_write_chunk
- Make all methods static to fix kernel bot warning
- Change read variable name in avm_wasp_load_initramfs_image
- Change ssize_t variables to size_t in avm_wasp_load_initramfs_image
- avm_wasp_netboot_write_chunk change for loop for 2 byte divisibility
- Change uint32_t to u32
- Change int count = -1 to u32 with U32_MAX initialisation
- Add check for firmware len divisable by 4
- Replace big endian bit shift operations with be32_to_cpu
- Change loop to write 14 byte firmware chuncks like suggested
- Change WASP_CHUNK_SIZE to ARRAY_SIZE(mac_data) for readability
- Change int done to boolean
- Change unsigned ints to u32
- Change int to size_t for send_len
- Use int for numbytes because kernel_recvmsg returns error or number
- Two sockets are not needed, so reduce to one socket usage
- Remove struct timeval definition, replace with __kernel_old_timeval
- __kernel_old_timeval is depracated, but arch mips is 32bit platform
- Replace &avmwasp->pdev->dev with local dev
- Check if wasp network interface is up and fail if not in start method
- Remove setsockopt for SO_REUSEADDR and SO_BINDTODEVICE
- Remove packet_counter
- Move firmware and firmware_end out of RESP_DISCOVER to make sure that they are initialized if RESP_DISCOVER is not happening first
- indend break;
- Move second half of the send/receive paket while loop to RESP_OK and let RESP_DISCOVER fall through
- Remove bringing up the wasp network interface
- Check if wasp network interface is up in probe and defer if not
- Remove the check for the root device and replace it with match data for WASP device identification
- Move of_read and find of mdio bus to rproc_start but delete reference after using it in the rproc_start method
- Replace dev_set_drvdata with platform_set_drvdata
- Remove avm_wasp_rproc_boot_addr because its not needed and move setting the fw struct pointer to avm_wasp_rproc_load
- Move avm_wasp.h definitions to kernel module
Daniel Kestrel (3):
dt-bindings: vendor-prefixes: Add AVM
dt-bindings: remoteproc: Add AVM WASP
remoteproc: Add AVM WASP driver
.../bindings/remoteproc/avm,wasp-rproc.yaml | 56 + .../devicetree/bindings/vendor-prefixes.yaml | 2 + drivers/remoteproc/Kconfig | 10 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/avm_wasp.c | 1051 +++++++++++++++++ 5 files changed, 1120 insertions(+) create mode 100644 Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml create mode 100644 drivers/remoteproc/avm_wasp.c
Signature · 1 line
2.17.1
PATCH v2 1/3 dt-bindings: vendor-prefixes: Add AVM
Add vendor prefix for AVM Computersysteme Vertriebs GmbH (http://www.avm.de/en)
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -153,6 +153,8 @@ patternProperties: description: avia semiconductor "^avic,.*": description: Shanghai AVIC Optoelectronics Co., Ltd. + "^avm,.*": + description: AVM Computersysteme Vertriebs GmbH "^avnet,.*": description: Avnet, Inc. "^awinic,.*":
Signature · 1 line
2.17.1
PATCH v2 2/3 dt-bindings: remoteproc: Add AVM WASP
In reply to Daniel KestrelAVM Fritzbox router boards may contain an additional ATH79 based SoC that has the wifi cards connected.
This patch adds bindings for this remote processor.
--- .../bindings/remoteproc/avm,wasp-rproc.yaml | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +56 -0
@@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/avm,wasp-rproc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AVM WASP processor controller bindings + +maintainers: + - Daniel Kestrel <[email protected]> + +description: | + This document defines the bindings for the remoteproc component that loads and + boots firmwares on the AVM Wireless Assistent Support Processor (WASP) SoC + that is attached to some AVM Fritzbox devices (3390, 3490, 5490, 5491, 7490). + +properties: + compatible: + enum: + - avm,fritzbox3390-wasp + - avm,fritzboxx490-wasp + + avm,wasp-mdio: + $ref: /schemas/types.yaml#/definitions/phandle + description: Lantiq GSWIP switch mdio. + + avm,wasp-port: + $ref: /schemas/types.yaml#/definitions/phandle + description: Network port, where the WASP SoC is connected to. + + avm,reset-gpios: + description: Reset gpio of the WASP SoC. + + avm,startup-gpios: + description: Startup gpio of the WASP SoC. + +required: + - compatible + - avm,wasp-mdio + - avm,wasp-port + - avm,reset-gpios + - avm,startup-gpios + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + remoteproc { + compatible = "avm,fritzboxx490-wasp"; + avm,wasp-mdio = <&gswip_mdio>; + avm,wasp-port = <&port5>; + avm,reset-gpios = <&gpio 34 GPIO_ACTIVE_HIGH>; + avm,startup-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + };
Signature · 1 line
2.17.1
Re: [PATCH v2 2/3] dt-bindings: remoteproc: Add AVM WASP
Quoted 27 lines · Daniel Kestrel
AVM Fritzbox router boards may contain an additional ATH79 based SoC that has the wifi cards connected.
This patch adds bindings for this remote processor.Signed-off-by Daniel Kestrel <[email protected]>--- .../bindings/remoteproc/avm,wasp-rproc.yaml | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yamlDocumentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +11
-0@@ -0,0 +1,56 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/remoteproc/avm,wasp-rproc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AVM WASP processor controller bindings + +maintainers: + - Daniel Kestrel <[email protected]> +
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +10
-0+description: | + This document defines the bindings for the remoteproc component that loads and + boots firmwares on the AVM Wireless Assistent Support Processor (WASP) SoC + that is attached to some AVM Fritzbox devices (3390, 3490, 5490, 5491, 7490). + +properties: + compatible: + enum: + - avm,fritzbox3390-wasp + - avm,fritzboxx490-wasp
This should be specific compatible instead of wildcard "x490".
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml line 32
Quoted 11 lines
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +11
-0+ + avm,wasp-mdio: + $ref: /schemas/types.yaml#/definitions/phandle + description: Lantiq GSWIP switch mdio. + + avm,wasp-port: + $ref: /schemas/types.yaml#/definitions/phandle + description: Network port, where the WASP SoC is connected to. + + avm,reset-gpios: + description: Reset gpio of the WASP SoC.
maxItems
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml line 35
Quoted 3 lines
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +3
-0+ + avm,startup-gpios: + description: Startup gpio of the WASP SoC.
maxItems
Quoted 11 lines
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +11
-0+ +required: + - compatible + - avm,wasp-mdio + - avm,wasp-port + - avm,reset-gpios + - avm,startup-gpios + +additionalProperties: false + +examples:
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml line 56
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/avm,wasp-rproc.yaml new file +10
-0+ - | + #include <dt-bindings/gpio/gpio.h> + + remoteproc { + compatible = "avm,fritzboxx490-wasp"; + avm,wasp-mdio = <&gswip_mdio>; + avm,wasp-port = <&port5>; + avm,reset-gpios = <&gpio 34 GPIO_ACTIVE_HIGH>; + avm,startup-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>; + };
Best regards,
Krzysztof
PATCH v2 3/3 remoteproc: Add AVM WASP driver
In reply to Daniel KestrelSome AVM Fritzbox router boards (3390, 3490, 5490, 5491, 7490), that are Lantiq XRX200 based, have a memory only ATH79 based WASP (Wireless Assistant Support Processor) SoC that has wifi cards connected to it. It does not share anything with the Lantiq host and has no persistent storage. It has an mdio based connection for bringing up a small network boot firmware and is connected to the Lantiq GSWIP switch via gigabit ethernet. This is used to load an initramfs linux image to it, after the network boot firmware was started.
In order to initialize this remote processor we need to:
- power on the SoC using startup gpio
- reset the SoC using the reset gpio
- send the network boot firmware using mdio
- send the linux image using raw ethernet frames
This driver allows to start and stop the WASP SoC.
--- drivers/remoteproc/Kconfig | 10 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/avm_wasp.c | 1051 +++++++++++++++++++++++++++++++++ 3 files changed, 1062 insertions(+) create mode 100644 drivers/remoteproc/avm_wasp.c
drivers/remoteproc/Kconfig +10 -0
@@ -23,6 +23,16 @@ config REMOTEPROC_CDEV It's safe to say N if you don't want to use this interface. +config AVM_WASP_REMOTEPROC + tristate "AVM WASP remoteproc support" + depends on NET_DSA_LANTIQ_GSWIP + help + Say y here to support booting the secondary SoC ATH79 target + called Wireless Assistant Support Processor (WASP) that some + AVM Fritzbox devices (3390, 3490, 5490, 5491, 7490) have built in. + + It's safe to say N here. + config IMX_REMOTEPROC tristate "i.MX remoteproc support" depends on ARCH_MXC
drivers/remoteproc/Makefile +1 -0
@@ -11,6 +11,7 @@ remoteproc-y += remoteproc_sysfs.o remoteproc-y += remoteproc_virtio.o remoteproc-y += remoteproc_elf_loader.o obj-$(CONFIG_REMOTEPROC_CDEV) += remoteproc_cdev.o +obj-$(CONFIG_AVM_WASP_REMOTEPROC) += avm_wasp.o obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o obj-$(CONFIG_IMX_DSP_REMOTEPROC) += imx_dsp_rproc.o obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o
drivers/remoteproc/avm_wasp.c new file +1051 -0
1,051 lines not on this page · raw message
Signature · 1 line
2.17.1