lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs_enet: Fix SCC Ethernet on CPM2, and crash in fs_enet_rx_napi()

Browse Source 
Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Heiko Schocher
2008-08-25 20:20:53 -05:00
committed by Jeff Garzik
parent 34a20e8973
commit f4f62301c6
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/cpm2.h
View File

@@ -337,6 +337,11 @@ typedef struct scc_param {
uint scc_tcrc; /* Internal */ uint scc_tcrc; /* Internal */
} sccp_t; } sccp_t;
/* Function code bits.
*/
#define SCC_EB ((u_char) 0x10) /* Set big endian byte order */
#define SCC_GBL ((u_char) 0x20) /* Snooping enabled */
/* CPM Ethernet through SCC1. /* CPM Ethernet through SCC1.
*/ */
typedef struct scc_enet { typedef struct scc_enet {

8
drivers/net/fs_enet/fs_enet-main.c
View File

@@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev)
int r; int r;
int err; int err;
/* to initialize the fep->cur_rx,... */
/* not doing this, will cause a crash in fs_enet_rx_napi */
fs_init_bds(fep->ndev);
if (fep->fpi->use_napi) if (fep->fpi->use_napi)
napi_enable(&fep->napi); napi_enable(&fep->napi);
@@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = {
.compatible = "fsl,cpm1-scc-enet", .compatible = "fsl,cpm1-scc-enet",
.data = (void *)&fs_scc_ops, .data = (void *)&fs_scc_ops,
}, },
{
.compatible = "fsl,cpm2-scc-enet",
.data = (void *)&fs_scc_ops,
},
#endif #endif
#ifdef CONFIG_FS_ENET_HAS_FCC #ifdef CONFIG_FS_ENET_HAS_FCC
{ {

8
drivers/net/fs_enet/mac-scc.c
View File

@@ -47,7 +47,6 @@
#include "fs_enet.h" #include "fs_enet.h"
/*************************************************/ /*************************************************/
#if defined(CONFIG_CPM1) #if defined(CONFIG_CPM1)
/* for a 8xx __raw_xxx's are sufficient */ /* for a 8xx __raw_xxx's are sufficient */
#define __fs_out32(addr, x) __raw_writel(x, addr) #define __fs_out32(addr, x) __raw_writel(x, addr)
@@ -62,6 +61,8 @@
#define __fs_out16(addr, x) out_be16(addr, x) #define __fs_out16(addr, x) out_be16(addr, x)
#define __fs_in32(addr) in_be32(addr) #define __fs_in32(addr) in_be32(addr)
#define __fs_in16(addr) in_be16(addr) #define __fs_in16(addr) in_be16(addr)
#define __fs_out8(addr, x) out_8(addr, x)
#define __fs_in8(addr) in_8(addr)
#endif #endif
/* write, read, set bits, clear bits */ /* write, read, set bits, clear bits */
@@ -262,8 +263,13 @@ static void restart(struct net_device *dev)
/* Initialize function code registers for big-endian. /* Initialize function code registers for big-endian.
*/ */
#ifndef CONFIG_NOT_COHERENT_CACHE
W8(ep, sen_genscc.scc_rfcr, SCC_EB | SCC_GBL);
W8(ep, sen_genscc.scc_tfcr, SCC_EB | SCC_GBL);
#else
W8(ep, sen_genscc.scc_rfcr, SCC_EB); W8(ep, sen_genscc.scc_rfcr, SCC_EB);
W8(ep, sen_genscc.scc_tfcr, SCC_EB); W8(ep, sen_genscc.scc_tfcr, SCC_EB);
#endif
/* Set maximum bytes per receive buffer. /* Set maximum bytes per receive buffer.
* This appears to be an Ethernet frame size, not the buffer * This appears to be an Ethernet frame size, not the buffer