diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-21 10:57:01 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-21 16:00:50 -0500 |
| commit | c3da14474063e71686039d961d14785a9c2971ae (patch) | |
| tree | e98f5e56f94abb911cc61df12e026e626c651c7c /drivers/net/skge.c | |
| parent | cfc3ed796eda2c41fb20986d831ed56c0474279d (diff) | |
| download | linux-3.10-c3da14474063e71686039d961d14785a9c2971ae.tar.gz linux-3.10-c3da14474063e71686039d961d14785a9c2971ae.tar.bz2 linux-3.10-c3da14474063e71686039d961d14785a9c2971ae.zip | |
[PATCH] skge: check the allocation of ring buffer
The SysKonnect Genesis and Yukon chip sets have restrictions on the possible
control block area. The memory needs to not cross 4 Gig boundary, and it needs
to be 8 byte aligned. This patch checks and fails to bring the device up
if region is unacceptable.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 4fc9333f074..deca5066a44 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -727,7 +727,7 @@ static struct ethtool_ops skge_ethtool_ops = { * Allocate ring elements and chain them together * One-to-one association of board descriptors with ring elements */ -static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u64 base) +static int skge_ring_alloc(struct skge_ring *ring, void *vaddr, u32 base) { struct skge_tx_desc *d; struct skge_element *e; @@ -2168,6 +2168,14 @@ static int skge_up(struct net_device *dev) if (!skge->mem) return -ENOMEM; + BUG_ON(skge->dma & 7); + + if ((u64)skge->dma >> 32 != ((u64) skge->dma + skge->mem_size) >> 32) { + printk(KERN_ERR PFX "pci_alloc_consistent region crosses 4G boundary\n"); + err = -EINVAL; + goto free_pci_mem; + } + memset(skge->mem, 0, skge->mem_size); if ((err = skge_ring_alloc(&skge->rx_ring, skge->mem, skge->dma))) |