net: dsa: b53: Rename num_arl_entries to num_arl_bins

The variable currently holds the number of ARL bins per ARL buckets,
which is different from the number of ARL entries which would be bins
times buckets. We will be adding a num_arl_buckets in a subsequent patch
so get variables straight now.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index c283593bef17e8b94e7eabb56d34f362e4ecbc4e..41b75f41677aeb98d45a8a72b1092f01661da79d 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1495,10 +1495,10 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,
        if (ret)
                return ret;
 
-       bitmap_zero(free_bins, dev->num_arl_entries);
+       bitmap_zero(free_bins, dev->num_arl_bins);
 
        /* Read the bins */
-       for (i = 0; i < dev->num_arl_entries; i++) {
+       for (i = 0; i < dev->num_arl_bins; i++) {
                u64 mac_vid;
                u32 fwd_entry;
 
@@ -1521,10 +1521,10 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,
                return 0;
        }
 
-       if (bitmap_weight(free_bins, dev->num_arl_entries) == 0)
+       if (bitmap_weight(free_bins, dev->num_arl_bins) == 0)
                return -ENOSPC;
 
-       *idx = find_first_bit(free_bins, dev->num_arl_entries);
+       *idx = find_first_bit(free_bins, dev->num_arl_bins);
 
        return -ENOENT;
 }
@@ -1692,7 +1692,7 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
                if (ret)
                        return ret;
 
-               if (priv->num_arl_entries > 2) {
+               if (priv->num_arl_bins > 2) {
                        b53_arl_search_rd(priv, 1, &results[1]);
                        ret = b53_fdb_copy(port, &results[1], cb, data);
                        if (ret)
@@ -2185,7 +2185,7 @@ struct b53_chip_data {
        u16 enabled_ports;
        u8 cpu_port;
        u8 vta_regs[3];
-       u8 arl_entries;
+       u8 arl_bins;
        u8 duplex_reg;
        u8 jumbo_pm_reg;
        u8 jumbo_size_reg;
@@ -2204,7 +2204,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5325",
                .vlans = 16,
                .enabled_ports = 0x1f,
-               .arl_entries = 2,
+               .arl_bins = 2,
                .cpu_port = B53_CPU_PORT_25,
                .duplex_reg = B53_DUPLEX_STAT_FE,
        },
@@ -2213,7 +2213,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5365",
                .vlans = 256,
                .enabled_ports = 0x1f,
-               .arl_entries = 2,
+               .arl_bins = 2,
                .cpu_port = B53_CPU_PORT_25,
                .duplex_reg = B53_DUPLEX_STAT_FE,
        },
@@ -2222,7 +2222,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5389",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2234,7 +2234,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5395",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2246,7 +2246,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5397",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS_9798,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2258,7 +2258,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM5398",
                .vlans = 4096,
                .enabled_ports = 0x7f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS_9798,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2270,7 +2270,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53115",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .vta_regs = B53_VTA_REGS,
                .cpu_port = B53_CPU_PORT,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2282,7 +2282,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53125",
                .vlans = 4096,
                .enabled_ports = 0xff,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2294,7 +2294,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53128",
                .vlans = 4096,
                .enabled_ports = 0x1ff,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2306,7 +2306,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM63xx",
                .vlans = 4096,
                .enabled_ports = 0, /* pdata must provide them */
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS_63XX,
                .duplex_reg = B53_DUPLEX_STAT_63XX,
@@ -2318,7 +2318,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53010",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2330,7 +2330,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53011",
                .vlans = 4096,
                .enabled_ports = 0x1bf,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2342,7 +2342,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53012",
                .vlans = 4096,
                .enabled_ports = 0x1bf,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2354,7 +2354,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53018",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2366,7 +2366,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM53019",
                .vlans = 4096,
                .enabled_ports = 0x1f,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2378,7 +2378,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM585xx/586xx/88312",
                .vlans  = 4096,
                .enabled_ports = 0x1ff,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2390,7 +2390,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM583xx/11360",
                .vlans = 4096,
                .enabled_ports = 0x103,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2402,7 +2402,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM7445",
                .vlans  = 4096,
                .enabled_ports = 0x1ff,
-               .arl_entries = 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2414,7 +2414,7 @@ static const struct b53_chip_data b53_switch_chips[] = {
                .dev_name = "BCM7278",
                .vlans = 4096,
                .enabled_ports = 0x1ff,
-               .arl_entries= 4,
+               .arl_bins = 4,
                .cpu_port = B53_CPU_PORT,
                .vta_regs = B53_VTA_REGS,
                .duplex_reg = B53_DUPLEX_STAT_GE,
@@ -2442,7 +2442,7 @@ static int b53_switch_init(struct b53_device *dev)
                        dev->jumbo_pm_reg = chip->jumbo_pm_reg;
                        dev->cpu_port = chip->cpu_port;
                        dev->num_vlans = chip->vlans;
-                       dev->num_arl_entries = chip->arl_entries;
+                       dev->num_arl_bins = chip->arl_bins;
                        break;
                }
        }

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index 3d42318bc3f128a4bfd56c7e788c6a880691ff72..1c5c443d571f4cec90f4577fe00d5763934f7cec 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -117,7 +117,7 @@ struct b53_device {
        u8 jumbo_pm_reg;
        u8 jumbo_size_reg;
        int reset_gpio;
-       u8 num_arl_entries;
+       u8 num_arl_bins;
        enum dsa_tag_protocol tag_protocol;
 
        /* used ports mask */