[PATCH] net: dwc_eth_qos: Revert some changes of commit 3a97da12ee7b

[Ramon Fried]

On Sun, May 30, 2021 at 4:28 PM Daniil Stas <daniil.stas at posteo.net> wrote:
>
> Revert some changes of commit 3a97da12ee7b ("net: dwc_eth_qos: add dwc
> eqos for imx support") that were probably added by mistake.
>
> One of these changes can lead to received data corruption (enabling
> FUP and FEP bits). Another causes invalid register rxq_ctrl0 settings
> for some platforms. And another makes some writes at unknown memory
> location.
>
> Fixes: 3a97da12ee7b ("net: dwc_eth_qos: add dwc eqos for imx support")
> Signed-off-by: Daniil Stas <daniil.stas at posteo.net>
> Cc: Ye Li <ye.li at nxp.com>
> Cc: Fugang Duan <fugang.duan at nxp.com>
> Cc: Peng Fan <peng.fan at nxp.com>
> Cc: Ramon Fried <rfried.dev at gmail.com>
> Cc: Joe Hershberger <joe.hershberger at ni.com>
> Cc: Patrice Chotard <patrice.chotard at foss.st.com>
> Cc: Patrick Delaunay <patrick.delaunay at foss.st.com>
> ---
>  drivers/net/dwc_eth_qos.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c
> index 2f088c758f..b012bed517 100644
> --- a/drivers/net/dwc_eth_qos.c
> +++ b/drivers/net/dwc_eth_qos.c
> @@ -172,8 +172,6 @@ struct eqos_mtl_regs {
>  #define EQOS_MTL_RXQ0_OPERATION_MODE_RFA_MASK          0x3f
>  #define EQOS_MTL_RXQ0_OPERATION_MODE_EHFC              BIT(7)
>  #define EQOS_MTL_RXQ0_OPERATION_MODE_RSF               BIT(5)
> -#define EQOS_MTL_RXQ0_OPERATION_MODE_FEP               BIT(4)
> -#define EQOS_MTL_RXQ0_OPERATION_MODE_FUP               BIT(3)
>
>  #define EQOS_MTL_RXQ0_DEBUG_PRXQ_SHIFT                 16
>  #define EQOS_MTL_RXQ0_DEBUG_PRXQ_MASK                  0x7fff
> @@ -1222,7 +1220,6 @@ static int eqos_start(struct udevice *dev)
>         }
>
>         /* Configure MTL */
> -       writel(0x60, &eqos->mtl_regs->txq0_quantum_weight - 0x100);
>
>         /* Enable Store and Forward mode for TX */
>         /* Program Tx operating mode */
> @@ -1236,9 +1233,7 @@ static int eqos_start(struct udevice *dev)
>
>         /* Enable Store and Forward mode for RX, since no jumbo frame */
>         setbits_le32(&eqos->mtl_regs->rxq0_operation_mode,
> -                    EQOS_MTL_RXQ0_OPERATION_MODE_RSF |
> -                    EQOS_MTL_RXQ0_OPERATION_MODE_FEP |
> -                    EQOS_MTL_RXQ0_OPERATION_MODE_FUP);
> +                    EQOS_MTL_RXQ0_OPERATION_MODE_RSF);
>
>         /* Transmit/Receive queue fifo size; use all RAM for 1 queue */
>         val = readl(&eqos->mac_regs->hw_feature1);
> @@ -1314,12 +1309,6 @@ static int eqos_start(struct udevice *dev)
>                         eqos->config->config_mac <<
>                         EQOS_MAC_RXQ_CTRL0_RXQ0EN_SHIFT);
>
> -       clrsetbits_le32(&eqos->mac_regs->rxq_ctrl0,
> -                       EQOS_MAC_RXQ_CTRL0_RXQ0EN_MASK <<
> -                       EQOS_MAC_RXQ_CTRL0_RXQ0EN_SHIFT,
> -                       0x2 <<
> -                       EQOS_MAC_RXQ_CTRL0_RXQ0EN_SHIFT);
> -
>         /* Multicast and Broadcast Queue Enable */
>         setbits_le32(&eqos->mac_regs->unused_0a4,
>                      0x00100000);
> --
> 2.31.1
>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>