realtek: add ZyXEL GS1900-24 v1 support #9400

Hurricos · 2022-03-05T20:49:03Z

The ZyXEL GS1900-24 v1 is a 24 port switch with two SFP ports, similar to
the other GS1900 switches.

Specifications

Device: ZyXEL GS1900-24 v1
SoC: Realtek RTL8382M 500 MHz MIPS 4KEc
Flash: 16 MiB
RAM: Winbond W9751G8KB-25 64 MiB DDR2 SDRAM
Ethernet: 24x 10/100/1000 Mbps, 2x SFP 100/1000 Mbps
LEDs:
- 1 PWR LED (green, not configurable)
- 1 SYS LED (green, configurable)
- 24 ethernet port link/activity LEDs (green, SoC controlled)
- 2 SFP status/activity LEDs (green, SoC controlled)
Buttons:
- 1 "RESET" button on front panel (soft reset)
- 1 button ('SW1') behind right hex grate (hardwired power-off)
Power: 120-240V AC C13
UART: Internal populated 10-pin header ('J5') providing RS232;
connected to SoC UART through a SIPEX 3232EC for voltage
level shifting.
'J5' RS232 Pinout (dot as pin 1):
2) SoC RXD
3) GND
10) SoC TXD

Serial connection parameters: 115200 8N1.

Installation

OEM upgrade method:

Log in to OEM management web interface
Navigate to Maintenance > Firmware > Management
If "Active Image" has the first option selected, OpenWrt will need to be
flashed to the "Active" partition. If the second option is selected,
OpenWrt will need to be flashed to the "Backup" partition.
Navigate to Maintenance > Firmware > Upload
Upload the openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-initramfs-kernel.bin
file by your preferred method to the previously determined partition.
When prompted, select to boot from the newly flashed image, and reboot
the switch.
Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it:

sysupgrade /tmp/openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin

U-Boot TFTP method:

Configure your client with a static 192.168.1.x IP (e.g. 192.168.1.10).
Set up a TFTP server on your client and make it serve the initramfs
image.
Connect serial, power up the switch, interrupt U-boot by hitting the
space bar, and enable the network:

rtk network on

Since the GS1900-24 v1 is a dual-partition device, you want to keep the
OEM firmware on the backup partition for the time being. OpenWrt can
only be installed in the first partition anyway (hardcoded in the
DTS). To ensure we are set to boot from the first partition, issue the
following commands:

setsys bootpartition 0
savesys

Download the image onto the device and boot from it:

tftpboot 0x81f00000 192.168.1.10:openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-initramfs-kernel.bin
bootm
Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it:

sysupgrade /tmp/openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin

Signed-off-by: Martin Kennedy hurricos@gmail.com

Hurricos · 2022-03-05T20:51:26Z

Pinging @svanheule: Do you think you could take a look at this device port?

Hurricos · 2022-03-05T20:59:14Z

Here is a gist of dmesg, for those who are curious:

svanheule

Since GitHub doesn't allow me to comment on the commit message (why!?), I've included a verbatim quote with my comments:

The ZyXEL GS1900-24 v1 is a 24 port switch with two SFP ports, similar to
the other GS1900 switches.

Specifications
--------------
* Device:    ZyXEL GS1900-24 v1
* SoC:       Realtek RTL8382M 500 MHz MIPS 4KEc
* Flash:     16 MiB
* RAM:       Winbond W9751G8KB-25 64 MiB DDR2 SDRAM
* Ethernet:  24x 10/100/1000 Mbps, 2x SFP 100/1000 Mbps
* LEDs:
  * 1 PWR LED (green, not configurable)
  * 1 SYS LED (green, configurable)
  * 24 ethernet port link/activity LEDs (green, SoC controlled)
  * 2 SFP status/activity LEDs (green, SoC controlled)

Maybe I've lost track of progress, but do these LEDs function when cold booting OpenWrt?

* Buttons:
  * 1 "RESET" button on front panel (soft reset)
  * 1 button ('SW1') behind right hex grate (hardwired power-off)
* Power:     120-240V AC C13
* UART:      Internal populated 10-pin header ('J5') providing RS232;
             connected to SoC UART through a SIPEX 3232EC for voltage
             level shifting.

* 'J5' RS232 Pinout (dot as pin 1):
  2) SoC RXD
  3) GND
  10) SoC TXD

Serial connection parameters: 115200 8N1.

Installation
------------

OEM upgrade method:

* Log in to OEM management web interface

* Navigate to Maintenance > Firmware > Management

* If "Active Image" has the first option selected, OpenWrt will need to be
  flashed to the "Active" partition. If the second option is selected,
  OpenWrt will need to be flashed to the "Backup" partition.

