net: stmmac: convert priv->sph* to boolean and rename

priv->sph* only have 'true' and 'false' used with them, yet they are an
int. Change their type to a bool, and rename to make their usage more
clear.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/E1vLIDN-0000000Evur-2NLU@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index e9ed5086c049d2c3020d8aed44b2c8b3c0be7977..012b0a477255df73b2e145b62e09eeb2133e827a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -254,8 +254,8 @@ struct stmmac_priv {
        int hwts_tx_en;
        bool tx_path_in_lpi_mode;
        bool tso;
-       int sph;
-       int sph_cap;
+       bool sph_active;
+       bool sph_capable;
        u32 sarc_type;
        u32 rx_riwt[MTL_MAX_RX_QUEUES];
        int hwts_rx_en;

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index a862d5f91fce36cc2ed256d6c46727664aca7a02..32edeeef9d8fa3ca0fdeccabafd74c67484c953d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1527,7 +1527,7 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv,
                buf->page_offset = stmmac_rx_offset(priv);
        }
 
-       if (priv->sph && !buf->sec_page) {
+       if (priv->sph_active && !buf->sec_page) {
                buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
                if (!buf->sec_page)
                        return -ENOMEM;
@@ -2113,7 +2113,7 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
        pp_params.offset = stmmac_rx_offset(priv);
        pp_params.max_len = dma_conf->dma_buf_sz;
 
-       if (priv->sph) {
+       if (priv->sph_active) {
                pp_params.offset = 0;
                pp_params.max_len += stmmac_rx_offset(priv);
        }
@@ -3607,7 +3607,7 @@ static int stmmac_hw_setup(struct net_device *dev)
        }
 
        /* Enable Split Header */
-       sph_en = (priv->hw->rx_csum > 0) && priv->sph;
+       sph_en = (priv->hw->rx_csum > 0) && priv->sph_active;
        for (chan = 0; chan < rx_cnt; chan++)
                stmmac_enable_sph(priv, priv->ioaddr, sph_en, chan);
 
@@ -4899,7 +4899,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
                                break;
                }
 
-               if (priv->sph && !buf->sec_page) {
+               if (priv->sph_active && !buf->sec_page) {
                        buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
                        if (!buf->sec_page)
                                break;
@@ -4910,7 +4910,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
                buf->addr = page_pool_get_dma_addr(buf->page) + buf->page_offset;
 
                stmmac_set_desc_addr(priv, p, buf->addr);
-               if (priv->sph)
+               if (priv->sph_active)
                        stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
                else
                        stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
@@ -4945,12 +4945,12 @@ static unsigned int stmmac_rx_buf1_len(struct stmmac_priv *priv,
        int coe = priv->hw->rx_csum;
 
        /* Not first descriptor, buffer is always zero */
-       if (priv->sph && len)
+       if (priv->sph_active && len)
                return 0;
 
        /* First descriptor, get split header length */
        stmmac_get_rx_header_len(priv, p, &hlen);
-       if (priv->sph && hlen) {
+       if (priv->sph_active && hlen) {
                priv->xstats.rx_split_hdr_pkt_n++;
                return hlen;
        }
@@ -4973,7 +4973,7 @@ static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
        unsigned int plen = 0;
 
        /* Not split header, buffer is not available */
-       if (!priv->sph)
+       if (!priv->sph_active)
                return 0;
 
        /* Not last descriptor */
@@ -6041,8 +6041,8 @@ static int stmmac_set_features(struct net_device *netdev,
         */
        stmmac_rx_ipc(priv, priv->hw);
 
-       if (priv->sph_cap) {
-               bool sph_en = (priv->hw->rx_csum > 0) && priv->sph;
+       if (priv->sph_capable) {
+               bool sph_en = (priv->hw->rx_csum > 0) && priv->sph_active;
                u32 chan;
 
                for (chan = 0; chan < priv->plat->rx_queues_to_use; chan++)
@@ -6991,7 +6991,7 @@ int stmmac_xdp_open(struct net_device *dev)
        }
 
        /* Adjust Split header */
-       sph_en = (priv->hw->rx_csum > 0) && priv->sph;
+       sph_en = (priv->hw->rx_csum > 0) && priv->sph_active;
 
        /* DMA RX Channel Configuration */
        for (chan = 0; chan < rx_cnt; chan++) {
@@ -7740,8 +7740,8 @@ int stmmac_dvr_probe(struct device *device,
        if (priv->dma_cap.sphen &&
            !(priv->plat->flags & STMMAC_FLAG_SPH_DISABLE)) {
                ndev->hw_features |= NETIF_F_GRO;
-               priv->sph_cap = true;
-               priv->sph = priv->sph_cap;
+               priv->sph_capable = true;
+               priv->sph_active = priv->sph_capable;
                dev_info(priv->device, "SPH feature enabled\n");
        }
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
index a01bc394d1ac467ba15d2068629c7bbabc05ecc6..e90a2c469b9a6f576c1b6f99954af08bae69007c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
@@ -1721,7 +1721,7 @@ static int stmmac_test_sph(struct stmmac_priv *priv)
        struct stmmac_packet_attrs attr = { };
        int ret;
 
-       if (!priv->sph)
+       if (!priv->sph_active)
                return -EOPNOTSUPP;
 
        /* Check for UDP first */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c
index aa6f16d3df649e8742584e0aacf83204acc1030c..d7e4db7224b0c1e7f1f92b870b849407a5b0d358 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c
@@ -129,7 +129,7 @@ int stmmac_xdp_set_prog(struct stmmac_priv *priv, struct bpf_prog *prog,
                bpf_prog_put(old_prog);
 
        /* Disable RX SPH for XDP operation */
-       priv->sph = priv->sph_cap && !stmmac_xdp_is_enabled(priv);
+       priv->sph_active = priv->sph_capable && !stmmac_xdp_is_enabled(priv);
 
        if (if_running && need_update)
                stmmac_xdp_open(dev);