net: stmmac: move initialisation of unicast_filter_entries to stmmac_plat_dat_alloc()

Move the default initialisation of plat_dat->unicast_filter_entries to
1 to stmmac_plat_dat_alloc(). This means platform glue only needs to
override this if different.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vJvjF-0000000EVju-3LfS@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index a4ef3ec070e2f332bddc9dd93765b82f8e24b565..de07cca2e6256163e7eb66fc2c720ec29a973ef2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -570,9 +570,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
 
        plat->mdio_bus_data->needs_reset = true;
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 1;
        plat->rx_queues_to_use = 1;
@@ -700,9 +697,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
 
        plat->ptp_clk_freq_config = intel_mgbe_ptp_clk_freq_config;
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        plat->flags |= STMMAC_FLAG_VLAN_FAIL_Q_EN;
 
        /* Use the last Rx queue */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index cfdda9e82a19cb5011b40a27f98084280aca3b3b..99b2d2deacebb24fcd8c8a2cb8579312e77835ab 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -98,9 +98,6 @@ static void loongson_default_data(struct pci_dev *pdev,
        /* Increase the default value for multicast hash bins */
        plat->multicast_filter_bins = 256;
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        /* Disable Priority config by default */
        plat->tx_queues_cfg[0].use_prio = false;
        plat->rx_queues_cfg[0].use_prio = false;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
index 3b7947a7a7ba70fdee93b162158585e1512ea5ab..24ce17ea35c4fff747b9c4cd006c13afa4bbfa30 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c
@@ -24,7 +24,6 @@ static int sophgo_sg2044_dwmac_init(struct platform_device *pdev,
        plat_dat->flags |= STMMAC_FLAG_SPH_DISABLE;
        plat_dat->set_clk_tx_rate = stmmac_set_clk_tx_rate;
        plat_dat->multicast_filter_bins = 0;
-       plat_dat->unicast_filter_entries = 1;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a7393a3e792f412a5f24c3a84cae792e94813c9c..1d12835d14ce445d008b1909cbd665ea1e124fd6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -7568,11 +7568,13 @@ struct plat_stmmacenet_data *stmmac_plat_dat_alloc(struct device *dev)
         * - determine GMII_Address CR field from CSR clock
         * - allow MTU up to JUMBO_LEN
         * - hash table size
+        * - one unicast filter entry
         */
        plat_dat->phy_addr = -1;
        plat_dat->clk_csr = -1;
        plat_dat->maxmtu = JUMBO_LEN;
        plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
+       plat_dat->unicast_filter_entries = 1;
 
        return plat_dat;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 0c65b24480ae1fac52c75b14c7a2dc3cccccaadf..aea615e76dac07a69d4bd8c378b48dca2833e0e8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -28,9 +28,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat)
 
        plat->mdio_bus_data->needs_reset = true;
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 1;
        plat->rx_queues_to_use = 1;
@@ -75,9 +72,6 @@ static int snps_gmac5_default_data(struct pci_dev *pdev,
        plat->flags |= STMMAC_FLAG_TSO_EN;
        plat->pmt = 1;
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        /* Set default number of RX and TX queues to use */
        plat->tx_queues_to_use = 4;
        plat->rx_queues_to_use = 4;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 9982aaa1951991926e3ed5cfcb4a354598feebbb..314cb3e720fd56010609e2172086d9f60e5b9998 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -508,9 +508,6 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
                plat->flags |= STMMAC_FLAG_EN_TX_LPI_CLOCKGATING;
        }
 
-       /* Set default value for unicast filter entries */
-       plat->unicast_filter_entries = 1;
-
        /*
         * Currently only the properties needed on SPEAr600
         * are provided. All other properties should be added