* Navigate to Maintenance > Firmware > Upload

* Upload the openwrt-realtek-generic-zyxel_gs1900-24-v1-initramfs-kernel.bin
  file by your preferred method to the previously determined partition.
  When prompted, select to boot from the newly flashed image, and reboot
  the switch.

The image name should now be openwrt-realtek-rtl838x-.... Same for the occurrences below.


* Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it:

  > sysupgrade /tmp/openwrt-realtek-generic-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin

U-Boot TFTP method:

* Configure your client with a static 192.168.1.x IP (e.g. 192.168.1.10).

* Set up a TFTP server on your client and make it serve the initramfs
  image.

* Connect serial, power up the switch, interrupt U-boot by hitting the
  space bar, and enable the network:

  > rtk network on

* Since the GS1900-24 v1 is a dual-partition device, you want to keep the
  OEM firmware on the backup partition for the time being. OpenWrt can
  only boot from the first partition anyway (hardcoded in the DTS). To
  make sure we are manipulating the first partition, issue the following
  commands:

  > setsys bootpartition 0
  > savesys

Like with the OEM method, this selects the first partition as the active one. However, you're not manipulating any (other) flash contents from the bootloader. Could you reword this?

* Download the image onto the device and boot from it:

  > tftpboot 0x81f00000 192.168.1.10:openwrt-realtek-generic-zyxel_gs1900-24-v1-initramfs-kernel.bin
  > bootm

* Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it:

  > sysupgrade /tmp/openwrt-realtek-generic-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin

svanheule · 2022-03-06T09:45:43Z

target/linux/realtek/dts-5.10/rtl8382_zyxel_gs1900-24-v1.dts

+
+/ {
+	compatible = "zyxel,gs1900-24-v1", "realtek,rtl838x-soc";
+	model = "ZyXEL GS1900-24 v1 Switch";


Some other devices appear to have "Switch" too (in particular ZyXEL devices), but in general "router" or "access point" is added either. Just [brand] [model] [revision] is sufficient.

Maybe I've lost track of progress, but do these LEDs function when cold booting OpenWrt?

Yes! When I boot the switch and wait for it to finish, then connect to each ethernet port, each LED works.

I will add that I don't have a plain SFP module to test whether the SFP port LEDs work.

The image name should now be openwrt-realtek-rtl838x-.... Same for the occurrences below.

You are correct. Corrected in force-push commit c672429.

Like with the OEM method, this selects the first partition as the active one. However, you're not manipulating any (other) flash contents from the bootloader. Could you reword this?

I have reworded this as of force-push commit c672429. Note that I pulled this comment almost directly from the GS1900-24HPv2 port.

Some other devices appear to have "Switch" too (in particular ZyXEL devices), but in general "router" or "access point" is added either. Just [brand] [model] [revision] is sufficient.

Also fixed in force-pushed commit c672429.

svanheule · 2022-03-06T10:08:10Z

target/linux/realtek/dts-5.10/rtl8382_zyxel_gs1900-24-v1.dts

+		SWITCH_PORT(22, 23, qsgmii)
+		SWITCH_PORT(23, 24, qsgmii)
+
+


You should also drop this extra empty line.

Fixed in force-push commit c672429.

The ZyXEL GS1900-24 v1 is a 24 port switch with two SFP ports, similar to the other GS1900 switches. Specifications -------------- * Device: ZyXEL GS1900-24 v1 * SoC: Realtek RTL8382M 500 MHz MIPS 4KEc * Flash: 16 MiB * RAM: Winbond W9751G8KB-25 64 MiB DDR2 SDRAM * Ethernet: 24x 10/100/1000 Mbps, 2x SFP 100/1000 Mbps * LEDs: * 1 PWR LED (green, not configurable) * 1 SYS LED (green, configurable) * 24 ethernet port link/activity LEDs (green, SoC controlled) * 2 SFP status/activity LEDs (green, SoC controlled) * Buttons: * 1 "RESET" button on front panel (soft reset) * 1 button ('SW1') behind right hex grate (hardwired power-off) * Power: 120-240V AC C13 * UART: Internal populated 10-pin header ('J5') providing RS232; connected to SoC UART through a SIPEX 3232EC for voltage level shifting. * 'J5' RS232 Pinout (dot as pin 1): 2) SoC RXD 3) GND 10) SoC TXD Serial connection parameters: 115200 8N1. Installation ------------ OEM upgrade method: * Log in to OEM management web interface * Navigate to Maintenance > Firmware > Management * If "Active Image" has the first option selected, OpenWrt will need to be flashed to the "Active" partition. If the second option is selected, OpenWrt will need to be flashed to the "Backup" partition. * Navigate to Maintenance > Firmware > Upload * Upload the openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-initramfs-kernel.bin file by your preferred method to the previously determined partition. When prompted, select to boot from the newly flashed image, and reboot the switch. * Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it: > sysupgrade /tmp/openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin U-Boot TFTP method: * Configure your client with a static 192.168.1.x IP (e.g. 192.168.1.10). * Set up a TFTP server on your client and make it serve the initramfs image. * Connect serial, power up the switch, interrupt U-boot by hitting the space bar, and enable the network: > rtk network on > Since the GS1900-24 v1 is a dual-partition device, you want to keep the OEM firmware on the backup partition for the time being. OpenWrt can only be installed in the first partition anyway (hardcoded in the DTS). To ensure we are set to boot from the first partition, issue the following commands: > setsys bootpartition 0 > savesys * Download the image onto the device and boot from it: > tftpboot 0x81f00000 192.168.1.10:openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-initramfs-kernel.bin > bootm * Once OpenWrt has booted, scp the sysupgrade image to /tmp and flash it: > sysupgrade /tmp/openwrt-realtek-rtl838x-zyxel_gs1900-24-v1-squashfs-sysupgrade.bin Signed-off-by: Martin Kennedy <hurricos@gmail.com>

