* [PATCH] net: fec: enable hardware checksum only on imx6q-fec
@ 2013-05-09 7:08 Shawn Guo
2013-05-09 9:35 ` Jim Baxter
2013-05-11 23:12 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Shawn Guo @ 2013-05-09 7:08 UTC (permalink / raw)
To: David S. Miller; +Cc: Jim Baxter, kernel, netdev, linux-arm-kernel, Shawn Guo
Commit 4c09eed (net: fec: Enable imx6 enet checksum acceleration.)
enables hardware checksum acceleration unconditionally for all fec
variants. This is inappropriate, because some variants like imx5 have
no such support on hardware. Consequently, fec is broken on these
platforms. Fix it by enabling hardware checksum only on imx6q-fec type
of controllers.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/net/ethernet/freescale/fec_main.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index e25bf83..9ffa428 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -87,6 +87,8 @@
#define FEC_QUIRK_HAS_GBIT (1 << 3)
/* Controller has extend desc buffer */
#define FEC_QUIRK_HAS_BUFDESC_EX (1 << 4)
+/* Controller has hardware checksum support */
+#define FEC_QUIRK_HAS_CSUM (1 << 5)
static struct platform_device_id fec_devtype[] = {
{
@@ -105,7 +107,7 @@ static struct platform_device_id fec_devtype[] = {
}, {
.name = "imx6q-fec",
.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
- FEC_QUIRK_HAS_BUFDESC_EX,
+ FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM,
}, {
.name = "mvf-fec",
.driver_data = FEC_QUIRK_ENET_MAC,
@@ -1723,6 +1725,8 @@ static const struct net_device_ops fec_netdev_ops = {
static int fec_enet_init(struct net_device *ndev)
{
struct fec_enet_private *fep = netdev_priv(ndev);
+ const struct platform_device_id *id_entry =
+ platform_get_device_id(fep->pdev);
struct bufdesc *cbd_base;
/* Allocate memory for buffer descriptors. */
@@ -1755,12 +1759,14 @@ static int fec_enet_init(struct net_device *ndev)
writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK);
netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, FEC_NAPI_WEIGHT);
- /* enable hw accelerator */
- ndev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
- | NETIF_F_RXCSUM);
- ndev->hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
- | NETIF_F_RXCSUM);
- fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
+ if (id_entry->driver_data & FEC_QUIRK_HAS_CSUM) {
+ /* enable hw accelerator */
+ ndev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
+ | NETIF_F_RXCSUM);
+ ndev->hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM
+ | NETIF_F_RXCSUM);
+ fep->csum_flags |= FLAG_RX_CSUM_ENABLED;
+ }
fec_restart(ndev, 0);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: fec: enable hardware checksum only on imx6q-fec
2013-05-09 7:08 [PATCH] net: fec: enable hardware checksum only on imx6q-fec Shawn Guo
@ 2013-05-09 9:35 ` Jim Baxter
2013-05-11 23:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jim Baxter @ 2013-05-09 9:35 UTC (permalink / raw)
To: Shawn Guo; +Cc: David S. Miller, kernel, netdev, linux-arm-kernel
On 09/05/13 08:08, Shawn Guo wrote:
> Commit 4c09eed (net: fec: Enable imx6 enet checksum acceleration.)
> enables hardware checksum acceleration unconditionally for all fec
> variants. This is inappropriate, because some variants like imx5 have
> no such support on hardware. Consequently, fec is broken on these
> platforms. Fix it by enabling hardware checksum only on imx6q-fec type
> of controllers.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Jim Baxter <jim_baxter@mentor.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: fec: enable hardware checksum only on imx6q-fec
2013-05-09 7:08 [PATCH] net: fec: enable hardware checksum only on imx6q-fec Shawn Guo
2013-05-09 9:35 ` Jim Baxter
@ 2013-05-11 23:12 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-05-11 23:12 UTC (permalink / raw)
To: shawn.guo; +Cc: jim_baxter, kernel, netdev, linux-arm-kernel
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 9 May 2013 15:08:22 +0800
> Commit 4c09eed (net: fec: Enable imx6 enet checksum acceleration.)
> enables hardware checksum acceleration unconditionally for all fec
> variants. This is inappropriate, because some variants like imx5 have
> no such support on hardware. Consequently, fec is broken on these
> platforms. Fix it by enabling hardware checksum only on imx6q-fec type
> of controllers.
>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-11 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-09 7:08 [PATCH] net: fec: enable hardware checksum only on imx6q-fec Shawn Guo
2013-05-09 9:35 ` Jim Baxter
2013-05-11 23:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).