[OpenWrt-Devel] [PATCH 2/5] ar71xx: Clear bits in ath79_setup_qca955x_eth_cfg

[John Crispin]

On 08/03/2016 18:39, Sven Eckelmann wrote:
> From: Sven Eckelmann <sven.eckelmann at open-mesh.com>
> 
> Some u-boot versions for QCA955x set currently not cleared bits depending
> on the used link speed. This breaks the rx/tx under OpenWrt. The mach-*.c
> file is responsible to select the correct configuration bits and thus the
> ath79_setup_qca955x_eth_cfg has to clear the unset.
> 
> Signed-off-by: Sven Eckelmann <sven.eckelmann at open-mesh.com>
> ---
>  target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
> index b43c80a..2f2825f 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
> @@ -833,14 +833,24 @@ void __init ath79_setup_ar934x_eth_rx_delay(unsigned int rxd,
>  void __init ath79_setup_qca955x_eth_cfg(u32 mask)
>  {
>  	void __iomem *base;
> -	u32 t;
> +	u32 t, m;
> +
> +	m = QCA955X_ETH_CFG_RGMII_EN |
> +	    QCA955X_ETH_CFG_MII_GE0 |
> +	    QCA955X_ETH_CFG_GMII_GE0 |
> +	    QCA955X_ETH_CFG_MII_GE0_MASTER |
> +	    QCA955X_ETH_CFG_MII_GE0_SLAVE |
> +	    QCA955X_ETH_CFG_GE0_ERR_EN |
> +	    QCA955X_ETH_CFG_GE0_SGMII |
> +	    QCA955X_ETH_CFG_RMII_GE0 |
> +	    QCA955X_ETH_CFG_MII_CNTL_SPEED |
> +	    QCA955X_ETH_CFG_RMII_GE0_MASTER;
>  
>  	base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
>  
>  	t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
>  
> -	t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
> -
> +	t &= ~m;
>  	t |= mask;
>  
>  	__raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
> 

this seems to break boards that rely on the bits being set byt the
bootloader and dont explicitly set them in the kernel. i'll revert the
series when i am at my work pc tomorrow.

	John
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel