From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Brunner Subject: [PATCH] remove vlan tags in CPSW dual emac mode Date: Tue, 23 Apr 2013 18:18:47 +0200 Message-ID: <4699400.vD3TdgH1nR@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from mail-ee0-f47.google.com ([74.125.83.47]:37163 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932364Ab3DWQ3A (ORCPT ); Tue, 23 Apr 2013 12:29:00 -0400 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: netdev@vger.kernel.org, Mugunthan V N Cc: davem@davemloft.net, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Mark Jackson , systemprogrammierung.brunner@gmail.com If operating in dual emac mode all packets sent by the CPSW contain vlan headers with the reserved VID 0, which gets stripped away by all somewhat recent Linux versions. Operating systems without that behaviour will fail to communicate. This patch fixes that behaviour by disabling the VLAN_AWARE mode as already described by the comment above. Signed-off-by: Markus Brunner Tested-by: Mark Jackson --- --- linux-3.9-rc8.orig/drivers/net/ethernet/ti/cpsw.c 2013-04-23 17:26:11.000000000 +0200 +++ linux-3.9-rc8/drivers/net/ethernet/ti/cpsw.c 2013-04-23 17:36:25.000000000 +0200 @@ -751,9 +751,9 @@ static void cpsw_init_host_port(struct c /* switch to vlan unaware mode */ cpsw_ale_control_set(priv->ale, priv->host_port, ALE_VLAN_AWARE, CPSW_ALE_VLAN_AWARE); control_reg = readl(&priv->regs->control); - control_reg |= CPSW_VLAN_AWARE; + control_reg &= ~CPSW_VLAN_AWARE; writel(control_reg, &priv->regs->control); fifo_mode = (priv->data.dual_emac) ? CPSW_FIFO_DUAL_MAC_MODE : CPSW_FIFO_NORMAL_MODE; writel(fifo_mode, &priv->host_port_regs->tx_in_ctl); From mboxrd@z Thu Jan 1 00:00:00 1970 From: systemprogrammierung.brunner@gmail.com (Markus Brunner) Date: Tue, 23 Apr 2013 18:18:47 +0200 Subject: [PATCH] remove vlan tags in CPSW dual emac mode Message-ID: <4699400.vD3TdgH1nR@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org If operating in dual emac mode all packets sent by the CPSW contain vlan headers with the reserved VID 0, which gets stripped away by all somewhat recent Linux versions. Operating systems without that behaviour will fail to communicate. This patch fixes that behaviour by disabling the VLAN_AWARE mode as already described by the comment above. Signed-off-by: Markus Brunner Tested-by: Mark Jackson --- --- linux-3.9-rc8.orig/drivers/net/ethernet/ti/cpsw.c 2013-04-23 17:26:11.000000000 +0200 +++ linux-3.9-rc8/drivers/net/ethernet/ti/cpsw.c 2013-04-23 17:36:25.000000000 +0200 @@ -751,9 +751,9 @@ static void cpsw_init_host_port(struct c /* switch to vlan unaware mode */ cpsw_ale_control_set(priv->ale, priv->host_port, ALE_VLAN_AWARE, CPSW_ALE_VLAN_AWARE); control_reg = readl(&priv->regs->control); - control_reg |= CPSW_VLAN_AWARE; + control_reg &= ~CPSW_VLAN_AWARE; writel(control_reg, &priv->regs->control); fifo_mode = (priv->data.dual_emac) ? CPSW_FIFO_DUAL_MAC_MODE : CPSW_FIFO_NORMAL_MODE; writel(fifo_mode, &priv->host_port_regs->tx_in_ctl);