net: stmmac: replace the vlan_fail_q_en field with a flag

Drop the boolean field of the plat_stmmacenet_data structure in favor of a
simple bitfield flag.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20230710090001.303225-8-brgl@bgdev.pl
Reviewed-by: Simon Horman <simon.horman@corigine.com>
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 faa6f4ec68389c32872624b62039eb01ff355eee..1f1bc99571a5a756d59f4396f329ac1f7e8c7dd5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -560,7 +560,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
        /* Set the maxmtu to a default of JUMBO_LEN */
        plat->maxmtu = JUMBO_LEN;
 
-       plat->vlan_fail_q_en = true;
+       plat->flags |= STMMAC_FLAG_VLAN_FAIL_Q_EN;
 
        /* Use the last Rx queue */
        plat->vlan_fail_q = plat->rx_queues_to_use - 1;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d444514db07e959c797b60fa7e1186f015041e8a..c5763f60c6eff0397a5c63b350fba829dcaa5c22 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6923,7 +6923,8 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        if (priv->dma_cap.tsoen)
                dev_info(priv->device, "TSO supported\n");
 
-       priv->hw->vlan_fail_q_en = priv->plat->vlan_fail_q_en;
+       priv->hw->vlan_fail_q_en =
+               (priv->plat->flags & STMMAC_FLAG_VLAN_FAIL_Q_EN);
        priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;
 
        /* Run HW quirks, if any */

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index aeb3e75dc748c9e8f970b1256f7f3c6277f6fc03..155cb11b1c8a3abfbf96348f1f93473eff4299d1 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -210,6 +210,7 @@ struct dwmac4_addrs {
 #define STMMAC_FLAG_HAS_SUN8I                  BIT(3)
 #define STMMAC_FLAG_TSO_EN                     BIT(4)
 #define STMMAC_FLAG_SERDES_UP_AFTER_PHY_LINKUP BIT(5)
+#define STMMAC_FLAG_VLAN_FAIL_Q_EN             BIT(6)
 
 struct plat_stmmacenet_data {
        int bus_id;
@@ -278,7 +279,6 @@ struct plat_stmmacenet_data {
        bool en_tx_lpi_clockgating;
        bool rx_clk_runs_in_lpi;
        int has_xgmac;
-       bool vlan_fail_q_en;
        u8 vlan_fail_q;
        unsigned int eee_usecs_rate;
        struct pci_dev *pdev;