summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoachim Foerster <joachim.foerster@missinglinkelectronics.com>2011-10-17 05:24:44 +0000
committerWolfgang Denk <wd@denx.de>2011-10-26 21:27:37 +0200
commitb962ac794a26ff80269755c13c3e4fee65c3809e (patch)
treea4eee141d77981f255b5cf2c3a3fa5c8e85b34d9 /drivers/net
parent29095f1a5cfdbc2e40178f6fbf9267e0df11f6f5 (diff)
downloadu-boot-imx-b962ac794a26ff80269755c13c3e4fee65c3809e.zip
u-boot-imx-b962ac794a26ff80269755c13c3e4fee65c3809e.tar.gz
u-boot-imx-b962ac794a26ff80269755c13c3e4fee65c3809e.tar.bz2
altera_tse: Add support for dedicated descriptor memory
Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/altera_tse.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 47b5761..afd8e31 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -882,7 +882,8 @@ static int tse_eth_init(struct eth_device *dev, bd_t * bd)
/* TSE init code */
int altera_tse_initialize(u8 dev_num, int mac_base,
- int sgdma_rx_base, int sgdma_tx_base)
+ int sgdma_rx_base, int sgdma_tx_base,
+ u32 sgdma_desc_base, u32 sgdma_desc_size)
{
struct altera_tse_priv *priv;
struct eth_device *dev;
@@ -903,8 +904,20 @@ int altera_tse_initialize(u8 dev_num, int mac_base,
free(dev);
return 0;
}
- tx_desc = dma_alloc_coherent(sizeof(*tx_desc) * (3 + PKTBUFSRX),
- &dma_handle);
+ if (sgdma_desc_size) {
+ if (sgdma_desc_size < (sizeof(*tx_desc) * (3 + PKTBUFSRX))) {
+ printf("ALTERA_TSE-%hu: "
+ "descriptor memory is too small\n", dev_num);
+ free(priv);
+ free(dev);
+ return 0;
+ }
+ tx_desc = (struct alt_sgdma_descriptor *)sgdma_desc_base;
+ } else {
+ tx_desc = dma_alloc_coherent(sizeof(*tx_desc) * (3 + PKTBUFSRX),
+ &dma_handle);
+ }
+
rx_desc = tx_desc + 2;
debug("tx desc: address = 0x%x\n", (unsigned int)tx_desc);
debug("rx desc: address = 0x%x\n", (unsigned int)rx_desc);