| Message ID | c5c35fb4a3e4784a5e26a7b7181a0a2925674712.1610540603.git.gilles.doffe@savoirfairelinux.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Fixes on Microchip KSZ8795 DSA switch driver | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | fail | Series targets non-next tree, but doesn't contain any Fixes tags |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 9 of 9 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: line length of 82 exceeds 80 columns |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
----- Le 13 Jan 21, à 13:45, Gilles Doffe gilles.doffe@savoirfairelinux.com a écrit : > The FID (Filter ID) is a 7 bits field used to link the VLAN table > to the static and dynamic mac address tables. > Until now the KSZ8795 driver could only add one VLAN as the FID was > always set to 1. > This commit allows setting a FID for each new active VLAN. > The FID list is stored in a static table dynamically allocated from > ks8795_fid structure. > Each newly activated VLAN is associated to the next available FID. > Only the VLAN 0 is not added to the list as it is a special VLAN. > As it has a special meaning, see IEEE 802.1q. > When a VLAN is no more used, the associated FID table entry is reset > to 0. > > Signed-off-by: Gilles DOFFE <gilles.doffe@savoirfairelinux.com> > --- > drivers/net/dsa/microchip/ksz8795.c | 59 +++++++++++++++++++++++-- > drivers/net/dsa/microchip/ksz8795_reg.h | 1 + > drivers/net/dsa/microchip/ksz_common.h | 1 + > 3 files changed, 57 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/dsa/microchip/ksz8795.c > b/drivers/net/dsa/microchip/ksz8795.c > index c973db101b72..6962ba4ee125 100644 > --- a/drivers/net/dsa/microchip/ksz8795.c > +++ b/drivers/net/dsa/microchip/ksz8795.c > @@ -648,7 +648,7 @@ static enum dsa_tag_protocol ksz8795_get_tag_protocol(struct > dsa_switch *ds, > int port, > enum dsa_tag_protocol mp) > { > - return DSA_TAG_PROTO_KSZ8795; > + return DSA_TAG_PROTO_NONE; This is an oversight, will be removed in V2. > } > > static void ksz8795_get_strings(struct dsa_switch *ds, int port, > @@ -796,6 +796,41 @@ static int ksz8795_port_vlan_filtering(struct dsa_switch > *ds, int port, > return 0; > } > > +static void ksz8795_del_fid(u16 *ksz_fid_table, u16 vid) > +{ > + u8 i = 0; > + > + if (!ksz_fid_table) > + return; > + > + for (i = 0; i < VLAN_TABLE_FID_SIZE; i++) { > + if (ksz_fid_table[i] == vid) { > + ksz_fid_table[i] = 0; > + break; > + } > + } > +} > + > +static int ksz8795_get_next_fid(u16 *ksz_fid_table, u16 vid, u8 *fid) > +{ > + u8 i = 0; > + int ret = -EOVERFLOW; > + > + if (!ksz_fid_table) > + return ret; > + > + for (i = 0; i < VLAN_TABLE_FID_SIZE; i++) { > + if (!ksz_fid_table[i]) { > + ksz_fid_table[i] = vid; > + *fid = i; > + ret = 0; > + break; > + } > + } > + > + return ret; > +} > + > static void ksz8795_port_vlan_add(struct dsa_switch *ds, int port, > const struct switchdev_obj_port_vlan *vlan) > { > @@ -803,17 +838,24 @@ static void ksz8795_port_vlan_add(struct dsa_switch *ds, > int port, > struct ksz_device *dev = ds->priv; > u16 data, vid, new_pvid = 0; > u8 fid, member, valid; > + int ret; > > ksz_port_cfg(dev, port, P_TAG_CTRL, PORT_REMOVE_TAG, untagged); > > for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { > + if (vid == 0) > + continue; > + > ksz8795_r_vlan_table(dev, vid, &data); > ksz8795_from_vlan(data, &fid, &member, &valid); > > /* First time to setup the VLAN entry. */ > if (!valid) { > - /* Need to find a way to map VID to FID. */ > - fid = 1; > + ret = ksz8795_get_next_fid(dev->ksz_fid_table, vid, &fid); > + if (ret) { > + dev_err(ds->dev, "Switch FID table is full, cannot add"); > + return; > + } > valid = 1; > } > member |= BIT(port); > @@ -855,7 +897,7 @@ static int ksz8795_port_vlan_del(struct dsa_switch *ds, int > port, > > /* Invalidate the entry if no more member. */ > if (!member) { > - fid = 0; > + ksz8795_del_fid(dev->ksz_fid_table, vid); > valid = 0; > } > > @@ -1087,6 +1129,9 @@ static int ksz8795_setup(struct dsa_switch *ds) > for (i = 0; i < (dev->num_vlans / 4); i++) > ksz8795_r_vlan_entries(dev, i); > > + /* Assign first FID to VLAN 1 and always return FID=0 for this vlan */ > + dev->ksz_fid_table[0] = 1; > + > /* Setup STP address for STP operation. */ > memset(&alu, 0, sizeof(alu)); > ether_addr_copy(alu.mac, eth_stp_addr); > @@ -1261,6 +1306,12 @@ static int ksz8795_switch_init(struct ksz_device *dev) > /* set the real number of ports */ > dev->ds->num_ports = dev->port_cnt; > > + dev->ksz_fid_table = devm_kzalloc(dev->dev, > + VLAN_TABLE_FID_SIZE * sizeof(u16), > + GFP_KERNEL); > + if (!dev->ksz_fid_table) > + return -ENOMEM; > + > return 0; > } > > diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h > b/drivers/net/dsa/microchip/ksz8795_reg.h > index 40372047d40d..fe4c4f7fdd47 100644 > --- a/drivers/net/dsa/microchip/ksz8795_reg.h > +++ b/drivers/net/dsa/microchip/ksz8795_reg.h > @@ -915,6 +915,7 @@ > */ > > #define VLAN_TABLE_FID 0x007F > +#define VLAN_TABLE_FID_SIZE 128 > #define VLAN_TABLE_MEMBERSHIP 0x0F80 > #define VLAN_TABLE_VALID 0x1000 > > diff --git a/drivers/net/dsa/microchip/ksz_common.h > b/drivers/net/dsa/microchip/ksz_common.h > index 720f22275c84..44e97c55c2da 100644 > --- a/drivers/net/dsa/microchip/ksz_common.h > +++ b/drivers/net/dsa/microchip/ksz_common.h > @@ -77,6 +77,7 @@ struct ksz_device { > bool synclko_125; > > struct vlan_table *vlan_cache; > + u16 *ksz_fid_table; > > struct ksz_port *ports; > struct delayed_work mib_read; > -- > 2.25.1
On Wed, Jan 13, 2021 at 01:45:17PM +0100, Gilles DOFFE wrote: > The FID (Filter ID) is a 7 bits field used to link the VLAN table > to the static and dynamic mac address tables. > Until now the KSZ8795 driver could only add one VLAN as the FID was > always set to 1. What do you mean the ksz8769 driver could only add one VLAN? That is obviously a false statement. All VLANs use the same FID of 1 means that the switch is currently configured for shared address learning. Whereas each VLAN having a separate FID would mean that it is configured for individual address learning. > This commit allows setting a FID for each new active VLAN. > The FID list is stored in a static table dynamically allocated from > ks8795_fid structure. > Each newly activated VLAN is associated to the next available FID. > Only the VLAN 0 is not added to the list as it is a special VLAN. > As it has a special meaning, see IEEE 802.1q. > When a VLAN is no more used, the associated FID table entry is reset > to 0. Why is this patch targeting the "net" tree? What is the problem that it resolves?
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index c973db101b72..6962ba4ee125 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -648,7 +648,7 @@ static enum dsa_tag_protocol ksz8795_get_tag_protocol(struct dsa_switch *ds, int port, enum dsa_tag_protocol mp) { - return DSA_TAG_PROTO_KSZ8795; + return DSA_TAG_PROTO_NONE; } static void ksz8795_get_strings(struct dsa_switch *ds, int port, @@ -796,6 +796,41 @@ static int ksz8795_port_vlan_filtering(struct dsa_switch *ds, int port, return 0; } +static void ksz8795_del_fid(u16 *ksz_fid_table, u16 vid) +{ + u8 i = 0; + + if (!ksz_fid_table) + return; + + for (i = 0; i < VLAN_TABLE_FID_SIZE; i++) { + if (ksz_fid_table[i] == vid) { + ksz_fid_table[i] = 0; + break; + } + } +} + +static int ksz8795_get_next_fid(u16 *ksz_fid_table, u16 vid, u8 *fid) +{ + u8 i = 0; + int ret = -EOVERFLOW; + + if (!ksz_fid_table) + return ret; + + for (i = 0; i < VLAN_TABLE_FID_SIZE; i++) { + if (!ksz_fid_table[i]) { + ksz_fid_table[i] = vid; + *fid = i; + ret = 0; + break; + } + } + + return ret; +} + static void ksz8795_port_vlan_add(struct dsa_switch *ds, int port, const struct switchdev_obj_port_vlan *vlan) { @@ -803,17 +838,24 @@ static void ksz8795_port_vlan_add(struct dsa_switch *ds, int port, struct ksz_device *dev = ds->priv; u16 data, vid, new_pvid = 0; u8 fid, member, valid; + int ret; ksz_port_cfg(dev, port, P_TAG_CTRL, PORT_REMOVE_TAG, untagged); for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { + if (vid == 0) + continue; + ksz8795_r_vlan_table(dev, vid, &data); ksz8795_from_vlan(data, &fid, &member, &valid); /* First time to setup the VLAN entry. */ if (!valid) { - /* Need to find a way to map VID to FID. */ - fid = 1; + ret = ksz8795_get_next_fid(dev->ksz_fid_table, vid, &fid); + if (ret) { + dev_err(ds->dev, "Switch FID table is full, cannot add"); + return; + } valid = 1; } member |= BIT(port); @@ -855,7 +897,7 @@ static int ksz8795_port_vlan_del(struct dsa_switch *ds, int port, /* Invalidate the entry if no more member. */ if (!member) { - fid = 0; + ksz8795_del_fid(dev->ksz_fid_table, vid); valid = 0; } @@ -1087,6 +1129,9 @@ static int ksz8795_setup(struct dsa_switch *ds) for (i = 0; i < (dev->num_vlans / 4); i++) ksz8795_r_vlan_entries(dev, i); + /* Assign first FID to VLAN 1 and always return FID=0 for this vlan */ + dev->ksz_fid_table[0] = 1; + /* Setup STP address for STP operation. */ memset(&alu, 0, sizeof(alu)); ether_addr_copy(alu.mac, eth_stp_addr); @@ -1261,6 +1306,12 @@ static int ksz8795_switch_init(struct ksz_device *dev) /* set the real number of ports */ dev->ds->num_ports = dev->port_cnt; + dev->ksz_fid_table = devm_kzalloc(dev->dev, + VLAN_TABLE_FID_SIZE * sizeof(u16), + GFP_KERNEL); + if (!dev->ksz_fid_table) + return -ENOMEM; + return 0; } diff --git a/drivers/net/dsa/microchip/ksz8795_reg.h b/drivers/net/dsa/microchip/ksz8795_reg.h index 40372047d40d..fe4c4f7fdd47 100644 --- a/drivers/net/dsa/microchip/ksz8795_reg.h +++ b/drivers/net/dsa/microchip/ksz8795_reg.h @@ -915,6 +915,7 @@ */ #define VLAN_TABLE_FID 0x007F +#define VLAN_TABLE_FID_SIZE 128 #define VLAN_TABLE_MEMBERSHIP 0x0F80 #define VLAN_TABLE_VALID 0x1000 diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 720f22275c84..44e97c55c2da 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -77,6 +77,7 @@ struct ksz_device { bool synclko_125; struct vlan_table *vlan_cache; + u16 *ksz_fid_table; struct ksz_port *ports; struct delayed_work mib_read;
The FID (Filter ID) is a 7 bits field used to link the VLAN table to the static and dynamic mac address tables. Until now the KSZ8795 driver could only add one VLAN as the FID was always set to 1. This commit allows setting a FID for each new active VLAN. The FID list is stored in a static table dynamically allocated from ks8795_fid structure. Each newly activated VLAN is associated to the next available FID. Only the VLAN 0 is not added to the list as it is a special VLAN. As it has a special meaning, see IEEE 802.1q. When a VLAN is no more used, the associated FID table entry is reset to 0. Signed-off-by: Gilles DOFFE <gilles.doffe@savoirfairelinux.com> --- drivers/net/dsa/microchip/ksz8795.c | 59 +++++++++++++++++++++++-- drivers/net/dsa/microchip/ksz8795_reg.h | 1 + drivers/net/dsa/microchip/ksz_common.h | 1 + 3 files changed, 57 insertions(+), 4 deletions(-)