From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from web37608.mail.mud.yahoo.com (web37608.mail.mud.yahoo.com [209.191.87.91]) by ozlabs.org (Postfix) with SMTP id 86770B70EE for ; Fri, 28 Jan 2011 15:37:50 +1100 (EST) Message-ID: <640295.36173.qm@web37608.mail.mud.yahoo.com> Date: Thu, 27 Jan 2011 20:37:48 -0800 (PST) From: Alex Dubov Subject: [PATCH v2] gianfar: Fall back to software tcp/udp checksum on older controllers To: Anton Vorontsov In-Reply-To: <20110127095100.GA5411@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, mlcreech@gmail.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , As specified by errata eTSEC49 of MPC8548 and errata eTSEC12 of MPC83xx,=0A= older revisions of gianfar controllers will be unable to calculate a TCP/UD= P=0Apacket checksum for some alignments of the appropriate FCB. This patch = checks=0Afor FCB alignment on such controllers and falls back to software c= hecksumming=0Aif the alignment is known to be bad.=0A=0ASigned-off-by: Alex= Dubov =0A---=0AChanges for v2:=0A - Make indentation sl= ightly more consistent.=0A - Replace bizarre switch-based condition with = plain boring one.=0A=0A drivers/net/gianfar.c | 16 ++++++++++++++--=0A dr= ivers/net/gianfar.h | 1 +=0A 2 files changed, 15 insertions(+), 2 deleti= ons(-)=0A=0Adiff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c=0Ain= dex 5ed8f9f..3da19a5 100644=0A--- a/drivers/net/gianfar.c=0A+++ b/drivers/n= et/gianfar.c=0A@@ -950,6 +950,11 @@ static void gfar_detect_errata(struct g= far_private *priv)=0A =09=09=09(pvr =3D=3D 0x80861010 && (mod & 0xfff9) =3D= =3D 0x80c0))=0A =09=09priv->errata |=3D GFAR_ERRATA_A002;=0A =0A+=09/* MPC8= 313 Rev < 2.0, MPC8548 rev 2.0 */=0A+=09if ((pvr =3D=3D 0x80850010 && mod = =3D=3D 0x80b0 && rev < 0x0020) ||=0A+=09=09=09(pvr =3D=3D 0x80210020 && mod= =3D=3D 0x8030 && rev =3D=3D 0x0020))=0A+=09=09priv->errata |=3D GFAR_ERRAT= A_12;=0A+=0A =09if (priv->errata)=0A =09=09dev_info(dev, "enabled errata wo= rkarounds, flags: 0x%x\n",=0A =09=09=09 priv->errata);=0A@@ -2156,8 +2161,1= 5 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev= )=0A =09/* Set up checksumming */=0A =09if (CHECKSUM_PARTIAL =3D=3D skb->ip= _summed) {=0A =09=09fcb =3D gfar_add_fcb(skb);=0A-=09=09lstatus |=3D BD_LFL= AG(TXBD_TOE);=0A-=09=09gfar_tx_checksum(skb, fcb);=0A+=09=09/* as specified= by errata */=0A+=09=09if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12)= =0A+=09=09=09 && ((unsigned long)fcb % 0x20) > 0x18)) {=0A+=09=09=09__s= kb_pull(skb, GMAC_FCB_LEN);=0A+=09=09=09skb_checksum_help(skb);=0A+=09=09} = else {=0A+=09=09=09lstatus |=3D BD_LFLAG(TXBD_TOE);=0A+=09=09=09gfar_tx_che= cksum(skb, fcb);=0A+=09=09}=0A =09}=0A =0A =09if (vlan_tx_tag_present(skb))= {=0Adiff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h=0Aindex 54d= e413..ec5d595 100644=0A--- a/drivers/net/gianfar.h=0A+++ b/drivers/net/gian= far.h=0A@@ -1039,6 +1039,7 @@ enum gfar_errata {=0A =09GFAR_ERRATA_74=09=09= =3D 0x01,=0A =09GFAR_ERRATA_76=09=09=3D 0x02,=0A =09GFAR_ERRATA_A002=09=3D = 0x04,=0A+=09GFAR_ERRATA_12=09=09=3D 0x08, /* a.k.a errata eTSEC49 */=0A };= =0A =0A /* Struct stolen almost completely (and shamelessly) from the FCC e= net source=0A-- =0A1.7.3.2=0A=0A=0A=0A=0A From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Dubov Subject: [PATCH v2] gianfar: Fall back to software tcp/udp checksum on older controllers Date: Thu, 27 Jan 2011 20:37:48 -0800 (PST) Message-ID: <640295.36173.qm@web37608.mail.mud.yahoo.com> References: <20110127095100.GA5411@oksana.dev.rtsoft.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Cc: mlcreech@gmail.com, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, netdev@vger.kernel.org To: Anton Vorontsov Return-path: Received: from web37608.mail.mud.yahoo.com ([209.191.87.91]:35962 "HELO web37608.mail.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754772Ab1A1Ehv convert rfc822-to-8bit (ORCPT ); Thu, 27 Jan 2011 23:37:51 -0500 In-Reply-To: <20110127095100.GA5411@oksana.dev.rtsoft.ru> Sender: netdev-owner@vger.kernel.org List-ID: As specified by errata eTSEC49 of MPC8548 and errata eTSEC12 of MPC83xx, older revisions of gianfar controllers will be unable to calculate a TCP/UDP packet checksum for some alignments of the appropriate FCB. This patch checks for FCB alignment on such controllers and falls back to software checksumming if the alignment is known to be bad. Signed-off-by: Alex Dubov --- Changes for v2: - Make indentation slightly more consistent. - Replace bizarre switch-based condition with plain boring one. drivers/net/gianfar.c | 16 ++++++++++++++-- drivers/net/gianfar.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 5ed8f9f..3da19a5 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -950,6 +950,11 @@ static void gfar_detect_errata(struct gfar_private *priv) (pvr == 0x80861010 && (mod & 0xfff9) == 0x80c0)) priv->errata |= GFAR_ERRATA_A002; + /* MPC8313 Rev < 2.0, MPC8548 rev 2.0 */ + if ((pvr == 0x80850010 && mod == 0x80b0 && rev < 0x0020) || + (pvr == 0x80210020 && mod == 0x8030 && rev == 0x0020)) + priv->errata |= GFAR_ERRATA_12; + if (priv->errata) dev_info(dev, "enabled errata workarounds, flags: 0x%x\n", priv->errata); @@ -2156,8 +2161,15 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Set up checksumming */ if (CHECKSUM_PARTIAL == skb->ip_summed) { fcb = gfar_add_fcb(skb); - lstatus |= BD_LFLAG(TXBD_TOE); - gfar_tx_checksum(skb, fcb); + /* as specified by errata */ + if (unlikely(gfar_has_errata(priv, GFAR_ERRATA_12) + && ((unsigned long)fcb % 0x20) > 0x18)) { + __skb_pull(skb, GMAC_FCB_LEN); + skb_checksum_help(skb); + } else { + lstatus |= BD_LFLAG(TXBD_TOE); + gfar_tx_checksum(skb, fcb); + } } if (vlan_tx_tag_present(skb)) { diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 54de413..ec5d595 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h @@ -1039,6 +1039,7 @@ enum gfar_errata { GFAR_ERRATA_74 = 0x01, GFAR_ERRATA_76 = 0x02, GFAR_ERRATA_A002 = 0x04, + GFAR_ERRATA_12 = 0x08, /* a.k.a errata eTSEC49 */ }; /* Struct stolen almost completely (and shamelessly) from the FCC enet source -- 1.7.3.2