projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e1120f
)
parisc: Tune LASI LAN for QEMU
author
Helge Deller
<deller@gmx.de>
Tue, 2 Apr 2019 10:21:13 +0000
(12:21 +0200)
committer
Helge Deller
<deller@gmx.de>
Fri, 3 May 2019 21:47:38 +0000
(23:47 +0200)
Do not loose cycles when we run on QEMU, and fix one trivial typo.
Signed-off-by: Helge Deller <deller@gmx.de>
drivers/net/ethernet/i825xx/lasi_82596.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/i825xx/lasi_82596.c
b/drivers/net/ethernet/i825xx/lasi_82596.c
index
b69c622
..
211c5f7
100644
(file)
--- a/
drivers/net/ethernet/i825xx/lasi_82596.c
+++ b/
drivers/net/ethernet/i825xx/lasi_82596.c
@@
-105,7
+105,7
@@
#define DMA_WBACK_INV(ndev, addr, len) \
do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_BIDIRECTIONAL); } while (0)
-#define SYSBUS 0x0000006c
;
+#define SYSBUS 0x0000006c
/* big endian CPU, 82596 "big" endian mode */
#define SWAP32(x) (((u32)(x)<<16) | ((((u32)(x)))>>16))
@@
-141,7
+141,8
@@
static void mpu_port(struct net_device *dev, int c, dma_addr_t x)
}
gsc_writel(a, dev->base_addr + PA_CPU_PORT_L_ACCESS);
- udelay(1);
+ if (!running_on_qemu)
+ udelay(1);
gsc_writel(b, dev->base_addr + PA_CPU_PORT_L_ACCESS);
}