net: dsa: sja1105: Make P/Q/R/S learn MAC addresses

At the end of the commit f6c8034d539b ("net: dsa: sja1105: Add FDB
operations for P/Q/R/S series") message, I said that:

    At the moment only FDB entries installed statically through 'bridge fdb'
    are visible in the dump callback - the dynamically learned ones are
    still under investigation.

It looks like the reason why they were not visible in 'bridge fdb' was
that they were never learned - always flooded.

SJA1105 P/Q/R/S manual says about the MAXADDRP[port] field:

    Specify the maximum number of MAC address dynamically learned from
    the respective port. It is used to limit the number of learned MAC
    addresses per port.

It looks like not providing a value in the static config (aka providing
zeroes) is enough for it to not store the learned addresses in the FDB.

For now we divide the 1024 entry FDB "equally" amongst the 5 ports. This
may be revisited if the situation calls for that - for now I'm happy
that learning works.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index bc9f37cd3876e864fd6b4527704eb1dcfd432d43..46a3c81825ecdd3dd7597cd7b02b5028c9749bcb 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -203,6 +203,7 @@ static int sja1105_init_static_fdb(struct sja1105_private *priv)
 static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)
 {
        struct sja1105_table *table;
+       u64 max_fdb_entries = SJA1105_MAX_L2_LOOKUP_COUNT / SJA1105_NUM_PORTS;
        struct sja1105_l2_lookup_params_entry default_l2_lookup_params = {
                /* Learned FDB entries are forgotten after 300 seconds */
                .maxage = SJA1105_AGEING_TIME_MS(300000),
@@ -210,6 +211,8 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)
                .dyn_tbsz = SJA1105ET_FDB_BIN_SIZE,
                /* And the P/Q/R/S equivalent setting: */
                .start_dynspc = 0,
+               .maxaddrp = {max_fdb_entries, max_fdb_entries, max_fdb_entries,
+                            max_fdb_entries, max_fdb_entries, },
                /* 2^8 + 2^5 + 2^3 + 2^2 + 2^1 + 1 in Koopman notation */
                .poly = 0x97,
                /* This selects between Independent VLAN Learning (IVL) and

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c
index a1e9656c881c2d89cabcec7bbfafe0156aab05d4..b31c737dc5602e9a8b5a2491fbef91e0e5e8e772 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.c
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.c
@@ -230,7 +230,11 @@ sja1105pqrs_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,
 {
        const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY;
        struct sja1105_l2_lookup_params_entry *entry = entry_ptr;
+       int offset, i;
 
+       for (i = 0, offset = 58; i < 5; i++, offset += 11)
+               sja1105_packing(buf, &entry->maxaddrp[i],
+                               offset + 10, offset + 0, size, op);
        sja1105_packing(buf, &entry->maxage,         57,  43, size, op);
        sja1105_packing(buf, &entry->start_dynspc,   42,  33, size, op);
        sja1105_packing(buf, &entry->drpnolearn,     32,  28, size, op);

diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.h b/drivers/net/dsa/sja1105/sja1105_static_config.h
index a9586d0b4b3bef4e469d052fefbfc897dd61b598..2a3a1a92d7c3710ea912e95e73194ec890be43c7 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_static_config.h
+++ b/drivers/net/dsa/sja1105/sja1105_static_config.h
@@ -151,6 +151,7 @@ struct sja1105_l2_lookup_entry {
 };
 
 struct sja1105_l2_lookup_params_entry {
+       u64 maxaddrp[5];     /* P/Q/R/S only */
        u64 start_dynspc;    /* P/Q/R/S only */
        u64 drpnolearn;      /* P/Q/R/S only */
        u64 use_static;      /* P/Q/R/S only */