Fix 2 non-critical issues in SJA1105 DSA
Vladimir Oltean
maintainercover Fix 2 non-critical issues in SJA1105 DSA
From: Vladimir Oltean <[email protected]>
This small series suppresses the W=1 warnings in the sja1105 driver and it corrects some register offsets. I would like to target it against net-next since it would have non-trivial conflicts with net, and the problems it solves are not that big of a deal.
Vladimir Oltean (2):
net: dsa: sja1105: suppress -Wmissing-prototypes in
sja1105_static_config.c
net: dsa: sja1105: fix port mirroring for P/Q/R/S
drivers/net/dsa/sja1105/sja1105.h | 18 ------- .../net/dsa/sja1105/sja1105_dynamic_config.c | 50 +++++++++++++++---- .../net/dsa/sja1105/sja1105_static_config.c | 10 ++-- .../net/dsa/sja1105/sja1105_static_config.h | 22 ++++++++ 4 files changed, 66 insertions(+), 34 deletions(-)
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH 1/2 net: dsa: sja1105: suppress -Wmissing-prototypes in sja1105_static_config.c
From: Vladimir Oltean <[email protected]>
Newer compilers complain with W=1 builds that there are non-static functions defined in sja1105_static_config.c that don't have a prototype, because their prototype is defined in sja1105.h which this translation unit does not include.
I don't entirely understand what is the point of these warnings, since in principle there's nothing wrong with that. But let's move the prototypes to a header file that _is_ included by sja1105_static_config.c, since that will make these warnings go away.
--- drivers/net/dsa/sja1105/sja1105.h | 18 ------------------ .../net/dsa/sja1105/sja1105_static_config.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-)
drivers/net/dsa/sja1105/sja1105.h +0 -18
@@ -323,24 +323,6 @@ int sja1105pqrs_fdb_add(struct dsa_switch *ds, int port,int sja1105pqrs_fdb_del (struct dsa_switch *ds,int port,const unsigned char *addr,u16 vid); -/* Common implementations for the static and dynamic configs */ -size_t sja1105_l2_forwarding_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105pqrs_l2_lookup_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105et_l2_lookup_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105_vlan_lookup_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105_retagging_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105pqrs_mac_config_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105pqrs_avb_params_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -size_t sja1105_vl_lookup_entry_packing (void *buf,void *entry_ptr, -enum packing_op op); -/* From sja1105_flower.c */ int sja1105_cls_flower_del (struct dsa_switch *ds,int port,struct flow_cls_offload *cls,bool ingress);
drivers/net/dsa/sja1105/sja1105_static_config.h +18 -0
@@ -430,4 +430,22 @@ void sja1105_unpack(const void *buf, u64 *val, int start, int end, size_t len);void sja1105_packing (void *buf,u64 *val,int start,int end,size_t len,enum packing_op op); +/* Common implementations for the static and dynamic configs */ +size_t sja1105_l2_forwarding_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105pqrs_l2_lookup_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105et_l2_lookup_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105_vlan_lookup_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105_retagging_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105pqrs_mac_config_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105pqrs_avb_params_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105_vl_lookup_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +#endif
Signature · 1 line
2.25.1
Re: [PATCH net-next 1/2] net: dsa: sja1105: suppress -Wmissing-prototypes in sja1105_static_config.c
Quoted 7 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Newer compilers complain with W=1 builds that there are non-static functions defined in
sja1105_static_config.cthat don't have a prototype, because their prototype is defined insja1105.hwhich this translation unit does not include.
Quoted 6 lines
I don't entirely understand what is the point of these warnings, since in principle there's nothing wrong with that. But let's move the prototypes to a header file that _is_ included by
sja1105_static_config.c, since that will make these warnings go away.Signed-off-by Vladimir Oltean <[email protected]>
Signature · 1 line
Florian
Andrew Lunn
maintainerRe: [PATCH net-next 1/2] net: dsa: sja1105: suppress -Wmissing-prototypes in sja1105_static_config.c
In reply to Vladimir OlteanQuoted 9 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Newer compilers complain with W=1 builds that there are non-static functions defined in
sja1105_static_config.cthat don't have a prototype, because their prototype is defined insja1105.hwhich this translation unit does not include.I don't entirely understand what is the point of these warnings, since in principle there's nothing wrong with that.
Hi Vladimir
The issue here is that the header might have a typo and have a different signature than the function itself. The caller than passes the parameters in the wrong way. Best case it segfault/Opps, but it can introduce subtle bugs which are hard to find.
Andrew
Vladimir Oltean
maintainerPATCH 2/2 net: dsa: sja1105: fix port mirroring for P/Q/R/S
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
The dynamic configuration interface for the General Params and the L2 Lookup Params tables was copy-pasted between E/T devices and P/Q/R/S devices. Nonetheless, these interfaces are bitwise different.
The driver is using dynamic reconfiguration of the General Parameters table for the port mirroring feature, which was therefore broken on P/Q/R/S.
Note that this patch can't be backported easily very far to stable trees (since it conflicts with some other development done since the introduction of the driver). So the Fixes: tag is purely informational.
--- .../net/dsa/sja1105/sja1105_dynamic_config.c | 50 +++++++++++++++---- .../net/dsa/sja1105/sja1105_static_config.c | 10 ++-- .../net/dsa/sja1105/sja1105_static_config.h | 4 ++ 3 files changed, 48 insertions(+), 16 deletions(-)
drivers/net/dsa/sja1105/sja1105_dynamic_config.c +40 -10
@@ -127,9 +127,15 @@#define SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD \ SJA1105_SIZE_DYN_CMD +#define SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_DYN_CMD \ + (SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY) +#define SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD \ SJA1105_SIZE_DYN_CMD +#define SJA1105PQRS_SIZE_GENERAL_PARAMS_DYN_CMD \ + (SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY) +#define SJA1105PQRS_SIZE_AVB_PARAMS_DYN_CMD \ (SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY)
@@ -143,7 +149,7 @@ (SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_CBS_ENTRY)#define SJA1105_MAX_DYN_CMD_SIZE \ - SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD + SJA1105PQRS_SIZE_GENERAL_PARAMS_DYN_CMDstruct sja1105_dyn_cmd {bool search;
@@ -500,6 +506,18 @@ sja1105et_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,return 0 ; } +static void +sja1105pqrs_l2_lookup_params_cmd_packing (void *buf, +struct sja1105_dyn_cmd *cmd, +enum packing_op op) +{ +u8 *p = buf +SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY ; +const int size =SJA1105_SIZE_DYN_CMD ; + +sja1105_packing (p, &cmd->valid,31 ,31 , size, op); +sja1105_packing (p, &cmd->rdwrset,30 ,30 , size, op); +} +static void sja1105et_general_params_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd,enum packing_op op)
@@ -522,6 +540,18 @@ sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,return 0 ; } +static void +sja1105pqrs_general_params_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd, +enum packing_op op) +{ +u8 *p = buf +SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY ; +const int size =SJA1105_SIZE_DYN_CMD ; + +sja1105_packing (p, &cmd->valid,31 ,31 , size, op); +sja1105_packing (p, &cmd->errors,30 ,30 , size, op); +sja1105_packing (p, &cmd->rdwrset,28 ,28 , size, op); +} +static void sja1105pqrs_avb_params_cmd_packing (void *buf,struct sja1105_dyn_cmd *cmd,enum packing_op op)
@@ -761,12 +791,12 @@ struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = { [BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {0}, [BLK_IDX_VL_FORWARDING_PARAMS] = {0}, [BLK_IDX_L2_LOOKUP_PARAMS] = { - .entry_packing = sja1105et_l2_lookup_params_entry_packing, - .cmd_packing = sja1105et_l2_lookup_params_cmd_packing, + .entry_packing = sja1105pqrs_l2_lookup_params_entry_packing, + .cmd_packing = sja1105pqrs_l2_lookup_params_cmd_packing, .max_entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT, .access = (OP_READ | OP_WRITE), - .packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD, - .addr = 0x38, + .packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_DYN_CMD, + .addr = 0x54, }, [BLK_IDX_L2_FORWARDING_PARAMS] = {0}, [BLK_IDX_AVB_PARAMS] = {
@@ -778,12 +808,12 @@ struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = { .addr = 0x8003, }, [BLK_IDX_GENERAL_PARAMS] = { - .entry_packing = sja1105et_general_params_entry_packing, - .cmd_packing = sja1105et_general_params_cmd_packing, + .entry_packing = sja1105pqrs_general_params_entry_packing, + .cmd_packing = sja1105pqrs_general_params_cmd_packing, .max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT, - .access = OP_WRITE, - .packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD, - .addr = 0x34, + .access = (OP_READ | OP_WRITE), + .packed_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_DYN_CMD, + .addr = 0x3B, }, [BLK_IDX_RETAGGING] = { .entry_packing = sja1105_retagging_entry_packing,
drivers/net/dsa/sja1105/sja1105_static_config.c +4 -6
@@ -146,9 +146,8 @@ static size_t sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,/* TPID and TPID2 are intentionally reversed so that semantic * compatibility with E/T is kept. */ -static size_t -sja1105pqrs_general_params_entry_packing (void *buf,void *entry_ptr, -enum packing_op op) +size_t sja1105pqrs_general_params_entry_packing (void *buf,void *entry_ptr, +enum packing_op op) {const size_t size =SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY ;struct sja1105_general_params_entry *entry = entry_ptr;
@@ -228,9 +227,8 @@ sja1105et_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,return size; } -static size_t -sja1105pqrs_l2_lookup_params_entry_packing (void *buf,void *entry_ptr, -enum packing_op op) +size_t sja1105pqrs_l2_lookup_params_entry_packing (void *buf,void *entry_ptr, +enum packing_op op) {const size_t size =SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY ;struct sja1105_l2_lookup_params_entry *entry = entry_ptr;
drivers/net/dsa/sja1105/sja1105_static_config.h +4 -0
@@ -431,6 +431,10 @@ void sja1105_packing(void *buf, u64 *val, int start, int end, size_t len, enum packing_op op);/* Common implementations for the static and dynamic configs */ +size_t sja1105pqrs_general_params_entry_packing (void *buf,void *entry_ptr, +enum packing_op op); +size_t sja1105pqrs_l2_lookup_params_entry_packing (void *buf,void *entry_ptr, +enum packing_op op);size_t sja1105_l2_forwarding_entry_packing (void *buf,void *entry_ptr,enum packing_op op); size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,
Signature · 1 line
2.25.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Sat, 30 May 2020 13:29:51 +0300
Quoted 6 lines
From: Vladimir Oltean <[email protected]>
This small series suppresses the W=1 warnings in the sja1105 driver and it corrects some register offsets. I would like to target it against net-next since it would have non-trivial conflicts with net, and the problems it solves are not that big of a deal.
Series applied, thanks.