| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20211216201342.25587-14-luizluca@gmail.com>
Date: Thu, 16 Dec 2021 17:13:42 -0300
From: luizluca@...il.com
To: netdev@...r.kernel.org
Cc: linus.walleij@...aro.org, andrew@...n.ch, vivien.didelot@...il.com,
f.fainelli@...il.com, olteanv@...il.com, alsi@...g-olufsen.dk,
arinc.unal@...nc9.com,
Luiz Angelo Daros de Luca <luizluca@...il.com>
Subject: [PATCH net-next 13/13] net: dsa: realtek: rtl8367c: add RTL8367S support
From: Luiz Angelo Daros de Luca <luizluca@...il.com>
Realtek's RTL8367S, a 5+2 port 10/100/1000M Ethernet switch.
It shares the same driver family (RTL8367C) with other models
as the RTL8365MB-VC. Its compatible string is "realtek,rtl8367s".
It was tested only with MDIO interface (realtek-mdio), although it might
work out-of-the-box with SMI interface (using realtek-smi).
This patch was based on an unpublished patch from Alvin Šipraga
<alsi@...g-olufsen.dk>.
Tested-by: Arınç ÜNAL <arinc.unal@...nc9.com>
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@...il.com>
---
.../bindings/net/dsa/realtek-mdio.txt | 1 +
.../bindings/net/dsa/realtek-smi.txt | 1 +
drivers/net/dsa/realtek/Kconfig | 4 +--
drivers/net/dsa/realtek/realtek-mdio.c | 1 +
drivers/net/dsa/realtek/realtek-smi.c | 4 +++
drivers/net/dsa/realtek/rtl8367c.c | 33 +++++++++++++++----
6 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/dsa/realtek-mdio.txt b/Documentation/devicetree/bindings/net/dsa/realtek-mdio.txt
index 01b0463b808f..48aa263792ac 100644
--- a/Documentation/devicetree/bindings/net/dsa/realtek-mdio.txt
+++ b/Documentation/devicetree/bindings/net/dsa/realtek-mdio.txt
@@ -11,6 +11,7 @@ Required properties:
"realtek,rtl8365mb" (4+1 ports)
"realtek,rtl8366rb" (4+1 ports)
"realtek,rtl8366s" (4+1 ports)
+ "realtek,rtl8367s" (5+2 ports)
Required properties:
- reg: MDIO PHY ID to access the switch
diff --git a/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt b/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
index acdb026e5307..b295b8c0d5fc 100644
--- a/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
+++ b/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
@@ -13,6 +13,7 @@ Required properties:
"realtek,rtl8365mb" (4+1 ports)
"realtek,rtl8366rb" (4+1 ports)
"realtek,rtl8366s" (4+1 ports)
+ "realtek,rtl8367s" (5+2 ports)
Required properties:
- mdc-gpios: GPIO line for the MDC clock line.
diff --git a/drivers/net/dsa/realtek/Kconfig b/drivers/net/dsa/realtek/Kconfig
index 48194d0dd51f..25de1107732d 100644
--- a/drivers/net/dsa/realtek/Kconfig
+++ b/drivers/net/dsa/realtek/Kconfig
@@ -30,9 +30,9 @@ config NET_DSA_REALTEK_RTL8367C
depends on NET_DSA_REALTEK_SMI || NET_DSA_REALTEK_MDIO
select NET_DSA_TAG_RTL8_4
help
- Select to enable support for Realtek RTL8365MB-VC. This subdriver
+ Select to enable support for Realtek RTL8365MB-VC and RTL8367S. This subdriver
might also support RTL8363NB, RTL8363NB-VB, RTL8363SC, RTL8363SC-VB, RTL8364NB,
- RTL8364NB-VB, RTL8366SC, RTL8367RB-VB, RTL8367S, RTL8367SB, RTL8370MB, RTL8310SR
+ RTL8364NB-VB, RTL8366SC, RTL8367RB-VB, RTL8367SB, RTL8370MB, RTL8310SR
in the future.
config NET_DSA_REALTEK_RTL8366RB
diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c
index b7febd63e04f..1f80b6bdbe5b 100644
--- a/drivers/net/dsa/realtek/realtek-mdio.c
+++ b/drivers/net/dsa/realtek/realtek-mdio.c
@@ -265,6 +265,7 @@ static const struct of_device_id realtek_mdio_of_match[] = {
{ .compatible = "realtek,rtl8366s", .data = NULL, },
#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8367C)
{ .compatible = "realtek,rtl8365mb", .data = &rtl8367c_variant, },
+ { .compatible = "realtek,rtl8367s", .data = &rtl8367c_variant, },
#endif
{ /* sentinel */ },
};
diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c
index 258f90956cec..ecb68a216595 100644
--- a/drivers/net/dsa/realtek/realtek-smi.c
+++ b/drivers/net/dsa/realtek/realtek-smi.c
@@ -511,6 +511,10 @@ static const struct of_device_id realtek_smi_of_match[] = {
.compatible = "realtek,rtl8365mb",
.data = &rtl8367c_variant,
},
+ {
+ .compatible = "realtek,rtl8367s",
+ .data = &rtl8367c_variant,
+ },
#endif
{ /* sentinel */ },
};
diff --git a/drivers/net/dsa/realtek/rtl8367c.c b/drivers/net/dsa/realtek/rtl8367c.c
index a478ddc33a9e..c192ede6ca88 100644
--- a/drivers/net/dsa/realtek/rtl8367c.c
+++ b/drivers/net/dsa/realtek/rtl8367c.c
@@ -90,15 +90,23 @@
#include "realtek.h"
/* Chip-specific data and limits */
-#define RTL8367C_CHIP_ID_8365MB_VC 0x6367
+#define RTL8367C_CHIP_ID_8367C 0x6367
+/* 0x0276 and 0x0597 as well */
-#define RTL8367C_LEARN_LIMIT_MAX 2112
+#define RTL8367C_CHIP_ID_8365MB_VC RTL8367C_CHIP_ID_8367C
+#define RTL8367C_CHIP_VER_8365MB_VC 0x0040
+
+#define RTL8367C_CHIP_ID_8367S RTL8367C_CHIP_ID_8367C
+#define RTL8367C_CHIP_VER_8367S 0x00A0
+
+#define RTL8367C_LEARN_LIMIT_MAX 2112
/* Family-specific data and limits */
#define RTL8367C_PHYADDRMAX 7
#define RTL8367C_NUM_PHYREGS 32
#define RTL8367C_PHYREGMAX (RTL8367C_NUM_PHYREGS - 1)
-#define RTL8367C_MAX_NUM_PORTS 7
+// RTL8370MB and RTL8310SR, possibly suportable by this driver, have 10 ports
+#define RTL8367C_MAX_NUM_PORTS 10
/* Chip identification registers */
#define RTL8367C_CHIP_ID_REG 0x1300
@@ -1952,10 +1960,21 @@ static int rtl8367c_detect(struct realtek_priv *priv)
}
switch (chip_id) {
- case RTL8367C_CHIP_ID_8365MB_VC:
- dev_info(priv->dev,
- "found an RTL8365MB-VC switch (ver=0x%04x)\n",
- chip_ver);
+ case RTL8367C_CHIP_ID_8367C:
+ if (chip_ver == RTL8367C_CHIP_VER_8365MB_VC) {
+ dev_info(priv->dev,
+ "found an RTL8365MB-VC switch (ver=0x%04x)\n",
+ chip_ver);
+ } else if (chip_ver == RTL8367C_CHIP_VER_8367S) {
+ dev_info(priv->dev,
+ "found an RTL8367S switch (ver=0x%04x)\n",
+ chip_ver);
+ } else {
+ dev_err(priv->dev, "found an RTL8367C switch with "
+ "unrecognized chip version (ver=0x%04x)\n",
+ chip_ver);
+ return -ENODEV;
+ }
priv->num_ports = RTL8367C_MAX_NUM_PORTS;
--
2.34.0
Powered by blists - more mailing lists