Commit ba61cf16 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: sja1105: fix VL lookup command packing for P/Q/R/S 



At the beginning of the sja1105_dynamic_config.c file there is a diagram
of the dynamic config interface layout:

 packed_buf

 |
 V
 +-----------------------------------------+------------------+
 |              ENTRY BUFFER               |  COMMAND BUFFER  |
 +-----------------------------------------+------------------+

 <----------------------- packed_size ------------------------>

So in order to pack/unpack the command bits into the buffer,
sja1105_vl_lookup_cmd_packing must first advance the buffer pointer by
the length of the entry. This is similar to what the other *cmd_packing
functions do.

This bug exists because the command packing function for P/Q/R/S was
copied from the E/T generation, and on E/T, the command was actually
embedded within the entry buffer itself.

Fixes: 94f94d4a ("net: dsa: sja1105: add static tables for virtual links")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a6e9a9c

drivers/net/dsa/sja1105/sja1105_dynamic_config.c

+19 −4
Original line number Diff line number Diff line
@@ -167,8 +167,9 @@ enum sja1105_hostcmd { 
	SJA1105_HOSTCMD_INVALIDATE = 4,

};



/* Command and entry overlap */

static void

sja1105_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,

sja1105et_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,

				enum packing_op op)

{

	const int size = SJA1105_SIZE_DYN_CMD;
@@ -179,6 +180,20 @@ sja1105_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd, 
	sja1105_packing(buf, &cmd->index,    9,  0, size, op);

}



/* Command and entry are separate */

static void

sja1105pqrs_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,

				  enum packing_op op)

{

	u8 *p = buf + SJA1105_SIZE_VL_LOOKUP_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, 29, 29, size, op);

	sja1105_packing(p, &cmd->index,    9,  0, size, op);

}



static size_t sja1105et_vl_lookup_entry_packing(void *buf, void *entry_ptr,

						enum packing_op op)

{
@@ -641,7 +656,7 @@ static size_t sja1105pqrs_cbs_entry_packing(void *buf, void *entry_ptr, 
const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {

	[BLK_IDX_VL_LOOKUP] = {

		.entry_packing = sja1105et_vl_lookup_entry_packing,

		.cmd_packing = sja1105_vl_lookup_cmd_packing,

		.cmd_packing = sja1105et_vl_lookup_cmd_packing,

		.access = OP_WRITE,

		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,

		.packed_size = SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD,
@@ -725,7 +740,7 @@ const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = { 
const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {

	[BLK_IDX_VL_LOOKUP] = {

		.entry_packing = sja1105_vl_lookup_entry_packing,

		.cmd_packing = sja1105_vl_lookup_cmd_packing,

		.cmd_packing = sja1105pqrs_vl_lookup_cmd_packing,

		.access = (OP_READ | OP_WRITE),

		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,

		.packed_size = SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD,