net: stmmac: replace the multi_msi_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-9-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 1f1bc99..d8bcf94 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -953,7 +953,7 @@ static int stmmac_config_single_msi(struct pci_dev *pdev,
 
        res->irq = pci_irq_vector(pdev, 0);
        res->wol_irq = res->irq;
-       plat->multi_msi_en = 0;
+       plat->flags &= ~STMMAC_FLAG_MULTI_MSI_EN;
        dev_info(&pdev->dev, "%s: Single IRQ enablement successful\n",
                 __func__);
 
@@ -1005,7 +1005,7 @@ static int stmmac_config_multi_msi(struct pci_dev *pdev,
        if (plat->msi_sfty_ue_vec < STMMAC_MSI_VEC_MAX)
                res->sfty_ue_irq = pci_irq_vector(pdev, plat->msi_sfty_ue_vec);
 
-       plat->multi_msi_en = 1;
+       plat->flags |= STMMAC_FLAG_MULTI_MSI_EN;
        dev_info(&pdev->dev, "%s: multi MSI enablement successful\n", __func__);
 
        return 0;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index c5763f6..ebe82e7 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3711,7 +3711,7 @@ static int stmmac_request_irq(struct net_device *dev)
        int ret;
 
        /* Request the IRQ lines */
-       if (priv->plat->multi_msi_en)
+       if (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN)
                ret = stmmac_request_irq_multi_msi(dev);
        else
                ret = stmmac_request_irq_single(dev);
@@ -5954,7 +5954,7 @@ static void stmmac_poll_controller(struct net_device *dev)
        if (test_bit(STMMAC_DOWN, &priv->state))
                return;
 
-       if (priv->plat->multi_msi_en) {
+       if (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN) {
                for (i = 0; i < priv->plat->rx_queues_to_use; i++)
                        stmmac_msi_intr_rx(0, &priv->dma_conf.rx_queue[i]);
 
@@ -7169,7 +7169,8 @@ int stmmac_dvr_probe(struct device *device,
        priv->plat = plat_dat;
        priv->ioaddr = res->addr;
        priv->dev->base_addr = (unsigned long)res->addr;
-       priv->plat->dma_cfg->multi_msi_en = priv->plat->multi_msi_en;
+       priv->plat->dma_cfg->multi_msi_en =
+               (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN);
 
        priv->dev->irq = res->irq;
        priv->wol_irq = res->wol_irq;

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 155cb11..3365b80 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -211,6 +211,7 @@ struct dwmac4_addrs {
 #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)
+#define STMMAC_FLAG_MULTI_MSI_EN               BIT(7)
 
 struct plat_stmmacenet_data {
        int bus_id;
@@ -286,7 +287,6 @@ struct plat_stmmacenet_data {
        int ext_snapshot_num;
        bool int_snapshot_en;
        bool ext_snapshot_en;
-       bool multi_msi_en;
        int msi_mac_vec;
        int msi_wol_vec;
        int msi_lpi_vec;