From 6831a130d8a277c8d0dc8e611305f56713a67847 Mon Sep 17 00:00:00 2001 From: Simone <26844016+simonebortolin@users.noreply.github.com> Date: Thu, 7 Sep 2023 18:35:09 +0200 Subject: Update router section (SFP Cage) with new model (#270) * Update section of router and sfp cage * add xor macchiatobin --------- Co-authored-by: Simone Bortolin --- _sfp_cage/banana-pi.md | 22 +++++++++++++++++++ _sfp_cage/macchiatobin.md | 27 ++++++++++++++---------- _sfp_cage/mikrotik-ccr-2004.md | 7 ------ _sfp_cage/mikrotik-crs-305.md | 7 ------ _sfp_cage/turris.md | 38 +++++++++++++++++++++++++++++++++ _sfp_cage/ubiquiti-switch.md | 8 ------- _sfp_cage/zte.md | 24 +++++++++++++++++++++ _sfp_cage/zyxel.md | 48 +++++++++++++++++++++--------------------- 8 files changed, 124 insertions(+), 57 deletions(-) create mode 100644 _sfp_cage/banana-pi.md delete mode 100644 _sfp_cage/mikrotik-ccr-2004.md delete mode 100644 _sfp_cage/mikrotik-crs-305.md create mode 100644 _sfp_cage/turris.md delete mode 100644 _sfp_cage/ubiquiti-switch.md create mode 100644 _sfp_cage/zte.md diff --git a/_sfp_cage/banana-pi.md b/_sfp_cage/banana-pi.md new file mode 100644 index 0000000..e3c4655 --- /dev/null +++ b/_sfp_cage/banana-pi.md @@ -0,0 +1,22 @@ +--- +title: Banana Pi +has_children: false +layout: default +--- + +# Hardware Specifications + +| | BPI-R3 | BPI-R4 | BPI-R4 var | +| -------- | -------------------- | -------------------- | -------------------- | +| Vendor | Banana Pi | Banana Pi | | +| Model | BPI-R3 | BPI-R4 | | +| SoC | MT7986 (filogic 830) | MT7988 (filogic 880) | MT7988 (filogic 880) | +| SFP | 2 SFP 2.5 GbE | 2 SFP 10 GbE | 1 SFP 10 | +| Ethernet | 5 GbE | 4 GbE | 4 GbE + 1 2.5 GbE | +| XGMII | No | ✅ | ✅ | +| HSGMII | ✅ | N.D. | N.D. | +| SGMII | ✅ | ✅ | ✅ | +| Type | Router | Router | Router | + + + diff --git a/_sfp_cage/macchiatobin.md b/_sfp_cage/macchiatobin.md index 544c156..0f7a4f5 100644 --- a/_sfp_cage/macchiatobin.md +++ b/_sfp_cage/macchiatobin.md @@ -7,17 +7,22 @@ layout: default # Hardware Specifications -| | | -| -------- | ---------------------------------------------- | -| Vendor | MACCHIATObin | -| Model | Single Slot, Dual Shot | -| SFP | 2 SFP+, 1 SFP 2.5 | -| Ethernet | 2 10GbE Multigig, 1 2.5GbE (only on Dual Shot) | -| XGMII | ✅ | -| HSGMII | ✅ | -| SGMII | ✅ | -| Type | Router | +| | | +| -------- | ----------------------------------------------------- | +| Vendor | MACCHIATObin | +| Model | Single Slot, Dual Shot | +| SoC | Marvell ARMADA 8040 | +| SFP | 2 SFP+, 1 SFP 2.5 [^xor] | +| Ethernet | 2 10GbE Multigig, 1 2.5GbE (only on Dual Shot [^xor]) | +| XGMII | ✅ | +| HSGMII | ✅ | +| SGMII | ✅ | +| Type | Router | - [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate) -- [MACCHIATObin](http://macchiatobin.net/) \ No newline at end of file +- [MACCHIATObin](http://macchiatobin.net/) + +
+ +[^xor]: In the Dual Shot model the RJ45 and the SFP are in XOR, i.e. either one or the other. \ No newline at end of file diff --git a/_sfp_cage/mikrotik-ccr-2004.md b/_sfp_cage/mikrotik-ccr-2004.md deleted file mode 100644 index 242e51a..0000000 --- a/_sfp_cage/mikrotik-ccr-2004.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: MikroTik Router CCR2004-1G-12S+2XS -has_children: false -layout: default -redirect_to: /mikrotik -nav_exclude: true ---- \ No newline at end of file diff --git a/_sfp_cage/mikrotik-crs-305.md b/_sfp_cage/mikrotik-crs-305.md deleted file mode 100644 index cabca45..0000000 --- a/_sfp_cage/mikrotik-crs-305.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: MikroTik CRS305-1G-4S+IN -has_children: false -layout: default -redirect_to: /mikrotik -nav_exclude: true ---- \ No newline at end of file diff --git a/_sfp_cage/turris.md b/_sfp_cage/turris.md new file mode 100644 index 0000000..273e1e1 --- /dev/null +++ b/_sfp_cage/turris.md @@ -0,0 +1,38 @@ +--- +title: Turris Router +has_children: false +layout: default +--- + +# Hardware Specifications + +| | Omnia | Mox | +| -------- | ------------- | ----------------------------------- | +| Vendor | Turris | Turris | +| Model | Omnia | Mox | +| SFP | 1 SFP 2.5 GbE | 1 SFP 2.5 GbE (need Mox D) | +| Ethernet | 5 GbE | 1 + (4 × #Mox B) + (8 × #Mox E) GbE | +| XGMII | No | No | +| HSGMII | ✅ | ✅ | +| SGMII | ✅ | ✅ | +| Type | Router | Router | + + +We know form the (Turris Forum)[https://forum.turris.cz/t/ma5671a-sfp-issues-on-turris-os-5-0-3/13443] that work: +- Huawei MA5671A (Original Firmware) +- Nokia Alcatel G-010S-A (2.5 Gbps) +- ODI ZTE DFP-34G-2C2 (1 Gbps) +- ODI Realtek DFP-34G-2C2 +- ODI Realtek DFP-34X-2C2 +- Technicolor AFM0002 (1 Gbps) +- HALNy HL-GSFP[^2min] +- Zisa OP151S[^2min] +- Zyxel PMG3000-D20B[^2min] + +In ONT that expose the serial port on SFP it must be activated, otherwise the Turris sees a TX Fault. + + +
+ +[^2min]: Turris doesnt recognize it and doesn't change to SFP interface cold boot issue you need to wait 2 min and the reboot Turris. + diff --git a/_sfp_cage/ubiquiti-switch.md b/_sfp_cage/ubiquiti-switch.md deleted file mode 100644 index 981988e..0000000 --- a/_sfp_cage/ubiquiti-switch.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Ubiquiti UniFi Switch -has_children: false -alias: EdgeSwitch ES-16-XG, UniFi US-16-XG, UniFi US-XG-6POE -layout: default -redirect_to: /ubiquiti -nav_exclude: true ---- \ No newline at end of file diff --git a/_sfp_cage/zte.md b/_sfp_cage/zte.md new file mode 100644 index 0000000..1aa90d2 --- /dev/null +++ b/_sfp_cage/zte.md @@ -0,0 +1,24 @@ +--- +title: Banana Pi +has_children: false +layout: default +--- + +# Hardware Specifications + +| | H6645P | +| -------- | -------------------------------------------------- | +| Vendor | ZTE | +| Model | H6645P | +| SoC | ZXIC ZX279132C | +| SFP | 1 2.5 GbE [^xor] | +| Ethernet | 3 1GbE, 1 2.5GbE LAN port, 1 2.5GbE WAN port[^xor] | +| XGMII | No | +| HSGMII | ✅ | +| SGMII | ✅ | +| Type | Router | + + +
+ +[^xor]: the WAN Eth and WAN SFP ports are in XOR, i.e. either one or the other. diff --git a/_sfp_cage/zyxel.md b/_sfp_cage/zyxel.md index c6910a0..4f1d611 100644 --- a/_sfp_cage/zyxel.md +++ b/_sfp_cage/zyxel.md @@ -7,33 +7,33 @@ layout: default # Hardware Specifications -| | EX5601-T0 | -| -------- | ---------------------------------------------------| -| Vendor | Zyxel | -| Model | EX5601-T0 | -| Soc | MT7986a (filogic 830) | -| Ram | 1G | -| SFP | 1 HSGMII capable sfp port[^xor] | -| Ethernet | 3 1GbE, 1 2.5GbE LAN port, 1 2.5GbE WAN port[^xor] | -| XGMII | No | -| HSGMII | ✅ | -| SGMII | ✅ | -| Type | Router | +| | EX5601-T0 | +| -------- | ---------------------------------------- | +| Vendor | Zyxel | +| Model | EX5601-T0 | +| SoC | MT7986a (filogic 830) | +| Ram | 1G | +| SFP | 1 2.5 GbE [^xor] | +| Ethernet | 3 1GbE, 1 2.5GbE LAN, 1 2.5GbE WAN[^xor] | +| XGMII | No | +| HSGMII | ✅ | +| SGMII | ✅ | +| Type | Router | # Zyxel EX5601-T0 ## List of partitions -| dev | size | erasesize | name | -| ---- | -------- | --------- | ------------- | -| mtd0 | 20000000 | 00040000 | "spi0.1" | -| mtd1 | 00100000 | 00040000 | "BL2" | -| mtd2 | 00080000 | 00040000 | "u-boot-env" | -| mtd3 | 00200000 | 00040000 | "Factory" | -| mtd4 | 001c0000 | 00040000 | "FIP" | -| mtd5 | 00040000 | 00040000 | "zloader" | -| mtd6 | 04000000 | 00040000 | "ubi" | -| mtd7 | 04000000 | 00040000 | "ubi2" | -| mtd8 | 15a80000 | 00040000 | "zyubi" | +| dev | size | erasesize | name | +| ---- | -------- | --------- | ------------ | +| mtd0 | 20000000 | 00040000 | "spi0.1" | +| mtd1 | 00100000 | 00040000 | "BL2" | +| mtd2 | 00080000 | 00040000 | "u-boot-env" | +| mtd3 | 00200000 | 00040000 | "Factory" | +| mtd4 | 001c0000 | 00040000 | "FIP" | +| mtd5 | 00040000 | 00040000 | "zloader" | +| mtd6 | 04000000 | 00040000 | "ubi" | +| mtd7 | 04000000 | 00040000 | "ubi2" | +| mtd8 | 15a80000 | 00040000 | "zyubi" | This router supports dual boot, and has two partitions for the firmware, `ubi` and `ubi2` @@ -235,6 +235,6 @@ Here is a flashable bin file based on OpenWrt 5.15.114 with the mod to swap SFP/ - [Rollback SFP Zyxel con il W3 HUB per risolvere il problema dell'upload cappato](https://forum.fibra.click/d/36541-rollback-sfp-zyxel-con-il-w3-hub-per-risolvere-il-problema-dellupload-cappato) ---- +
[^xor]: the WAN Eth and WAN SFP ports are in XOR, i.e. either one or the other. -- cgit v1.2.3