net: dsa: yt921x: Add DCB/priority support
David Yang
maintainerv2 cover net: dsa: yt921x: Add DCB/priority support
This series add DCB/priority support to the driver.
v1: https://lore.kernel.org/r/[email protected]
- rebase
David Yang (2):
net: dsa: tag_yt921x: fix priority support
net: dsa: yt921x: Add DCB/priority support
drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/yt921x.c | 232 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 54 +++++++-- net/dsa/tag_yt921x.c | 8 +- 4 files changed, 284 insertions(+), 12 deletions(-)
Signature · 1 line
2.51.0
David Yang
maintainerPATCH v2 1/2 net: dsa: tag_yt921x: fix priority support
The packet priority is embedded in the rx tag. It defaults to 0, but adding DCB support to the switch driver will break the tag driver by setting it to non-zero.
--- net/dsa/tag_yt921x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/dsa/tag_yt921x.c +6 -2
@@ -17,7 +17,8 @@* 2: Rx Port * 15b: Rx Port Valid * 14b-11b: Rx Port -* 10b-0b: Cmd? +* 10b-8b: Priority +* 7b-0b: Cmd * 2: Tx Port(s) * 15b: Tx Port(s) Valid * 10b-0b: Tx Port(s) Mask
@@ -33,7 +34,8 @@#define YT921X_TAG_PORT_EN BIT(15)#define YT921X_TAG_RX_PORT_M GENMASK(14, 11) -#define YT921X_TAG_RX_CMD_M GENMASK(10, 0) +#define YT921X_TAG_RX_PRIO_M GENMASK(10, 8) +#define YT921X_TAG_RX_CMD_M GENMASK(7, 0)#define YT921X_TAG_RX_CMD (x) FIELD_PREP(YT921X_TAG_RX_CMD_M, (x))#define YT921X_TAG_RX_CMD_FORWARDED 0x80#define YT921X_TAG_RX_CMD_UNK_UCAST 0xb2
@@ -98,6 +100,8 @@ yt921x_tag_rcv(struct sk_buff *skb, struct net_device *netdev)return NULL ; } + skb->priority =FIELD_GET (YT921X_TAG_RX_PRIO_M , rx); + cmd =FIELD_GET (YT921X_TAG_RX_CMD_M , rx);switch (cmd) {case YT921X_TAG_RX_CMD_FORWARDED :
Signature · 1 line
2.51.0
David Yang
maintainerPATCH v2 2/2 net: dsa: yt921x: Add DCB/priority support
In reply to David YangSet up global DSCP/PCP priority mappings and add related DSA methods.
--- drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/yt921x.c | 232 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 54 +++++++-- 3 files changed, 278 insertions(+), 10 deletions(-)
drivers/net/dsa/Kconfig +2 -0
@@ -158,6 +158,8 @@ config NET_DSA_VITESSE_VSC73XX_PLATFORM config NET_DSA_YT921X tristate "Motorcomm YT9215 ethernet switch chip support" select NET_DSA_TAG_YT921X + select NET_IEEE8021Q_HELPERS + select DCB help This enables support for the Motorcomm YT9215 ethernet switch chip.
drivers/net/dsa/yt921x.c +232 -0
268 lines not on this page · raw message
drivers/net/dsa/yt921x.h +44 -10
94 lines not on this page · raw message
Signature · 1 line
2.51.0
Vladimir Oltean
maintainerQuoted 79 lines · David Yang
Set up global DSCP/PCP priority mappings and add related DSA methods.
Signed-off-by David Yang <[email protected]>--- drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/yt921x.c | 232 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/yt921x.h | 54 +++++++-- 3 files changed, 278 insertions(+), 10 deletions(-)drivers/net/dsa/Kconfig +2
-0@@ -158,6 +158,8 @@ config NET_DSA_VITESSE_VSC73XX_PLATFORM config NET_DSA_YT921X tristate "Motorcomm YT9215 ethernet switch chip support" select NET_DSA_TAG_YT921X + select NET_IEEE8021Q_HELPERS + select DCB help This enables support for the Motorcomm YT9215 ethernet switch chip.drivers/net/dsa/yt921x.c +40
-0@@ -18,8 +18,11 @@#include <linux/of.h> #include <linux/of_mdio.h> #include <linux/of_net.h> +#include <linux/sort.h> #include <net/dsa.h> +#include <net/dscp.h> +#include <net/ieee8021q.h> #include "yt921x.h" @@ -2391,6 +2394,140 @@ yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) port, res); } +static int +yt921x_dsa_port_get_default_prio (struct dsa_switch *ds,int port) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +u32 val; +int res; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_read (priv,YT921X_PORTn_QOS (port), &val); +mutex_unlock (&priv->reg_lock); + +if (res) +return res; + +return FIELD_GET (YT921X_PORT_QOS_PRIO_M , val); +} + +static int +yt921x_dsa_port_set_default_prio (struct dsa_switch *ds,int port,u8 prio) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +u32 mask; +u32 ctrl; +int res; + +if (prio >=YT921X_PRIO_NUM ) +return -EINVAL ; + +mutex_lock (&priv->reg_lock); + mask =YT921X_PORT_QOS_PRIO_M |YT921X_PORT_QOS_PRIO_EN ; + ctrl =YT921X_PORT_QOS_PRIO (prio) |YT921X_PORT_QOS_PRIO_EN ; + res =yt921x_reg_update_bits (priv,YT921X_PORTn_QOS (port), mask, ctrl); +mutex_unlock (&priv->reg_lock); + +return res; +} +
drivers/net/dsa/yt921x.c yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) · line 2443
Quoted 10 lines
drivers/net/dsa/yt921x.c +10
-0+static const u8 yt921x_apps[] = { +0 ,/* MAC SA */ +0 ,/* MAC DA */ +0 ,/* VID */ +0 ,/* ACL */ +IEEE_8021QAZ_APP_SEL_DSCP ,/* DSCP */ +DCB_APP_SEL_PCP ,/* CVLAN PCP */ +0 ,/* SVLAN PCP */ +0 ,/* Port */ +};
Could you please make an
enum yt921x_app_selector {
YT921X_APP_SEL_MAC_SA,
YT921X_APP_SEL_MAC_DA,
YT921X_APP_SEL_VID,
YT921X_APP_SEL_ACL,
YT921X_APP_SEL_DSCP,
YT921X_APP_SEL_CVLAN_PCP,
YT921X_APP_SEL_SVLAN_PCP,
YT921X_APP_SEL_PORT,
YT921X_APP_SEL_NUM
};so that you can more clearly express:
static const u8 yt921x_apps[YT921X_APP_SEL_NUM] = {
[YT921X_APP_SEL_DSCP] = IEEE_8021QAZ_APP_SEL_DSCP,
[YT921X_APP_SEL_CVLAN_PCP] = DCB_APP_SEL_PCP,
};and reformulate prios[7] from yt921x_dsa_port_set_apptrust() as prios[YT921X_APP_SEL_PORT]?
Quoted 47 lines
drivers/net/dsa/yt921x.c +47
-0+ +static int appprios_cmp (const void *a,const void *b) +{ +return ((const u8 *)b)[1 ] - ((const u8 *)a)[1 ]; +} + +static int +yt921x_dsa_port_get_apptrust (struct dsa_switch *ds,int port,u8 *sel, +int *nselp) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +u8 appprios[ARRAY_SIZE (yt921x_apps)][2 ]; +int nsel; +u32 val; +int res; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_read (priv,YT921X_PORTn_PRIO_ORD (port), &val); +mutex_unlock (&priv->reg_lock); + +if (res) +return res; + +for (int src =0 ; src <ARRAY_SIZE (yt921x_apps); src++) { + appprios[src][0 ] = yt921x_apps[src]; + appprios[src][1 ] = (val >> (3 * src)) &7 ; + } +sort (appprios,ARRAY_SIZE (appprios),sizeof (appprios[0 ]), appprios_cmp, +NULL ); + + nsel =0 ; +for (int i =0 ; i <ARRAY_SIZE (appprios) && appprios[i][1 ]; i++) +if (appprios[i][0 ]) { + sel[nsel] = appprios[i][0 ]; + nsel++; + } + *nselp = nsel; + +return 0 ; +} + +static int +yt921x_dsa_port_set_apptrust (struct dsa_switch *ds,int port,const u8 *sel, +int nsel) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +u8 prios[ARRAY_SIZE (yt921x_apps)] = {};
drivers/net/dsa/yt921x.c yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) · line 2500
Quoted 10 lines
drivers/net/dsa/yt921x.c +10
-0+u32 ctrl; +u8 prio; +int res; + +if (nsel >ARRAY_SIZE (yt921x_apps)) +return -EINVAL ; + +/* always take the port prio (port_set_default_prio) into +* consideration, by giving it the lowest priority +*/
Are you sure the "port" selector represents the Ethernet port default priority? It seems odd for it to have any other trust order in hardware than last. What would be the use case for that? Sure it's not an L4 port, which could be mapped over IEEE_8021QAZ_APP_SEL_ANY?
drivers/net/dsa/yt921x.c yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) · line 2501
Quoted 1 line
drivers/net/dsa/yt921x.c +1
-0+ prios[7 ] =1 ;
I'm not following, why is "1" the lowest priority here?
Quoted 6 lines
drivers/net/dsa/yt921x.c +6
-0+ prio =7 ; +for (int i =0 ; i < nsel; i++) { +bool found = false; + +for (int src =0 ; src <ARRAY_SIZE (yt921x_apps); src++) { +if (yt921x_apps[src] != sel[i])
drivers/net/dsa/yt921x.c yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state) · line 2517
Quoted 10 lines
drivers/net/dsa/yt921x.c +10
-0+continue ; + + prios[src] = prio; + prio--; + found = true; +break ; + } + +if (!found) +return -EOPNOTSUPP ;
Some feedback to the user regarding the app selector that is invalid, similar to ksz_apptrust_error(), would be nice / friendlier.
Quoted 41 lines
drivers/net/dsa/yt921x.c +34
-0+ } + + ctrl =0 ; +for (int src =0 ; src <ARRAY_SIZE (yt921x_apps); src++) + ctrl |=YT921X_PORT_PRIO_ORD_SRCm (src, prios[src]); + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_write (priv,YT921X_PORTn_PRIO_ORD (port), ctrl); +mutex_unlock (&priv->reg_lock); + +return res; +} +static int yt921x_port_down (struct yt921x_priv *priv,int port) {u32 mask;@@ -2759,6 +2896,58 @@ static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port)return res; } +#define ipm_drop (prio) \ + YT921X_IPM_DROP_PRIO((prio) <= IEEE8021Q_TT_EE ? 2 : \ + (prio) <= IEEE8021Q_TT_VO ? 1 : 0) +#define ipm_ctrl (prio) (YT921X_IPM_PRIO(prio) | ipm_drop(prio)) + +static int +yt921x_dsa_port_get_dscp_prio (struct dsa_switch *ds,int port,u8 dscp) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +u32 val; +int res; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_read (priv,YT921X_IPM_DSCPn (dscp), &val); +mutex_unlock (&priv->reg_lock); + +if (res) +return res; + +return FIELD_GET (YT921X_IPM_PRIO_M , val); +}
drivers/net/dsa/yt921x.c static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port) · line 2929
Quoted 10 lines
drivers/net/dsa/yt921x.c +10
-0+ +static int +yt921x_dsa_port_del_dscp_prio (struct dsa_switch *ds,int port,u8 dscp,u8 prio) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +int res; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_write (priv,YT921X_IPM_DSCPn (dscp), +ipm_ctrl (IEEE8021Q_TT_BK ));
Question regarding semantics, also for Oleksij: deleting the DSCP app table entry should cause that DSCP value to be mapped to bulk, as in your interpretation (or best effort for KSZ), or according to the next selector in line, as per trust order (for example port default priority, which may not be bulk)?
Quoted 52 lines
drivers/net/dsa/yt921x.c +45
-0+mutex_unlock (&priv->reg_lock); + +return res; +} + +static int +yt921x_dsa_port_add_dscp_prio (struct dsa_switch *ds,int port,u8 dscp,u8 prio) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +int res; + +if (prio >=YT921X_PRIO_NUM ) +return -EINVAL ; + +mutex_lock (&priv->reg_lock); + res =yt921x_reg_write (priv,YT921X_IPM_DSCPn (dscp),ipm_ctrl (prio)); +mutex_unlock (&priv->reg_lock); + +return res; +} +static int yt921x_edata_wait (struct yt921x_priv *priv,u32 *valp) {u32 val =YT921X_EDATA_DATA_IDLE ;@@ -2978,6 +3167,40 @@ static int yt921x_chip_setup(struct yt921x_priv *priv)if (res)return res; +/* 802.1Q QoS to priority mapping table */ +for (u8 pcp =0 ; pcp <8 ; pcp++) { +u32 drop =ipm_drop (pcp); + +for (u8 dei =0 ; dei <2 ; dei++) { + ctrl =YT921X_IPM_PRIO (pcp); +if (!dei) + ctrl |= drop; +else + ctrl |=YT921X_IPM_DROP_PRIO (2 ); + +for (u8 svlan =0 ; svlan <2 ; svlan++) { +u32 reg =YT921X_IPM_PCPn (svlan, dei, pcp); + + res =yt921x_reg_write (priv, reg, ctrl); +if (res) +return res; + } + } + } + +/* DSCP to priority mapping table */ +for (u8 dscp =0 ; dscp <DSCP_MAX ; dscp++) { +int prio =ietf_dscp_to_ieee8021q_tt (dscp);
drivers/net/dsa/yt921x.c static int yt921x_chip_setup(struct yt921x_priv *priv) · line 3203
Quoted 10 lines
drivers/net/dsa/yt921x.c +10
-0+ +if (prio <0 ) +return prio; + + res =yt921x_reg_write (priv,YT921X_IPM_DSCPn (dscp), +ipm_ctrl (prio)); +if (res) +return res; + } +
nitpick: yt921x_chip_setup() is already pretty long and it is hard to follow its control flow (whether any operation needs teardown). Could you break up the QoS initialization into a separate function rather than inlining it?
Quoted 130 lines
drivers/net/dsa/yt921x.c +9
-0/* Miscellaneous */ res =yt921x_reg_set_bits (priv,YT921X_SENSOR ,YT921X_SENSOR_TEMP );if (res)@@ -3087,10 +3310,19 @@ static const struct dsa_switch_ops yt921x_dsa_switch_ops = { .port_mst_state_set = yt921x_dsa_port_mst_state_set, .vlan_msti_set = yt921x_dsa_vlan_msti_set, .port_stp_state_set = yt921x_dsa_port_stp_state_set, +/* dcb */ + .port_get_default_prio = yt921x_dsa_port_get_default_prio, + .port_set_default_prio = yt921x_dsa_port_set_default_prio, + .port_get_apptrust = yt921x_dsa_port_get_apptrust, + .port_set_apptrust = yt921x_dsa_port_set_apptrust,/* port */ .get_tag_protocol = yt921x_dsa_get_tag_protocol, .phylink_get_caps = yt921x_dsa_phylink_get_caps, .port_setup = yt921x_dsa_port_setup, +/* dscp */ + .port_get_dscp_prio = yt921x_dsa_port_get_dscp_prio, + .port_del_dscp_prio = yt921x_dsa_port_del_dscp_prio, + .port_add_dscp_prio = yt921x_dsa_port_add_dscp_prio,/* chip */ .setup = yt921x_dsa_setup, };drivers/net/dsa/yt921x.h +44
-10@@ -269,6 +269,37 @@#define YT921X_TPID_EGRn (x) (0x100300 + 4 * (x))/* [0, 3] */ #define YT921X_TPID_EGR_TPID_M GENMASK(15, 0) +#define YT921X_IPM_DSCPn (n) (0x180000 + 4 * (n))/* Internal Priority Map */ +#define YT921X_IPM_PCPn (map, dei, pcp) (0x180100 + 4 * (16 * (map) + 8 * (dei) + (pcp))) +#define YT921X_IPM_PRIO_M GENMASK(4, 2) +#define YT921X_IPM_PRIO (x) FIELD_PREP(YT921X_IPM_PRIO_M, (x)) +#define YT921X_IPM_DROP_PRIO_M GENMASK(1, 0) +#define YT921X_IPM_DROP_PRIO (x) FIELD_PREP(YT921X_IPM_DROP_PRIO_M, (x)) +#define YT921X_PORTn_QOS (port) (0x180180 + 4 * (port)) +#define YT921X_PORT_QOS_CVLAN_PRIO_MAP_SEL BIT(5) +#define YT921X_PORT_QOS_SVLAN_PRIO_MAP_SEL BIT(4) +#define YT921X_PORT_QOS_PRIO_M GENMASK(3, 1) +#define YT921X_PORT_QOS_PRIO (x) FIELD_PREP(YT921X_PORT_QOS_PRIO_M, (x)) +#define YT921X_PORT_QOS_PRIO_EN BIT(0) +#define YT921X_PORTn_PRIO_ORD (port) (0x180200 + 4 * (port)) +#define YT921X_PORT_PRIO_ORD_SRCm_M (m) GENMASK(3 * (m) + 2, 3 * (m)) +#define YT921X_PORT_PRIO_ORD_SRCm (m, x) ((x) << (3 * (m))) +#define YT921X_PORT_PRIO_ORD_PORT_M GENMASK(23, 21) +#define YT921X_PORT_PRIO_ORD_PORT (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_PORT_M, (x)) +#define YT921X_PORT_PRIO_ORD_SVLAN_M GENMASK(20, 18) +#define YT921X_PORT_PRIO_ORD_SVLAN (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_SVLAN_M, (x)) +#define YT921X_PORT_PRIO_ORD_CVLAN_M GENMASK(17, 15) +#define YT921X_PORT_PRIO_ORD_CVLAN (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_CVLAN_M, (x)) +#define YT921X_PORT_PRIO_ORD_DSCP_M GENMASK(14, 12) +#define YT921X_PORT_PRIO_ORD_DSCP (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_DSCP_M, (x)) +#define YT921X_PORT_PRIO_ORD_ACL_M GENMASK(11, 9) +#define YT921X_PORT_PRIO_ORD_ACL (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_ACL_M, (x)) +#define YT921X_PORT_PRIO_ORD_VID_M GENMASK(8, 6) +#define YT921X_PORT_PRIO_ORD_VID (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_VID_M, (x)) +#define YT921X_PORT_PRIO_ORD_MAC_DA_M GENMASK(5, 3) +#define YT921X_PORT_PRIO_ORD_MAC_DA (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_MAC_DA_M, (x)) +#define YT921X_PORT_PRIO_ORD_MAC_SA_M GENMASK(2, 0) +#define YT921X_PORT_PRIO_ORD_MAC_SA (x) FIELD_PREP(YT921X_PORT_PRIO_ORD_MAC_SA_M, (x))#define YT921X_VLAN_IGR_FILTER 0x180280#define YT921X_VLAN_IGR_FILTER_PORTn_BYPASS_IGMP (port) BIT((port) + 11)#define YT921X_VLAN_IGR_FILTER_PORTn (port) BIT(port)@@ -337,7 +368,7 @@#define YT921X_FDB_OUT0 0x1804b0#define YT921X_FDB_IO0_ADDR_HI4_M GENMASK(31, 0)#define YT921X_FDB_OUT1 0x1804b4 -#define YT921X_FDB_IO1_EGR_INT_PRI_EN BIT(31) +#define YT921X_FDB_IO1_EGR_PRIO_EN BIT(31)#define YT921X_FDB_IO1_STATUS_M GENMASK(30, 28)#define YT921X_FDB_IO1_STATUS (x) FIELD_PREP(YT921X_FDB_IO1_STATUS_M, (x))#define YT921X_FDB_IO1_STATUS_INVALID YT921X_FDB_IO1_STATUS(0)@@ -356,9 +387,9 @@#define YT921X_FDB_IO2_EGR_PORTS (x) FIELD_PREP(YT921X_FDB_IO2_EGR_PORTS_M, (x))#define YT921X_FDB_IO2_EGR_DROP BIT(17)#define YT921X_FDB_IO2_COPY_TO_CPU BIT(16) -#define YT921X_FDB_IO2_IGR_INT_PRI_EN BIT(15) -#define YT921X_FDB_IO2_INT_PRI_M GENMASK(14, 12) -#define YT921X_FDB_IO2_INT_PRI (x) FIELD_PREP(YT921X_FDB_IO2_INT_PRI_M, (x)) +#define YT921X_FDB_IO2_IGR_PRIO_EN BIT(15) +#define YT921X_FDB_IO2_PRIO_M GENMASK(14, 12) +#define YT921X_FDB_IO2_PRIO (x) FIELD_PREP(YT921X_FDB_IO2_PRIO_M, (x))#define YT921X_FDB_IO2_NEW_VID_M GENMASK(11, 0)#define YT921X_FDB_IO2_NEW_VID (x) FIELD_PREP(YT921X_FDB_IO2_NEW_VID_M, (x))#define YT921X_FILTER_UNK_UCAST 0x180508@@ -406,8 +437,9 @@#define YT921X_VLAN_CTRL_FID_M GENMASK_ULL(34, 23)#define YT921X_VLAN_CTRL_FID (x) FIELD_PREP(YT921X_VLAN_CTRL_FID_M, (x))#define YT921X_VLAN_CTRL_LEARN_DIS BIT_ULL(22) -#define YT921X_VLAN_CTRL_INT_PRI_EN BIT_ULL(21) -#define YT921X_VLAN_CTRL_INT_PRI_M GENMASK_ULL(20, 18) +#define YT921X_VLAN_CTRL_PRIO_EN BIT_ULL(21) +#define YT921X_VLAN_CTRL_PRIO_M GENMASK_ULL(20, 18) +#define YT921X_VLAN_CTRL_PRIO (x) FIELD_PREP(YT921X_VLAN_CTRL_PRIO_M, (x))#define YT921X_VLAN_CTRL_PORTS_M GENMASK_ULL(17, 7)#define YT921X_VLAN_CTRL_PORTS (x) FIELD_PREP(YT921X_VLAN_CTRL_PORTS_M, (x))#define YT921X_VLAN_CTRL_PORTn (port) BIT_ULL((port) + 7)@@ -433,14 +465,14 @@#define YT921X_LAG_HASH_SRC_PORT BIT(0)#define YT921X_PORTn_VLAN_CTRL (port) (0x230010 + 4 * (port)) -#define YT921X_PORT_VLAN_CTRL_SVLAN_PRI_EN BIT(31) -#define YT921X_PORT_VLAN_CTRL_CVLAN_PRI_EN BIT(30) +#define YT921X_PORT_VLAN_CTRL_SVLAN_PRIO_EN BIT(31) +#define YT921X_PORT_VLAN_CTRL_CVLAN_PRIO_EN BIT(30)#define YT921X_PORT_VLAN_CTRL_SVID_M GENMASK(29, 18)#define YT921X_PORT_VLAN_CTRL_SVID (x) FIELD_PREP(YT921X_PORT_VLAN_CTRL_SVID_M, (x))#define YT921X_PORT_VLAN_CTRL_CVID_M GENMASK(17, 6)#define YT921X_PORT_VLAN_CTRL_CVID (x) FIELD_PREP(YT921X_PORT_VLAN_CTRL_CVID_M, (x)) -#define YT921X_PORT_VLAN_CTRL_SVLAN_PRI_M GENMASK(5, 3) -#define YT921X_PORT_VLAN_CTRL_CVLAN_PRI_M GENMASK(2, 0) +#define YT921X_PORT_VLAN_CTRL_SVLAN_PRIO_M GENMASK(5, 3) +#define YT921X_PORT_VLAN_CTRL_CVLAN_PRIO_M GENMASK(2, 0)#define YT921X_PORTn_VLAN_CTRL1 (port) (0x230080 + 4 * (port))#define YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_EN BIT(8)#define YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_PROFILE_ID_M GENMASK(7, 4)@@ -478,6 +510,8 @@ enum yt921x_fdb_entry_status {#define YT921X_LAG_NUM 2#define YT921X_LAG_PORT_NUM 4 +#define YT921X_PRIO_NUM 8 +#define YT9215_MAJOR 0x9002#define YT9218_MAJOR 0x9001Signature · 1 line
2.51.0
Yangfl
maintainerQuoted 6 lines · Vladimir Oltean
Are you sure the "port" selector represents the Ethernet port default priority? It seems odd for it to have any other trust order in hardware than last. What would be the use case for that? Sure it's not an L4 port, which could be mapped over
IEEE_8021QAZ_APP_SEL_ANY?
No (with the "port" selector) but I'm wondering, do we have corresponding port prio methods port_add_stream_prio()/port_add_dgram_prio() or something like?
Vladimir Oltean
maintainerQuoted 11 lines · Yangfl
Quoted 6 lines · Vladimir Oltean
Are you sure the "port" selector represents the Ethernet port default priority? It seems odd for it to have any other trust order in hardware than last. What would be the use case for that? Sure it's not an L4 port, which could be mapped over
IEEE_8021QAZ_APP_SEL_ANY?No (with the "port" selector) but I'm wondering, do we have corresponding port prio methods port_add_stream_prio()/port_add_dgram_prio() or something like?
No, but it doesn't mean dsa_user_dcbnl_ieee_setapp() can't be extended with the IEEE_8021QAZ_APP_SEL_ANY selector if necessary. I wouldn't bother to do that just for testing, though, just hack something up to determine what it's about.
Quoted 7 lines · Vladimir Oltean
Quoted 7 lines
drivers/net/dsa/yt921x.c +7
-0+static int +yt921x_dsa_port_del_dscp_prio (struct dsa_switch *ds,int port,u8 dscp,u8 prio) +{ +struct yt921x_priv *priv =to_yt921x_priv (ds); +int res; + +mutex_lock (&priv->reg_lock);
Quoted 8 lines
drivers/net/dsa/yt921x.c static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port) · line 2929
Quoted 2 lines
drivers/net/dsa/yt921x.c +2
-0+ res =yt921x_reg_write (priv,YT921X_IPM_DSCPn (dscp), +ipm_ctrl (IEEE8021Q_TT_BK ));Question regarding semantics, also for Oleksij: deleting the DSCP app table entry should cause that DSCP value to be mapped to bulk, as in your interpretation (or best effort for KSZ), or according to the next selector in line, as per trust order (for example port default priority, which may not be bulk)?
It maps to bulk.
My interpretation of this hardware is that it uses a direct lookup table without a "valid/invalid" bit per entry. Once DSCP is enabled in the trust order, the switch performs the lookup for every packet; it cannot transparently skip a specific DSCP value to fall back to the next selector.
Therefore, "deleting" an entry practically remaps it to the default (Bulk/Best Effort) priority. This matches the logic we use in the KSZ driver.
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |