net: stmmac: use u8 for ?x_queues_to_use and number_?x_queues

The maximum number of queues is a compile time constant of only eight.
This makes using a 32-bit quantity wastefulf. Instead, use u8 for
these and their associated variables.

When reading the DT properties, saturdate at U8_MAX. Provided the core
provides DMA capabilities to describe the number of queues, this will
be capped by stmmac_hw_init() with a warning.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Link: https://patch.msgid.link/E1vzX5K-0000000CVsE-0J0Y@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 46454e2886ce9d4288b5ee261e55457225dcf923..f1628de8ed18dfb4e43cf13dd7cc7474d646039f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -446,8 +446,8 @@ struct dma_features {
        unsigned int number_rx_channel;
        unsigned int number_tx_channel;
        /* TX and RX number of queues */
-       unsigned int number_rx_queues;
-       unsigned int number_tx_queues;
+       u8 number_rx_queues;
+       u8 number_tx_queues;
        /* PPS output */
        unsigned int pps_out_num;
        /* Number of Traffic Classes */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
index 6dbe5d5a32240a9c1e788fe35fcb5a40de23c9ef..48c52eb9623356b12b39e5c0105d745e237007d6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
@@ -718,7 +718,7 @@ static void sun8i_dwmac_set_filter(struct mac_device_info *hw,
 
 static void sun8i_dwmac_flow_ctrl(struct mac_device_info *hw,
                                  unsigned int duplex, unsigned int fc,
-                                 unsigned int pause_time, u32 tx_cnt)
+                                 unsigned int pause_time, u8 tx_cnt)
 {
        void __iomem *ioaddr = hw->pcsr;
        u32 v;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index c7cb306726042799695eff2ac979316096b397c2..01f8353eb6ef2d2247be23bca13e996138000605 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -222,7 +222,7 @@ static void dwmac1000_set_filter(struct mac_device_info *hw,
 
 static void dwmac1000_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
                                unsigned int fc, unsigned int pause_time,
-                               u32 tx_cnt)
+                               u8 tx_cnt)
 {
        void __iomem *ioaddr = hw->pcsr;
        /* Set flow such that DZPQ in Mac Register 6 is 0,

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 6b5cf3a0866a3dacc1b25d839905ebadc74d4e3f..94d24d355d957ac09efbbe6c5e2c7995d07a0952 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -126,7 +126,7 @@ static void dwmac100_set_filter(struct mac_device_info *hw,
 
 static void dwmac100_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
                               unsigned int fc, unsigned int pause_time,
-                              u32 tx_cnt)
+                              u8 tx_cnt)
 {
        void __iomem *ioaddr = hw->pcsr;
        unsigned int flow = MAC_FLOW_CTRL_ENABLE;

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index e6bcb77b22a2a162e036ec639b399f8553d06e75..4c6fed3ecbcf55abc8f0a8cf93d6bdb3c0420b59 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -547,11 +547,11 @@ static void dwmac4_set_filter(struct mac_device_info *hw,
 
 static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
                             unsigned int fc, unsigned int pause_time,
-                            u32 tx_cnt)
+                            u8 tx_cnt)
 {
        void __iomem *ioaddr = hw->pcsr;
        unsigned int flow = 0;
-       u32 queue = 0;
+       u8 queue;
 
        pr_debug("GMAC Flow-Control:\n");
        if (fc & FLOW_RX) {

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
index efa76b147f9e567497f49842b43cec83a46748bb..f02b434bbd505bcbad8f15ec14c523d30dfa6d96 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
@@ -355,10 +355,10 @@ static int dwxgmac2_host_mtl_irq_status(struct stmmac_priv *priv,
 
 static void dwxgmac2_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
                               unsigned int fc, unsigned int pause_time,
-                              u32 tx_cnt)
+                              u8 tx_cnt)
 {
        void __iomem *ioaddr = hw->pcsr;
-       u32 i;
+       u8 i;
 
        if (fc & FLOW_RX)
                writel(XGMAC_RFE, ioaddr + XGMAC_RX_FLOW_CTRL);

diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h
index 374f326efa013a0810a3909e7a258f1450e4ea79..010b4d32484ad34222338717bd210f8579f12248 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@ -352,7 +352,7 @@ struct stmmac_ops {
        void (*set_filter)(struct mac_device_info *hw, struct net_device *dev);
        /* Flow control setting */
        void (*flow_ctrl)(struct mac_device_info *hw, unsigned int duplex,
-                         unsigned int fc, unsigned int pause_time, u32 tx_cnt);
+                         unsigned int fc, unsigned int pause_time, u8 tx_cnt);
        /* Set power management mode (e.g. magic frame) */
        void (*pmt)(struct mac_device_info *hw, unsigned long mode);
        /* Set/Get Unicast MAC addresses */

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index 335e60439b42fca009811d42b7d6b0e6d6c6187d..bba9bb9c95bf07b736b4f8b41ca3ea1c9543463b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -407,7 +407,7 @@ void stmmac_dvr_remove(struct device *dev);
 int stmmac_dvr_probe(struct device *device,
                     struct plat_stmmacenet_data *plat_dat,
                     struct stmmac_resources *res);