svanheule

Starting to look good to me. It might be good to have an RTL8382 DTSI at some point, so the ports don't have to be redefined every single time.

svanheule · 2022-03-06T20:38:31Z

target/linux/realtek/dts-5.10/rtl8382_zyxel_gs1900-24-v1.dts

+#include "rtl8380_zyxel_gs1900.dtsi"
+
+/ {
+	compatible = "zyxel,gs1900-24-v1", "realtek,rtl838x-soc";


Second part should be "realtek,rtl8382-soc"

Starting to look good to me. It might be good to have an RTL8382 DTSI at some point, so the ports don't have to be redefined every single time.

I may do this, actually. I suppose it would need to be part of a different PR?

I pulled the device tree almost entirely from the ZyXEL GS1900-24HP v2 and it worked immediately; I'm also preparing the ZyxEL GS1900-24HP v1 port. The device trees are almost all exactly identical bar the obvious (deleting the poe node for this board, changing the memory, etc.).

... here's the tree for the GS1900-24HP v1, in case you're curious: https://github.com/hurricos/openwrt/tree/add_gs1900-24hp-v1

I may do this, actually. I suppose it would need to be part of a different PR?

That would probably be the best option, since this kind of refactoring is often a matter of personal taste and can take some time. So let's do this one and the GS1900-24HPv1 first, and then look at how we can tidy things up.

hauke · 2022-03-13T19:58:29Z

Thank you for your patch, I applied it to master in d1a8690.

hauke added new device pull request with new device target/realtek pull request/issue for realtek target labels Mar 5, 2022

svanheule requested changes Mar 6, 2022

View reviewed changes

svanheule reviewed Mar 6, 2022

View reviewed changes

Hurricos force-pushed the add_gs1900-24 branch from 3224f00 to c672429 Compare March 6, 2022 14:12

svanheule requested changes Mar 6, 2022

View reviewed changes

hauke closed this Mar 13, 2022

Hurricos mentioned this pull request Apr 2, 2022

realtek: add ZyXEL GS1900-24HP v1 support #9629

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

realtek: add ZyXEL GS1900-24 v1 support #9400

realtek: add ZyXEL GS1900-24 v1 support #9400

Hurricos commented Mar 5, 2022 •

edited

Hurricos commented Mar 5, 2022

Hurricos commented Mar 5, 2022

svanheule left a comment

svanheule Mar 6, 2022

Hurricos Mar 6, 2022

Hurricos Mar 6, 2022

svanheule Mar 6, 2022

Hurricos Mar 6, 2022 •

edited

svanheule left a comment

svanheule Mar 6, 2022

Hurricos Mar 7, 2022

Hurricos Mar 7, 2022

svanheule Mar 7, 2022

hauke commented Mar 13, 2022

realtek: add ZyXEL GS1900-24 v1 support #9400

realtek: add ZyXEL GS1900-24 v1 support #9400

Conversation

Hurricos commented Mar 5, 2022 • edited

Specifications

Installation

Hurricos commented Mar 5, 2022

Hurricos commented Mar 5, 2022

svanheule left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hurricos Mar 6, 2022 • edited

Choose a reason for hiding this comment

svanheule left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hauke commented Mar 13, 2022

Hurricos commented Mar 5, 2022 •

edited

Hurricos Mar 6, 2022 •

edited