Commit b86a3722 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Fix-2-non-critical-issues-in-SJA1105-DSA' 



Vladimir Oltean says:

====================
Fix 2 non-critical issues in SJA1105 DSA

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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4300c7e7 99b981f4

drivers/net/dsa/sja1105/sja1105.h

+0 −18
Original line number Diff line number Diff line
@@ -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_dynamic_config.c

+40 −10
Original line number Diff line number Diff line
@@ -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_CMD



struct 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
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ 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,

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;
@@ -228,8 +227,7 @@ 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,

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;

drivers/net/dsa/sja1105/sja1105_static_config.h

+22 −0
Original line number Diff line number Diff line
@@ -430,4 +430,26 @@ 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 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,

					   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

CRA Git | Maintained and supported by SUSTech CRA and CCSE