-int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt);
+int stmmac_reinit_queues(struct net_device *dev, u8 rx_cnt, u8 tx_cnt);
 int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size);
 int stmmac_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
                           phy_interface_t interface, int speed);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 939431255fa5086639ad24c43ee47d980b07f8ca..11150bddd8726dd6c092db0ad302d4a33dcb8bf2 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -264,10 +264,10 @@ static void stmmac_verify_args(void)
 
 static void __stmmac_disable_all_queues(struct stmmac_priv *priv)
 {
-       u32 rx_queues_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_queues_cnt = priv->plat->tx_queues_to_use;
-       u32 maxq = max(rx_queues_cnt, tx_queues_cnt);
-       u32 queue;
+       u8 rx_queues_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_queues_cnt = priv->plat->tx_queues_to_use;
+       u8 maxq = max(rx_queues_cnt, tx_queues_cnt);
+       u8 queue;
 
        for (queue = 0; queue < maxq; queue++) {
                struct stmmac_channel *ch = &priv->channel[queue];
@@ -291,9 +291,9 @@ static void __stmmac_disable_all_queues(struct stmmac_priv *priv)
  */
 static void stmmac_disable_all_queues(struct stmmac_priv *priv)
 {
-       u32 rx_queues_cnt = priv->plat->rx_queues_to_use;
+       u8 rx_queues_cnt = priv->plat->rx_queues_to_use;
        struct stmmac_rx_queue *rx_q;
-       u32 queue;
+       u8 queue;
 
        /* synchronize_rcu() needed for pending XDP buffers to drain */
        for (queue = 0; queue < rx_queues_cnt; queue++) {
@@ -313,10 +313,10 @@ static void stmmac_disable_all_queues(struct stmmac_priv *priv)
  */
 static void stmmac_enable_all_queues(struct stmmac_priv *priv)
 {
-       u32 rx_queues_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_queues_cnt = priv->plat->tx_queues_to_use;
-       u32 maxq = max(rx_queues_cnt, tx_queues_cnt);
-       u32 queue;
+       u8 rx_queues_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_queues_cnt = priv->plat->tx_queues_to_use;
+       u8 maxq = max(rx_queues_cnt, tx_queues_cnt);
+       u8 queue;
 
        for (queue = 0; queue < maxq; queue++) {
                struct stmmac_channel *ch = &priv->channel[queue];
@@ -377,8 +377,8 @@ static inline u32 stmmac_rx_dirty(struct stmmac_priv *priv, u32 queue)
 
 static bool stmmac_eee_tx_busy(struct stmmac_priv *priv)
 {
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        /* check if all TX queues have the work finished */
        for (queue = 0; queue < tx_cnt; queue++) {
@@ -909,7 +909,7 @@ static int stmmac_legacy_serdes_power_up(struct stmmac_priv *priv)
 static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex,
                                 unsigned int flow_ctrl)
 {
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
 
        stmmac_flow_ctrl(priv, priv->hw, duplex, flow_ctrl, priv->pause_time,
                         tx_cnt);
@@ -1410,10 +1410,10 @@ static int stmmac_phylink_setup(struct stmmac_priv *priv)
 static void stmmac_display_rx_rings(struct stmmac_priv *priv,
                                    struct stmmac_dma_conf *dma_conf)
 {
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
        unsigned int desc_size;
        void *head_rx;
-       u32 queue;
+       u8 queue;
 
        /* Display RX rings */
        for (queue = 0; queue < rx_cnt; queue++) {
@@ -1438,10 +1438,10 @@ static void stmmac_display_rx_rings(struct stmmac_priv *priv,
 static void stmmac_display_tx_rings(struct stmmac_priv *priv,
                                    struct stmmac_dma_conf *dma_conf)
 {
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
        unsigned int desc_size;
        void *head_tx;
-       u32 queue;
+       u8 queue;
 
        /* Display TX rings */
        for (queue = 0; queue < tx_cnt; queue++) {
@@ -1571,9 +1571,9 @@ static void stmmac_clear_tx_descriptors(struct stmmac_priv *priv,
 static void stmmac_clear_descriptors(struct stmmac_priv *priv,
                                     struct stmmac_dma_conf *dma_conf)
 {
-       u32 rx_queue_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_queue_cnt = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 rx_queue_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_queue_cnt = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        /* Clear the RX descriptors */
        for (queue = 0; queue < rx_queue_cnt; queue++)
@@ -1891,7 +1891,7 @@ static int init_dma_rx_desc_rings(struct net_device *dev,
                                  gfp_t flags)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 rx_count = priv->plat->rx_queues_to_use;
+       u8 rx_count = priv->plat->rx_queues_to_use;
        int queue;
        int ret;
 
@@ -1985,8 +1985,8 @@ static int init_dma_tx_desc_rings(struct net_device *dev,
                                  struct stmmac_dma_conf *dma_conf)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 tx_queue_cnt;
-       u32 queue;
+       u8 tx_queue_cnt;
+       u8 queue;
 
        tx_queue_cnt = priv->plat->tx_queues_to_use;
 
@@ -2057,8 +2057,8 @@ static void dma_free_tx_skbufs(struct stmmac_priv *priv,
  */
 static void stmmac_free_tx_skbufs(struct stmmac_priv *priv)
 {
-       u32 tx_queue_cnt = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 tx_queue_cnt = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        for (queue = 0; queue < tx_queue_cnt; queue++)
                dma_free_tx_skbufs(priv, &priv->dma_conf, queue);
@@ -2106,8 +2106,8 @@ static void __free_dma_rx_desc_resources(struct stmmac_priv *priv,
 static void free_dma_rx_desc_resources(struct stmmac_priv *priv,
                                       struct stmmac_dma_conf *dma_conf)
 {
-       u32 rx_count = priv->plat->rx_queues_to_use;
-       u32 queue;
+       u8 rx_count = priv->plat->rx_queues_to_use;
+       u8 queue;
 
        /* Free RX queue resources */
        for (queue = 0; queue < rx_count; queue++)
@@ -2153,8 +2153,8 @@ static void __free_dma_tx_desc_resources(struct stmmac_priv *priv,
 static void free_dma_tx_desc_resources(struct stmmac_priv *priv,
                                       struct stmmac_dma_conf *dma_conf)
 {
-       u32 tx_count = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 tx_count = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        /* Free TX queue resources */
        for (queue = 0; queue < tx_count; queue++)
@@ -2255,8 +2255,8 @@ static int __alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
 static int alloc_dma_rx_desc_resources(struct stmmac_priv *priv,
                                       struct stmmac_dma_conf *dma_conf)
 {
-       u32 rx_count = priv->plat->rx_queues_to_use;
-       u32 queue;
+       u8 rx_count = priv->plat->rx_queues_to_use;
+       u8 queue;
        int ret;
 
        /* RX queues buffers and DMA */
@@ -2331,8 +2331,8 @@ static int __alloc_dma_tx_desc_resources(struct stmmac_priv *priv,
 static int alloc_dma_tx_desc_resources(struct stmmac_priv *priv,
                                       struct stmmac_dma_conf *dma_conf)
 {
-       u32 tx_count = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 tx_count = priv->plat->tx_queues_to_use;
+       u8 queue;
        int ret;
 
        /* TX queues buffers and DMA */
@@ -2396,8 +2396,8 @@ static void free_dma_desc_resources(struct stmmac_priv *priv,
  */
 static void stmmac_mac_enable_rx_queues(struct stmmac_priv *priv)
 {
-       u32 rx_queues_count = priv->plat->rx_queues_to_use;
-       int queue;
+       u8 rx_queues_count = priv->plat->rx_queues_to_use;
+       u8 queue;
        u8 mode;
 
        for (queue = 0; queue < rx_queues_count; queue++) {
@@ -2460,10 +2460,10 @@ static void stmmac_stop_tx_dma(struct stmmac_priv *priv, u32 chan)
 
 static void stmmac_enable_all_dma_irq(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
-       u32 dma_csr_ch = max(rx_channels_count, tx_channels_count);
-       u32 chan;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 dma_csr_ch = max(rx_channels_count, tx_channels_count);
+       u8 chan;
 
        for (chan = 0; chan < dma_csr_ch; chan++) {
                struct stmmac_channel *ch = &priv->channel[chan];
@@ -2483,9 +2483,9 @@ static void stmmac_enable_all_dma_irq(struct stmmac_priv *priv)
  */
 static void stmmac_start_all_dma(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
-       u32 chan = 0;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 chan;
 
        for (chan = 0; chan < rx_channels_count; chan++)
                stmmac_start_rx_dma(priv, chan);
@@ -2502,9 +2502,9 @@ static void stmmac_start_all_dma(struct stmmac_priv *priv)
  */
 static void stmmac_stop_all_dma(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
-       u32 chan = 0;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 chan;
 
        for (chan = 0; chan < rx_channels_count; chan++)
                stmmac_stop_rx_dma(priv, chan);
@@ -2521,14 +2521,14 @@ static void stmmac_stop_all_dma(struct stmmac_priv *priv)
  */
 static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
        int rxfifosz = priv->plat->rx_fifo_size;
        int txfifosz = priv->plat->tx_fifo_size;
        u32 txmode = 0;
        u32 rxmode = 0;
-       u32 chan = 0;
        u8 qmode = 0;
+       u8 chan;
 
        if (rxfifosz == 0)
                rxfifosz = priv->dma_cap.rx_fifo_size;
@@ -3012,8 +3012,8 @@ static void stmmac_set_dma_operation_mode(struct stmmac_priv *priv, u32 txmode,
 {
        u8 rxqmode = priv->plat->rx_queues_cfg[chan].mode_to_use;
        u8 txqmode = priv->plat->tx_queues_cfg[chan].mode_to_use;
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
        int rxfifosz = priv->plat->rx_fifo_size;
        int txfifosz = priv->plat->tx_fifo_size;
 
@@ -3088,12 +3088,12 @@ static int stmmac_napi_check(struct stmmac_priv *priv, u32 chan, u32 dir)
  */
 static void stmmac_dma_interrupt(struct stmmac_priv *priv)
 {
-       u32 tx_channel_count = priv->plat->tx_queues_to_use;
-       u32 rx_channel_count = priv->plat->rx_queues_to_use;
-       u32 channels_to_check = tx_channel_count > rx_channel_count ?
-                               tx_channel_count : rx_channel_count;
-       u32 chan;
+       u8 tx_channel_count = priv->plat->tx_queues_to_use;
+       u8 rx_channel_count = priv->plat->rx_queues_to_use;
+       u8 channels_to_check = tx_channel_count > rx_channel_count ?
+                              tx_channel_count : rx_channel_count;
        int status[MAX_T(u32, MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES)];
+       u8 chan;
 
        /* Make sure we never check beyond our status buffer. */
        if (WARN_ON_ONCE(channels_to_check > ARRAY_SIZE(status)))
@@ -3237,13 +3237,13 @@ static int stmmac_prereset_configure(struct stmmac_priv *priv)
  */
 static int stmmac_init_dma_engine(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
-       u32 dma_csr_ch = max(rx_channels_count, tx_channels_count);
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 dma_csr_ch = max(rx_channels_count, tx_channels_count);
        struct stmmac_rx_queue *rx_q;
        struct stmmac_tx_queue *tx_q;
-       u32 chan = 0;
        int ret = 0;
+       u8 chan;
 
        ret = stmmac_prereset_configure(priv);
        if (ret)
@@ -3359,9 +3359,9 @@ static enum hrtimer_restart stmmac_tx_timer(struct hrtimer *t)
  */
 static void stmmac_init_coalesce(struct stmmac_priv *priv)
 {
-       u32 tx_channel_count = priv->plat->tx_queues_to_use;
-       u32 rx_channel_count = priv->plat->rx_queues_to_use;
-       u32 chan;
+       u8 tx_channel_count = priv->plat->tx_queues_to_use;
+       u8 rx_channel_count = priv->plat->rx_queues_to_use;
+       u8 chan;
 
        for (chan = 0; chan < tx_channel_count; chan++) {
                struct stmmac_tx_queue *tx_q = &priv->dma_conf.tx_queue[chan];
@@ -3378,9 +3378,9 @@ static void stmmac_init_coalesce(struct stmmac_priv *priv)
 
 static void stmmac_set_rings_length(struct stmmac_priv *priv)
 {
-       u32 rx_channels_count = priv->plat->rx_queues_to_use;
-       u32 tx_channels_count = priv->plat->tx_queues_to_use;
-       u32 chan;
+       u8 rx_channels_count = priv->plat->rx_queues_to_use;
+       u8 tx_channels_count = priv->plat->tx_queues_to_use;
+       u8 chan;
 
        /* set TX ring length */
        for (chan = 0; chan < tx_channels_count; chan++)
@@ -3400,9 +3400,9 @@ static void stmmac_set_rings_length(struct stmmac_priv *priv)
  */
 static void stmmac_set_tx_queue_weight(struct stmmac_priv *priv)
 {
-       u32 tx_queues_count = priv->plat->tx_queues_to_use;
+       u8 tx_queues_count = priv->plat->tx_queues_to_use;
        u32 weight;
-       u32 queue;
+       u8 queue;
 
        for (queue = 0; queue < tx_queues_count; queue++) {
                weight = priv->plat->tx_queues_cfg[queue].weight;
@@ -3417,9 +3417,9 @@ static void stmmac_set_tx_queue_weight(struct stmmac_priv *priv)
  */
 static void stmmac_configure_cbs(struct stmmac_priv *priv)
 {
-       u32 tx_queues_count = priv->plat->tx_queues_to_use;
+       u8 tx_queues_count = priv->plat->tx_queues_to_use;
        u32 mode_to_use;
-       u32 queue;
+       u8 queue;
 
        /* queue 0 is reserved for legacy traffic */
        for (queue = 1; queue < tx_queues_count; queue++) {
@@ -3443,8 +3443,8 @@ static void stmmac_configure_cbs(struct stmmac_priv *priv)
  */
 static void stmmac_rx_queue_dma_chan_map(struct stmmac_priv *priv)
 {
-       u32 rx_queues_count = priv->plat->rx_queues_to_use;
-       u32 queue;
+       u8 rx_queues_count = priv->plat->rx_queues_to_use;
+       u8 queue;
        u32 chan;
 
        for (queue = 0; queue < rx_queues_count; queue++) {
@@ -3460,8 +3460,8 @@ static void stmmac_rx_queue_dma_chan_map(struct stmmac_priv *priv)
  */
 static void stmmac_mac_config_rx_queues_prio(struct stmmac_priv *priv)
 {
-       u32 rx_queues_count = priv->plat->rx_queues_to_use;
-       u32 queue;
+       u8 rx_queues_count = priv->plat->rx_queues_to_use;
+       u8 queue;
        u32 prio;
 
        for (queue = 0; queue < rx_queues_count; queue++) {
@@ -3480,8 +3480,8 @@ static void stmmac_mac_config_rx_queues_prio(struct stmmac_priv *priv)
  */
 static void stmmac_mac_config_tx_queues_prio(struct stmmac_priv *priv)
 {
-       u32 tx_queues_count = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 tx_queues_count = priv->plat->tx_queues_to_use;
+       u8 queue;
        u32 prio;
 
        for (queue = 0; queue < tx_queues_count; queue++) {
@@ -3500,9 +3500,9 @@ static void stmmac_mac_config_tx_queues_prio(struct stmmac_priv *priv)
  */
 static void stmmac_mac_config_rx_queues_routing(struct stmmac_priv *priv)
 {
-       u32 rx_queues_count = priv->plat->rx_queues_to_use;
-       u32 queue;
+       u8 rx_queues_count = priv->plat->rx_queues_to_use;
        u8 packet;
+       u8 queue;
 
        for (queue = 0; queue < rx_queues_count; queue++) {
                /* no specific packet type routing specified for the queue */
@@ -3537,8 +3537,8 @@ static void stmmac_mac_config_rss(struct stmmac_priv *priv)
  */
 static void stmmac_mtl_configuration(struct stmmac_priv *priv)
 {
-       u32 rx_queues_count = priv->plat->rx_queues_to_use;
-       u32 tx_queues_count = priv->plat->tx_queues_to_use;
+       u8 rx_queues_count = priv->plat->rx_queues_to_use;
+       u8 tx_queues_count = priv->plat->tx_queues_to_use;
 
        if (tx_queues_count > 1)
                stmmac_set_tx_queue_weight(priv);
@@ -3606,10 +3606,10 @@ static void stmmac_safety_feat_configuration(struct stmmac_priv *priv)
 static int stmmac_hw_setup(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
        bool sph_en;
-       u32 chan;
+       u8 chan;
        int ret;
 
        /* Make sure RX clock is enabled */
@@ -4001,7 +4001,8 @@ static struct stmmac_dma_conf *
 stmmac_setup_dma_desc(struct stmmac_priv *priv, unsigned int mtu)
 {
        struct stmmac_dma_conf *dma_conf;
-       int chan, bfsize, ret;
+       int bfsize, ret;
+       u8 chan;
 
        dma_conf = kzalloc_obj(*dma_conf);
        if (!dma_conf) {
@@ -4076,7 +4077,7 @@ static int __stmmac_open(struct net_device *dev,
                         struct stmmac_dma_conf *dma_conf)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 chan;
+       u8 chan;
        int ret;
 
        for (int i = 0; i < MTL_MAX_TX_QUEUES; i++)
@@ -4175,7 +4176,7 @@ err_dma_resources:
 static void __stmmac_release(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 chan;
+       u8 chan;
 
        /* Stop and disconnect the PHY */
        phylink_stop(priv->phylink);
@@ -6123,7 +6124,7 @@ static int stmmac_set_features(struct net_device *netdev,
 
        if (priv->sph_capable) {
                bool sph_en = (priv->hw->rx_csum > 0) && priv->sph_active;
-               u32 chan;
+               u8 chan;
 
                for (chan = 0; chan < priv->plat->rx_queues_to_use; chan++)
                        stmmac_enable_sph(priv, priv->ioaddr, sph_en, chan);
@@ -6143,11 +6144,11 @@ static int stmmac_set_features(struct net_device *netdev,
 
 static void stmmac_common_interrupt(struct stmmac_priv *priv)
 {
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
-       u32 queues_count;
-       u32 queue;
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 queues_count;
        bool xmac;
+       u8 queue;
 
        xmac = dwmac_is_xmac(priv->plat->core_type);
        queues_count = (rx_cnt > tx_cnt) ? rx_cnt : tx_cnt;
@@ -6445,9 +6446,9 @@ static int stmmac_rings_status_show(struct seq_file *seq, void *v)
 {
        struct net_device *dev = seq->private;
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 rx_count = priv->plat->rx_queues_to_use;
-       u32 tx_count = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 rx_count = priv->plat->rx_queues_to_use;
+       u8 tx_count = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        if ((dev->flags & IFF_UP) == 0)
                return 0;
@@ -6572,9 +6573,9 @@ static int stmmac_dma_cap_show(struct seq_file *seq, void *v)
                   priv->dma_cap.number_rx_channel);
        seq_printf(seq, "\tNumber of Additional TX channel: %d\n",
                   priv->dma_cap.number_tx_channel);
-       seq_printf(seq, "\tNumber of Additional RX queues: %d\n",
+       seq_printf(seq, "\tNumber of Additional RX queues: %u\n",
                   priv->dma_cap.number_rx_queues);
-       seq_printf(seq, "\tNumber of Additional TX queues: %d\n",
+       seq_printf(seq, "\tNumber of Additional TX queues: %u\n",
                   priv->dma_cap.number_tx_queues);
        seq_printf(seq, "\tEnhanced descriptors: %s\n",
                   (priv->dma_cap.enh_desc) ? "Y" : "N");
@@ -7043,7 +7044,7 @@ void stmmac_enable_tx_queue(struct stmmac_priv *priv, u32 queue)
 void stmmac_xdp_release(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 chan;
+       u8 chan;
 
        /* Ensure tx function is not running */
        netif_tx_disable(dev);
@@ -7076,14 +7077,14 @@ void stmmac_xdp_release(struct net_device *dev)
 int stmmac_xdp_open(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
-       u32 dma_csr_ch = max(rx_cnt, tx_cnt);
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 dma_csr_ch = max(rx_cnt, tx_cnt);
        struct stmmac_rx_queue *rx_q;
        struct stmmac_tx_queue *tx_q;
        u32 buf_size;
        bool sph_en;
-       u32 chan;
+       u8 chan;
        int ret;
 
        ret = alloc_dma_desc_resources(priv, &priv->dma_conf);
@@ -7219,10 +7220,10 @@ int stmmac_xsk_wakeup(struct net_device *dev, u32 queue, u32 flags)
 static void stmmac_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
        unsigned int start;
-       int q;
+       u8 q;
 
        for (q = 0; q < tx_cnt; q++) {
                struct stmmac_txq_stats *txq_stats = &priv->xstats.txq_stats[q];
@@ -7511,7 +7512,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
 static void stmmac_napi_add(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 queue, maxq;
+       u8 queue, maxq;
 
        maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);
 
@@ -7540,7 +7541,7 @@ static void stmmac_napi_add(struct net_device *dev)
 static void stmmac_napi_del(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
-       u32 queue, maxq;
+       u8 queue, maxq;
 
        maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);
 
@@ -7558,7 +7559,7 @@ static void stmmac_napi_del(struct net_device *dev)
        }
 }
 
-int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt)
+int stmmac_reinit_queues(struct net_device *dev, u8 rx_cnt, u8 tx_cnt)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
        int ret = 0, i;
@@ -7763,8 +7764,8 @@ static int __stmmac_dvr_probe(struct device *device,
 {
        struct net_device *ndev = NULL;
        struct stmmac_priv *priv;
-       u32 rxq;
        int i, ret = 0;
+       u8 rxq;
 
        if (!plat_dat->dma_cfg || !plat_dat->dma_cfg->pbl) {
                dev_err(device, "invalid DMA configuration\n");
@@ -8147,7 +8148,7 @@ int stmmac_suspend(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
        struct stmmac_priv *priv = netdev_priv(ndev);
-       u32 chan;
+       u8 chan;
 
        if (!ndev || !netif_running(ndev))
                goto suspend_bsp;
@@ -8222,9 +8223,9 @@ static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue)
  */
 static void stmmac_reset_queues_param(struct stmmac_priv *priv)
 {
-       u32 rx_cnt = priv->plat->rx_queues_to_use;
-       u32 tx_cnt = priv->plat->tx_queues_to_use;
-       u32 queue;
+       u8 rx_cnt = priv->plat->rx_queues_to_use;
+       u8 tx_cnt = priv->plat->tx_queues_to_use;
+       u8 queue;
 
        for (queue = 0; queue < rx_cnt; queue++)
                stmmac_reset_rx_queue(priv, queue);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 0d3bad0f8915e10f7e10c326be50e6823fd3b2a5..3b514a702612d537d4a6672161f46916c35b117c 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -138,6 +138,7 @@ static int stmmac_mtl_setup(struct platform_device *pdev,
        struct device_node *tx_node;
        u8 queue = 0;
        int ret = 0;
+       u32 value;
 
        /* First Queue must always be in DCB mode. As MTL_QUEUE_DCB = 1 we need
         * to always set this, otherwise Queue will be classified as AVB
@@ -157,8 +158,11 @@ static int stmmac_mtl_setup(struct platform_device *pdev,
        }
 
        /* Processing RX queues common config */
-       of_property_read_u32(rx_node, "snps,rx-queues-to-use",
-                            &plat->rx_queues_to_use);
+       if (!of_property_read_u32(rx_node, "snps,rx-queues-to-use", &value)) {
+               if (value > U8_MAX)
+                       value = U8_MAX;
+               plat->rx_queues_to_use = value;
+       }
 
        if (of_property_read_bool(rx_node, "snps,rx-sched-sp"))
                plat->rx_sched_algorithm = MTL_RX_ALGORITHM_SP;
@@ -208,8 +212,11 @@ static int stmmac_mtl_setup(struct platform_device *pdev,
        }
 
        /* Processing TX queues common config */
-       of_property_read_u32(tx_node, "snps,tx-queues-to-use",
-                            &plat->tx_queues_to_use);
+       if (!of_property_read_u32(tx_node, "snps,tx-queues-to-use", &value)) {
+               if (value > U8_MAX)
+                       value = U8_MAX;
+               plat->tx_queues_to_use = value;
+       }
 
        if (of_property_read_bool(tx_node, "snps,tx-sched-wrr"))
                plat->tx_sched_algorithm = MTL_TX_ALGORITHM_WRR;

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 411cdd3ea034223712d3f205e88348a1cdc6aedc..03fd85060a736d2f734943f1b9bf5b213987d175 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -244,8 +244,8 @@ struct plat_stmmacenet_data {
        int tx_fifo_size;
        int rx_fifo_size;
        u32 host_dma_width;
-       u32 rx_queues_to_use;
-       u32 tx_queues_to_use;
+       u8 rx_queues_to_use;
+       u8 tx_queues_to_use;
        u8 rx_sched_algorithm;
        u8 tx_sched_algorithm;
        struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];