Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/linux-milkymist
base: 58a7fd7
...
head fork: m-labs/linux-milkymist
compare: 0bec64a
  • 6 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
34 arch/lm32/include/asm/hw/minimac.h
@@ -18,39 +18,41 @@
#ifndef __HW_MINIMAC_H
#define __HW_MINIMAC_H
-#define CSR_MINIMAC_SETUP (0xe0008000)
+#define CSR_MINIMAC_BASE (0xe0008000)
+
+#define CSR_MINIMAC_SETUP (0x00)
#define MINIMAC_SETUP_RXRST (0x1)
#define MINIMAC_SETUP_TXRST (0x2)
-#define CSR_MINIMAC_MDIO (0xe0008004)
+#define CSR_MINIMAC_MDIO (0x04)
#define MINIMAC_MDIO_DO (0x1)
#define MINIMAC_MDIO_DI (0x2)
#define MINIMAC_MDIO_OE (0x4)
#define MINIMAC_MDIO_CLK (0x8)
-#define CSR_MINIMAC_STATE0 (0xe0008008)
-#define CSR_MINIMAC_ADDR0 (0xe000800C)
-#define CSR_MINIMAC_COUNT0 (0xe0008010)
+#define CSR_MINIMAC_STATE0 (0x08)
+#define CSR_MINIMAC_ADDR0 (0x0C)
+#define CSR_MINIMAC_COUNT0 (0x10)
-#define CSR_MINIMAC_STATE1 (0xe0008014)
-#define CSR_MINIMAC_ADDR1 (0xe0008018)
-#define CSR_MINIMAC_COUNT1 (0xe000801C)
+#define CSR_MINIMAC_STATE1 (0x14)
+#define CSR_MINIMAC_ADDR1 (0x18)
+#define CSR_MINIMAC_COUNT1 (0x1C)
-#define CSR_MINIMAC_STATE2 (0xe0008020)
-#define CSR_MINIMAC_ADDR2 (0xe0008024)
-#define CSR_MINIMAC_COUNT2 (0xe0008028)
+#define CSR_MINIMAC_STATE2 (0x20)
+#define CSR_MINIMAC_ADDR2 (0x24)
+#define CSR_MINIMAC_COUNT2 (0x28)
-#define CSR_MINIMAC_STATE3 (0xe000802C)
-#define CSR_MINIMAC_ADDR3 (0xe0008030)
-#define CSR_MINIMAC_COUNT3 (0xe0008034)
+#define CSR_MINIMAC_STATE3 (0x2C)
+#define CSR_MINIMAC_ADDR3 (0x30)
+#define CSR_MINIMAC_COUNT3 (0x34)
#define MINIMAC_STATE_EMPTY (0x0)
#define MINIMAC_STATE_LOADED (0x1)
#define MINIMAC_STATE_PENDING (0x2)
-#define CSR_MINIMAC_TXADR (0xe0008038)
-#define CSR_MINIMAC_TXREMAINING (0xe000803C)
+#define CSR_MINIMAC_TXADR (0x38)
+#define CSR_MINIMAC_TXREMAINING (0x3C)
#endif /* __HW_MINIMAC_H */
View
80 arch/lm32/kernel/entry.S
@@ -30,7 +30,7 @@ ENTRY(reset_handler)
KERNEL_EXCEPTION_VECTOR(0)
ENTRY(breakpoint_handler)
- bi _long_breakpoint_handler
+ bret
nop
nop
nop
@@ -112,9 +112,10 @@ ENTRY(system_call)
sli r10, r8, 2 /* TODO: only works with shifter enabled */
add r9, r9, r10 /* add offset of syscall no to address */
lw r9, (r9+0) /* fetch address of syscall function */
+ be r9, r0, .badsyscall
call r9 /* execute syscall */
-.syscallTail:
+ENTRY(syscall_tail)
/* store pt_regs* in r2 */
addi r2, sp, 4
calli manage_signals
@@ -127,50 +128,6 @@ ENTRY(system_call)
bi _restore_and_return_exception
-/* end of exception handlers */
-
-
-/********************************/
-/* ensure to be on kernel stack */
-/********************************/
-#define ENSURE_TO_BE_ON_KERNEL_STACK \
- /* store away r9,r10 so that we can use it here TODO: use clobbered ones*/ \
- sw (sp+-4), r9; /* needed for various */ \
- sw (sp+-8), r10; /* needed for current = current_thread_info()->task */ \
- sw (sp+-12), r11; /* needed for user stack pointer, if switching */ \
- /* test if already on kernel stack: test current_thread_info->task->which_stack */ \
- mvhi r9, hi(lm32_current_thread); \
- ori r9, r9, lo(lm32_current_thread); \
- lw r9, (r9+0); /* dereference lm32_current_thread */ \
- lw r10, (r9+TI_TASK); /* load pointer to task */ \
- lw r9, (r10+TASK_WHICH_STACK); \
- be r9, r0, 1f; \
- /* we are on user stack, have to switch */ \
- mv r11, sp; /* remember sp for restoring r9, r10, r11 */ \
- sw (r10+TASK_USP), sp; /* store usp */ \
- lw sp, (r10+TASK_KSP); /* load ksp */ \
- sw (r10+TASK_WHICH_STACK), r0; /* set which_stack to 0 */ \
- /* restore r9, r10, r11 */ \
- lw r9, (r11+-4); \
- lw r10, (r11+-8); \
- lw r11, (r11+-12); \
- bi 2f; \
-1:/* already on kernel stack */ \
- /* restore r9, r10 */ \
- lw r9, (sp+-4); \
- lw r10, (sp+-8); \
- /* no need to restore r11 as we did not use it */ \
-2:/* now for sure on kernel stack */
-
-_long_breakpoint_handler:
- ENSURE_TO_BE_ON_KERNEL_STACK; \
- addi sp,sp,-132; \
- calli _save_syscall_frame; \
- mvi r1, 32; /* 32 = breakpoint magic offset */ \
- addi r2, sp, 4; \
- calli asm_do_sig; \
- bi _return_from_debug_exception
-
/**************************/
/* exception return paths */
/**************************/
@@ -188,8 +145,6 @@ label: \
EXCEPTION_RETURN_PATH(_return_from_exception, _restore_and_return_exception)
-EXCEPTION_RETURN_PATH(_return_from_debug_exception, _restore_and_return_debug_exception)
-
/* ret_from_fork(unused, arg2, arg3, arg1, continuation) */
/* calls schedule_tail and then manage_signals */
/* returns to continuation(arg1, arg2, arg3) */
@@ -225,20 +180,6 @@ ENTRY(sys_rt_sigsuspend_wrapper)
addi sp,sp,4
ret
-ENTRY(sys_vfork)
- /* save ra to kernel stack */
- addi sp,sp,-4
- sw (sp+4), ra
- /* store regs into 1st argument */
- mv r1, r7
- /* store ra into 2nd argument */
- mv r2, ra
- calli sys_lm32_vfork
- /* load ra from kernel stack */
- lw ra, (sp+4)
- addi sp,sp,4
- ret
-
/* purpose of this wrapper: put struct pt_regs* into first argument */
ENTRY(sys_sigreturn)
/* save ra to stack */
@@ -252,18 +193,6 @@ ENTRY(sys_sigreturn)
addi sp,sp,4
ret
-ENTRY(sys_clone)
- /* save ra to stack */
- addi sp,sp,-4
- sw (sp+4), ra
- /* store ra into 5th argument */
- mv r5, ra
- calli sys_lm32_clone
- /* load ra from stack */
- lw ra, (sp+4)
- addi sp,sp,4
- ret
-
/* in IRQ we call a function between save and restore */
/* we therefore only save and restore the caller saved registers */
/* (r1-r10, ra, ea because an interrupt could interrupt another one) */
@@ -476,9 +405,6 @@ label: \
RETURN_FROM_SYSCALL_OR_EXCEPTION(_restore_and_return_exception,ea,eret)
-/* also use "ea" here because "ba" should not be changed! */
-RETURN_FROM_SYSCALL_OR_EXCEPTION(_restore_and_return_debug_exception,ea,bret)
-
/*
* struct task_struct* resume(struct task_struct* prev, struct task_struct* next)
* Returns the previous task
View
11 arch/lm32/kernel/process.c
@@ -49,6 +49,7 @@
#include <asm/hw/milkymist.h>
asmlinkage void ret_from_fork(void);
+asmlinkage void syscall_tail(void);
struct thread_info* lm32_current_thread;
@@ -204,14 +205,8 @@ int copy_thread(unsigned long clone_flags,
} else {
/* userspace thread (vfork, clone) */
- unsigned long ra_in_syscall;
struct pt_regs* childsyscallregs;
- //asm volatile("break");
-
- /* this was brought to us by sys_lm32_vfork */
- ra_in_syscall = regs->r1;
-
/* childsyscallregs = full syscall frame on kernel stack of child */
childsyscallregs = (struct pt_regs *)(child_tos) - 1; /* 32 = safety */
@@ -239,7 +234,7 @@ int copy_thread(unsigned long clone_flags,
/* child returns via ret_from_fork */
childregs->ra = (unsigned long)ret_from_fork;
/* child shall return to where sys_vfork_wrapper has been called */
- childregs->r5 = ra_in_syscall;
+ childregs->r5 = (unsigned long)syscall_tail;
/* child gets zero as return value from syscall */
childregs->r4 = 0;
/* after task switch segment return the stack pointer shall point to the
@@ -272,6 +267,6 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long usp)
regs->fp = current->mm->start_data;
regs->pt_mode = PT_MODE_USER;
- //printk("start_thread: current=%lx usp=%lx\n", current, usp);
+ /*printk("start_thread: current=%lx usp=%lx\n", current, usp);*/
}
View
2  arch/lm32/kernel/sys_call_table.c
@@ -4,6 +4,8 @@
#include <asm/syscalls.h>
+#define sys_vfork sys_ni_syscall
+
#undef __SYSCALL
#define __SYSCALL(nr, call) [nr] = (call),
View
31 arch/lm32/kernel/sys_lm32.c
@@ -95,42 +95,21 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co
}
EXPORT_SYMBOL(kernel_execve);
-asmlinkage int sys_lm32_vfork(struct pt_regs *regs, unsigned long ra_in_syscall)
-{
- int ret;
-
- //printk("do_fork regs=%lx ra=%lx usp=%lx\n", regs, ra_to_syscall_entry, usp);
-
- /* save ra_in_syscall to r1, this register will not be restored or overwritten (TODO find out)*/
- regs->r1 = ra_in_syscall;
- ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, current->thread.usp, regs, 0, NULL, NULL);
- //printk("do_fork returned %d\n", ret);
- return ret;
-}
-
/* the args to sys_lm32_clone try to match the libc call to avoid register
* reshuffling:
* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
-asmlinkage int sys_lm32_clone(
+asmlinkage int sys_clone(
int _unused_fn,
unsigned long newsp,
unsigned long clone_flags,
int _unused_arg,
- unsigned long ra_in_syscall,
+ unsigned long _unused_r5,
int _unused_r6,
struct pt_regs *regs)
{
- register unsigned long r_sp asm("sp");
- int ret;
+ if (!newsp)
+ newsp = current->thread.usp;
- /* -12 because the function and the argument to the child is stored on
- the stack, see clone.S in uClibc */
- if( !newsp ) {
- newsp = r_sp - 12;
- }
- /* ret_from_fork will return to this address (in child), see copy_thread */
- regs->r1 = ra_in_syscall;
- ret = do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
- return ret;
+ return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
}
View
115 drivers/net/milkymist_minimac.c
@@ -6,6 +6,8 @@
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/sched.h>
+#include <linux/crc32.h>
+
#include <asm/cacheflush.h>
#include <asm/hw/milkymist.h>
@@ -17,81 +19,6 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");
#define MAX_ETH_FRAME_SIZE 1536
#define WATCHDOG_TIMEOUT (5 * HZ)
-const unsigned int crc_table[256] = {
- 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
- 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
- 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
- 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
- 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
- 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
- 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
- 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
- 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
- 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
- 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
- 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
- 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
- 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
- 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
- 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
- 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
- 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
- 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
- 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
- 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
- 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
- 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
- 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
- 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
- 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
- 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
- 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
- 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
- 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
- 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
- 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
- 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
- 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
- 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
- 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
- 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
- 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
- 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
- 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
- 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
- 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
- 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
- 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
- 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
- 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
- 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
- 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
- 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
- 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
- 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
- 0x2d02ef8dL
-};
-
-#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-#define DO2(buf) DO1(buf); DO1(buf);
-#define DO4(buf) DO2(buf); DO2(buf);
-#define DO8(buf) DO4(buf); DO4(buf);
-
-unsigned int crc32(const unsigned char *buffer, unsigned int len)
-{
- unsigned int crc;
- crc = 0;
- crc = crc ^ 0xffffffffL;
- while(len >= 8) {
- DO8(buffer);
- len -= 8;
- }
- if(len) do {
- DO1(buffer);
- } while(--len);
- return crc ^ 0xffffffffL;
-}
-
int get_frame(const unsigned char *src, int len )
{
int i;
@@ -108,7 +35,7 @@ int get_frame(const unsigned char *src, int len )
|((unsigned int)src[len-3] << 8)
|((unsigned int)src[len-4]);
- computed_crc = crc32(src+8, len-12);
+ computed_crc = crc32(0, src+8, len-12);
if(received_crc != computed_crc) return -2;
@@ -151,17 +78,17 @@ static int minimac_reset(struct minimac *dev)
static unsigned char preamble[8] = {0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0xd5};
int i;
- iowrite32be(MINIMAC_SETUP_RXRST | MINIMAC_SETUP_TXRST, CSR_MINIMAC_SETUP);
+ iowrite32be(MINIMAC_SETUP_RXRST | MINIMAC_SETUP_TXRST, dev->iobase + CSR_MINIMAC_SETUP);
for (i = 0; i < MAX_PACKET_RECEPTION_SLOT; ++i) {
- iowrite32be((unsigned int)dev->pkt_buf[i].buf, CSR_MINIMAC_ADDR0+i*12);
- iowrite32be(MINIMAC_STATE_LOADED, CSR_MINIMAC_STATE0+i*12);
+ iowrite32be((unsigned int)dev->pkt_buf[i].buf, dev->iobase + CSR_MINIMAC_ADDR0+i*12);
+ iowrite32be(MINIMAC_STATE_LOADED, dev->iobase + CSR_MINIMAC_STATE0+i*12);
}
memcpy_toio(dev->pkt_buf->buf, preamble, 8); /* TX buff preamble */
- iowrite32be(0, CSR_MINIMAC_TXREMAINING);
- iowrite32be(0, CSR_MINIMAC_SETUP);
+ iowrite32be(0, dev->iobase + CSR_MINIMAC_TXREMAINING);
+ iowrite32be(0, dev->iobase + CSR_MINIMAC_SETUP);
return 0;
}
@@ -179,10 +106,10 @@ static int minimac_rx(struct net_device *dev, int budget)
while (netif_running(dev) && received < budget ) {
count = 0;
for (i = 1; i <= MAX_PACKET_RECEPTION_SLOT && received < budget ; ++i) {
- flush_dcache_range(CSR_MINIMAC_STATE0, 256);
- state = ioread32be(CSR_MINIMAC_STATE0+(i-1)*12);
+ flush_dcache_range(tp->iobase + CSR_MINIMAC_STATE0, 256);
+ state = ioread32be(tp->iobase + CSR_MINIMAC_STATE0+(i-1)*12);
if (state & MINIMAC_STATE_PENDING) {
- size = ioread32be(CSR_MINIMAC_COUNT0+(i-1)*12);
+ size = ioread32be(tp->iobase + CSR_MINIMAC_COUNT0+(i-1)*12);
if (size == 0) {
} else if (size < 64) {
dev_dbg(&dev->dev, "rx: frame too short(%d)\n", size);
@@ -224,7 +151,7 @@ static int minimac_rx(struct net_device *dev, int budget)
++received;
++count;
}
- iowrite32be(MINIMAC_STATE_LOADED, CSR_MINIMAC_STATE0+(i-1)*12);
+ iowrite32be(MINIMAC_STATE_LOADED, tp->iobase + CSR_MINIMAC_STATE0+(i-1)*12);
}
}
if (count == 0)
@@ -250,8 +177,8 @@ static irqreturn_t minimac_interrupt_rx(int irq, void *dev_id)
struct minimac *tp = netdev_priv(dev);
flush_dcache_range(CSR_MINIMAC_SETUP, 256);
- if (ioread32be(CSR_MINIMAC_SETUP) & MINIMAC_SETUP_RXRST)
- iowrite32be(0, CSR_MINIMAC_SETUP);
+ if (ioread32be(tp->iobase + CSR_MINIMAC_SETUP) & MINIMAC_SETUP_RXRST)
+ iowrite32be(0, tp->iobase + CSR_MINIMAC_SETUP);
disable_irq_nosync(dev->irq);
@@ -328,10 +255,10 @@ static int minimac_stop(struct net_device *dev)
free_irq(dev->irq+1, dev);
for (i = 0; i < MAX_PACKET_RECEPTION_SLOT; ++i)
- iowrite32be(MINIMAC_STATE_EMPTY, CSR_MINIMAC_STATE0+i*12);
+ iowrite32be(MINIMAC_STATE_EMPTY, tp->iobase + CSR_MINIMAC_STATE0+i*12);
- iowrite32be(MINIMAC_SETUP_RXRST | MINIMAC_SETUP_TXRST, CSR_MINIMAC_SETUP);
- iowrite32be(0, CSR_MINIMAC_TXREMAINING);
+ iowrite32be(MINIMAC_SETUP_RXRST | MINIMAC_SETUP_TXRST, tp->iobase + CSR_MINIMAC_SETUP);
+ iowrite32be(0, tp->iobase + CSR_MINIMAC_TXREMAINING);
return 0;
}
@@ -348,7 +275,7 @@ static netdev_tx_t minimac_start_xmit(struct sk_buff *skb, struct net_device *de
unsigned long fcs;
int len;
- if (ioread32be(CSR_MINIMAC_TXREMAINING) != 0)
+ if (ioread32be(tp->iobase + CSR_MINIMAC_TXREMAINING) != 0)
return NETDEV_TX_BUSY;
spin_lock_irq(&tp->lock);
@@ -362,14 +289,14 @@ static netdev_tx_t minimac_start_xmit(struct sk_buff *skb, struct net_device *de
len = 60;
/* CRC-32 */
- fcs = crc32(dest + 8, len);
+ fcs = crc32(0, dest + 8, len);
(dest+len)[8] = (fcs & 0xff);
(dest+len)[9] = (fcs & 0xff00) >> 8;
(dest+len)[10] = (fcs & 0xff0000) >> 16;
(dest+len)[11] = (fcs & 0xff000000) >> 24;
- iowrite32be(dest, CSR_MINIMAC_TXADR);
- iowrite32be(len + 12, CSR_MINIMAC_TXREMAINING);
+ iowrite32be(dest, tp->iobase + CSR_MINIMAC_TXADR);
+ iowrite32be(len + 12, tp->iobase + CSR_MINIMAC_TXREMAINING);
(tp->pkt_buf)->count = len;
netif_stop_queue(dev);
View
5 include/asm-generic/uaccess.h
@@ -293,7 +293,10 @@ strncpy_from_user(char *dst, const char __user *src, long count)
* Return 0 on exception, a value greater than N if too long
*/
#ifndef __strnlen_user
-#define __strnlen_user strnlen
+static inline long __strnlen_user(const char __user *src, long n)
+{
+ return strnlen((void * __force)src, n) + 1;
+}
#endif
static inline long strnlen_user(const char __user *src, long n)

No commit comments for this range

Something went wrong with that request. Please try again.