PATCH 2.6: tms380tr update: move to DMA API
Hi Jeff,
this patch makes tms380tr use the new DMA API. Now that on Alpha, this API also supports bus master DMA for ISA (platform) devices, i changed the driver to use this new API.
This also works around a bug in the firmware loader: The example provided in Documentation/firmware_class no longer works, as the firmware loader now calls get_kobj_path_length() and the kernel promptly oopses, as the home-grown device doesn't have a parent. Of course, this doesn't happen with a "real" device which has its bus (or pseudo bus in the case of platform) as parent.
Converted tms380tr to use new DMA API:
- proteon.c, skisa.c: use platform pseudo bus to create a struct device
- Space.c: delete init hooks
- abyss.c, tmspci.c: pass struct device to tms380tr.c
- tms380tr.c, tms380tr.h: new DMA API, use real device fo firmware loader
---
commit 776158cf2f3ce514c6001869dfdcf0bd3911760d
tree 6194d993401e8afb990f23568dc23e314d150832
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Jochen Friedrich <[email protected]> Sat, 23 Jul 2005 11:48:50 +0200 committer Jochen Friedrich <[email protected]> Sat, 23 Jul 2005 11:48:50 +0200
drivers/net/Space.c | 6 -- drivers/net/tokenring/abyss.c | 2 - drivers/net/tokenring/proteon.c | 104 ++++++++++++++++++-------------------- drivers/net/tokenring/skisa.c | 104 ++++++++++++++++++-------------------- drivers/net/tokenring/tms380tr.c | 37 ++++++-------- drivers/net/tokenring/tms380tr.h | 8 +-- drivers/net/tokenring/tmspci.c | 4 + 7 files changed, 122 insertions(+), 143 deletions(-)
drivers/net/Space.c +0 -6
@@ -323,12 +323,6 @@ extern struct net_device *proteon_probe(extern struct net_device *smctr_probe (int unit); static struct devprobe2 tr_probes2[] __initdata = { -#ifdef CONFIG_SKISA - {sk_isa_probe, 0}, -#endif -#ifdef CONFIG_PROTEON - {proteon_probe, 0}, -#endif#ifdef CONFIG_SMCTR {smctr_probe, 0}, #endif
drivers/net/tokenring/abyss.c +1 -1
@@ -139,7 +139,7 @@ static int __devinit abyss_attach(struct*/ dev->base_addr +=0x10 ; - ret =tmsdev_init (dev,PCI_MAX_ADDRESS , pdev); + ret =tmsdev_init (dev,PCI_MAX_ADDRESS , &pdev->dev);if (ret) {printk ("%s: unable to get memory for dev->priv.\n" , dev->name);
drivers/net/tokenring/proteon.c +49 -55
228 lines not on this page · raw message
drivers/net/tokenring/skisa.c +49 -55
228 lines not on this page · raw message
drivers/net/tokenring/tms380tr.c +17 -20
@@ -62,6 +62,7 @@* normal operation. * 30-Dec-02 JF Removed incorrect __init from * tms380tr_init_card. +* 22-Jul-05 JF Converted to dma-mapping. * * To do: * 1. Multi/Broadcast packet handling (this may have fixed itself)
@@ -89,7 +90,7 @@ static const char version[] = "tms380tr.#include <linux/time.h> #include <linux/errno.h> #include <linux/init.h> -#include <linux/pci.h> +#include <linux/dma-mapping.h> #include <linux/delay.h> #include <linux/netdevice.h> #include <linux/etherdevice.h>
@@ -114,8 +115,6 @@ static const char version[] = "tms380tr.#endif static unsigned int tms380tr_debug =TMS380TR_DEBUG ; -static struct device tms_device; -/* Index to functions, as function prototypes. * Alphabetical by function name. */
@@ -434,7 +433,7 @@ static void tms380tr_init_net_local(struskb_put (tp->Rpl[i].Skb, tp->MaxPacketSize);/* data unreachable for DMA ? then use local buffer */ - dmabuf =pci_map_single (tp->pdev, tp->Rpl[i].Skb->data, tp->MaxPacketSize,PCI_DMA_FROMDEVICE ); + dmabuf =dma_map_single (tp->pdev, tp->Rpl[i].Skb->data, tp->MaxPacketSize,DMA_FROM_DEVICE );if (tp->dmalimit && (dmabuf + tp->MaxPacketSize > tp->dmalimit)) { tp->Rpl[i].SkbStat =SKB_DATA_COPY ;
@@ -638,10 +637,10 @@ static int tms380tr_hardware_send_packet/* Is buffer reachable for Busmaster-DMA? */ length = skb->len; - dmabuf =pci_map_single (tp->pdev, skb->data, length,PCI_DMA_TODEVICE ); + dmabuf =dma_map_single (tp->pdev, skb->data, length,DMA_TO_DEVICE );if (tp->dmalimit && (dmabuf + length > tp->dmalimit)) {/* Copy frame to local buffer */ -pci_unmap_single (tp->pdev, dmabuf, length,PCI_DMA_TODEVICE ); +dma_unmap_single (tp->pdev, dmabuf, length,DMA_TO_DEVICE ); dmabuf =0 ; i = tp->TplFree->TPLIndex; buf = tp->LocalTxBuffers[i];
@@ -1284,9 +1283,7 @@ static int tms380tr_reset_adapter(structunsigned short count, c, count2;const struct firmware *fw_entry =NULL ; -strncpy (tms_device.bus_id,dev->name,BUS_ID_SIZE ); - -if (request_firmware (&fw_entry,"tms380tr.bin" , &tms_device) !=0 ) { +if (request_firmware (&fw_entry,"tms380tr.bin" , tp->pdev) !=0 ) {printk (KERN_ALERT "%s: firmware %s is missing, cannot start.\n" , dev->name,"tms380tr.bin" );return (-1 );
@@ -2021,7 +2018,7 @@ static void tms380tr_cancel_tx_queue(strprintk (KERN_INFO "Cancel tx (%08lXh).\n" , (unsigned long )tpl);if (tpl->DMABuff) -pci_unmap_single (tp->pdev, tpl->DMABuff, tpl->Skb->len,PCI_DMA_TODEVICE ); +dma_unmap_single (tp->pdev, tpl->DMABuff, tpl->Skb->len,DMA_TO_DEVICE );dev_kfree_skb_any (tpl->Skb); }
@@ -2090,7 +2087,7 @@ static void tms380tr_tx_status_irq(struc tp->MacStat.tx_packets++;if (tpl->DMABuff) -pci_unmap_single (tp->pdev, tpl->DMABuff, tpl->Skb->len,PCI_DMA_TODEVICE ); +dma_unmap_single (tp->pdev, tpl->DMABuff, tpl->Skb->len,DMA_TO_DEVICE );dev_kfree_skb_irq (tpl->Skb); tpl->BusyFlag =0 ;/* "free" TPL */ }
@@ -2209,7 +2206,7 @@ static void tms380tr_rcv_status_irq(stru tp->MacStat.rx_errors++; }if (rpl->DMABuff) -pci_unmap_single (tp->pdev, rpl->DMABuff, tp->MaxPacketSize,PCI_DMA_TODEVICE ); +dma_unmap_single (tp->pdev, rpl->DMABuff, tp->MaxPacketSize,DMA_TO_DEVICE ); rpl->DMABuff =0 ;/* Allocate new skb for rpl */
@@ -2227,7 +2224,7 @@ static void tms380tr_rcv_status_irq(struskb_put (rpl->Skb, tp->MaxPacketSize);/* Data unreachable for DMA ? then use local buffer */ - dmabuf =pci_map_single (tp->pdev, rpl->Skb->data, tp->MaxPacketSize,PCI_DMA_FROMDEVICE ); + dmabuf =dma_map_single (tp->pdev, rpl->Skb->data, tp->MaxPacketSize,DMA_FROM_DEVICE );if (tp->dmalimit && (dmabuf + tp->MaxPacketSize > tp->dmalimit)) { rpl->SkbStat =SKB_DATA_COPY ;
@@ -2332,12 +2329,12 @@ void tmsdev_term(struct net_device *dev)struct net_local *tp; tp =netdev_priv (dev); -pci_unmap_single (tp->pdev, tp->dmabuffer,sizeof (struct net_local ), -PCI_DMA_BIDIRECTIONAL ); +dma_unmap_single (tp->pdev, tp->dmabuffer,sizeof (struct net_local ), +DMA_BIDIRECTIONAL ); }int tmsdev_init (struct net_device *dev,unsigned long dmalimit, -struct pci_dev *pdev) +struct device *pdev) {struct net_local *tms_local;
@@ -2346,8 +2343,8 @@ int tmsdev_init(struct net_device *dev,init_waitqueue_head (&tms_local->wait_for_tok_int); tms_local->dmalimit = dmalimit; tms_local->pdev = pdev; - tms_local->dmabuffer =pci_map_single (pdev, (void *)tms_local, -sizeof (struct net_local ),PCI_DMA_BIDIRECTIONAL ); + tms_local->dmabuffer =dma_map_single (pdev, (void *)tms_local, +sizeof (struct net_local ),DMA_BIDIRECTIONAL );if (tms_local->dmabuffer +sizeof (struct net_local ) > dmalimit) { printk(KERN_INFO "%s: Memory not accessible for DMA\n",
@@ -2370,8 +2367,6 @@ int tmsdev_init(struct net_device *dev,return 0 ; } -#ifdef MODULE -EXPORT_SYMBOL (tms380tr_open);EXPORT_SYMBOL (tms380tr_close);EXPORT_SYMBOL (tms380tr_interrupt);
@@ -2379,6 +2374,8 @@ EXPORT_SYMBOL(tmsdev_init);EXPORT_SYMBOL (tmsdev_term);EXPORT_SYMBOL (tms380tr_wait); +#ifdef MODULE +static struct module *TMS380_module =NULL ;int init_module (void )
drivers/net/tokenring/tms380tr.h +4 -4
@@ -18,7 +18,7 @@ int tms380tr_open(struct net_device *devint tms380tr_close (struct net_device *dev);irqreturn_t tms380tr_interrupt (int irq,void *dev_id,struct pt_regs *regs);int tmsdev_init (struct net_device *dev,unsigned long dmalimit, -struct pci_dev *pdev); +struct device *pdev);void tmsdev_term (struct net_device *dev);void tms380tr_wait (unsigned long time);
@@ -719,7 +719,7 @@ struct s_TPL { /* Transmit Parameter Lisstruct sk_buff *Skb;unsigned char TPLIndex;volatile unsigned char BusyFlag;/* Flag: TPL busy? */ -dma_addr_t DMABuff;/* DMA IO bus address from pci_map */ +dma_addr_t DMABuff;/* DMA IO bus address from dma_map */ };/* ---------------------Receive Functions-------------------------------*
@@ -1060,7 +1060,7 @@ struct s_RPL { /* Receive Parameter Liststruct sk_buff *Skb;SKB_STAT SkbStat;int RPLIndex; -dma_addr_t DMABuff;/* DMA IO bus address from pci_map */ +dma_addr_t DMABuff;/* DMA IO bus address from dma_map */ };/* Information that need to be kept for each board. */
@@ -1091,7 +1091,7 @@ typedef struct net_local {RPL *RplTail;unsigned char LocalRxBuffers[RPL_NUM ][DEFAULT_PACKET_SIZE ]; -struct pci_dev *pdev; +struct device *pdev;int DataRate;unsigned char ScbInUse;unsigned short CMDqueue;
drivers/net/tokenring/tmspci.c +2 -2
@@ -100,7 +100,7 @@ static int __devinit tms_pci_attach(struunsigned int pci_irq_line;unsigned long pci_ioaddr;struct card_info *cardinfo = &card_info_table[ent->driver_data]; - +if (versionprinted++ ==0 )printk ("%s" , version);
@@ -143,7 +143,7 @@ static int __devinit tms_pci_attach(struprintk (":%2.2x" , dev->dev_addr[i]);printk ("\n" ); - ret =tmsdev_init (dev,PCI_MAX_ADDRESS , pdev); + ret =tmsdev_init (dev,PCI_MAX_ADDRESS , &pdev->dev);if (ret) {printk ("%s: unable to get memory for dev->priv.\n" , dev->name); goto err_out_irq;
Signature · 4 lines
Bug, n.: An aspect of a computer program which exists because the programmer was thinking about girls or stock options when he wrote the program.