mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
net: dsa: sja1105: Add missing L2 Forwarding Table definitions for P/Q/R/S
This appends to the L2 Forwarding and L2 Forwarding Parameters tables (originally added for first-generation switches) the bits that are new in the second generation. Signed-off-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
afad12a0f0
commit
9c5098d91d
2 changed files with 40 additions and 4 deletions
|
@ -236,10 +236,20 @@ size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,
|
||||||
const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;
|
const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;
|
||||||
struct sja1105_l2_lookup_entry *entry = entry_ptr;
|
struct sja1105_l2_lookup_entry *entry = entry_ptr;
|
||||||
|
|
||||||
/* These are static L2 lookup entries, so the structure
|
if (entry->lockeds) {
|
||||||
* should match UM11040 Table 16/17 definitions when
|
sja1105_packing(buf, &entry->tsreg, 159, 159, size, op);
|
||||||
* LOCKEDS is 1.
|
sja1105_packing(buf, &entry->mirrvlan, 158, 147, size, op);
|
||||||
*/
|
sja1105_packing(buf, &entry->takets, 146, 146, size, op);
|
||||||
|
sja1105_packing(buf, &entry->mirr, 145, 145, size, op);
|
||||||
|
sja1105_packing(buf, &entry->retag, 144, 144, size, op);
|
||||||
|
} else {
|
||||||
|
sja1105_packing(buf, &entry->touched, 159, 159, size, op);
|
||||||
|
sja1105_packing(buf, &entry->age, 158, 144, size, op);
|
||||||
|
}
|
||||||
|
sja1105_packing(buf, &entry->mask_iotag, 143, 143, size, op);
|
||||||
|
sja1105_packing(buf, &entry->mask_vlanid, 142, 131, size, op);
|
||||||
|
sja1105_packing(buf, &entry->mask_macaddr, 130, 83, size, op);
|
||||||
|
sja1105_packing(buf, &entry->iotag, 82, 82, size, op);
|
||||||
sja1105_packing(buf, &entry->vlanid, 81, 70, size, op);
|
sja1105_packing(buf, &entry->vlanid, 81, 70, size, op);
|
||||||
sja1105_packing(buf, &entry->macaddr, 69, 22, size, op);
|
sja1105_packing(buf, &entry->macaddr, 69, 22, size, op);
|
||||||
sja1105_packing(buf, &entry->destports, 21, 17, size, op);
|
sja1105_packing(buf, &entry->destports, 21, 17, size, op);
|
||||||
|
|
|
@ -122,9 +122,35 @@ struct sja1105_l2_lookup_entry {
|
||||||
u64 destports;
|
u64 destports;
|
||||||
u64 enfport;
|
u64 enfport;
|
||||||
u64 index;
|
u64 index;
|
||||||
|
/* P/Q/R/S only */
|
||||||
|
u64 mask_iotag;
|
||||||
|
u64 mask_vlanid;
|
||||||
|
u64 mask_macaddr;
|
||||||
|
u64 iotag;
|
||||||
|
bool lockeds;
|
||||||
|
union {
|
||||||
|
/* LOCKEDS=1: Static FDB entries */
|
||||||
|
struct {
|
||||||
|
u64 tsreg;
|
||||||
|
u64 mirrvlan;
|
||||||
|
u64 takets;
|
||||||
|
u64 mirr;
|
||||||
|
u64 retag;
|
||||||
|
};
|
||||||
|
/* LOCKEDS=0: Dynamically learned FDB entries */
|
||||||
|
struct {
|
||||||
|
u64 touched;
|
||||||
|
u64 age;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sja1105_l2_lookup_params_entry {
|
struct sja1105_l2_lookup_params_entry {
|
||||||
|
u64 start_dynspc; /* P/Q/R/S only */
|
||||||
|
u64 drpnolearn; /* P/Q/R/S only */
|
||||||
|
u64 use_static; /* P/Q/R/S only */
|
||||||
|
u64 owr_dyn; /* P/Q/R/S only */
|
||||||
|
u64 learn_once; /* P/Q/R/S only */
|
||||||
u64 maxage; /* Shared */
|
u64 maxage; /* Shared */
|
||||||
u64 dyn_tbsz; /* E/T only */
|
u64 dyn_tbsz; /* E/T only */
|
||||||
u64 poly; /* E/T only */
|
u64 poly; /* E/T only */
|
||||||
|
|
Loading…
Reference in a new issue