smsc-ircc2: sysfs, suspend and other patches
cover smsc-ircc2: sysfs, suspend and other patches
[ This is a resend. I apologize if you already received copy of these
patches...]
Hi,
The following patches attempt to convert smsc-ircc2 driver to the new power management scheme by registering driver/device as platform device. Additionally, suspend and resume methods were adjusted to keep network device open and not release IRQ/DMA upon suspend to make sure that they will still be available at resume time (IRQ and DMA simply disabled when suspending). Plus there some less significant cleanups.
The resulting driver loads on my laptop and survives swsusp suspend/resume cycle. Borrowed windows laptop recognizes and is being recognzed when moved into vicinity of the box. Unfortunately I was not able to test any higher-level protocols because IRDA connection would not stay on, but it is the same with the original driver as well.
I would appreciate if owners of laptops with this chip could give these patches a try. Thanks!
ircc2-whitespace.patch
- whitespace fixes
ircc2-formatting.patch
- some formatting changes for better readability
ircc2-remove-dim.patch
- remove homegrown DIM macro in favor of ARRAY_SIZE, fix out-of-bounds array access
ircc2-remove-typedef.patch
- drop some typedefs, use 'struct blah' instead
ircc2-cleanup.patch
- do not pass around iobase, it is available from smsc_ircc_cb structure
ircc2-pm.patch
- add smsc-ircc2 to sysfs/driver model as platform device/driver, switch to the new PM scheme.
ircc2-pm2.patch
- avoid closing interface in suspend methods - it will cause IRQ/DMA be released and they may not be availabe at resume.
ircc2-netdev-priv.patch
- switch to using netdev_priv().
ircc2-cleanup2.patch
- avoid using void * pointers where specific type will do.
--
Dmitry
PATCH 1/9 smsc-ircc2: whitespace fixes
IRDA: smsc-ircc2 - whitespace fixes.
---
smsc-ircc2.c | 384 +++++++++++++++++++++++++++++------------------------------ smsc-ircc2.h | 50 +++---- 2 files changed, 217 insertions(+), 217 deletions(-)
drivers/net/irda/smsc-ircc2.c +192 -192
@@ -4,10 +4,10 @@* Description: Driver for the SMC Infrared Communications Controller * Status: Experimental. * Author: Daniele Peri ([email protected]) -* Created at: -* Modified at: -* Modified by: -* +* Created at: +* Modified at: +* Modified by: +* * Copyright (c) 2002 Daniele Peri * All Rights Reserved. * Copyright (c) 2002 Jean Tourrilhes
@@ -17,26 +17,26 @@* * Copyright (c) 2001 Stefani Seibold * Copyright (c) 1999-2001 Dag Brattli -* Copyright (c) 1998-1999 Thomas Davis, +* Copyright (c) 1998-1999 Thomas Davis, * * and irport.c: * * Copyright (c) 1997, 1998, 1999-2000 Dag Brattli, All Rights Reserved. * -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * ********************************************************************/
@@ -72,7 +72,7 @@struct smsc_transceiver {char *name; -void (*set_for_speed)(int fir_base,u32 speed); +void (*set_for_speed)(int fir_base,u32 speed);int (*probe)(int fir_base); };typedef struct smsc_transceiver smsc_transceiver_t ;
@@ -109,7 +109,7 @@ struct smsc_ircc_cb {struct net_device *netdev;/* Yes! we are some kind of netdevice */ struct net_device_stats stats;struct irlap_cb *irlap;/* The link layer we are binded to */ - +chipio_t io;/* IrDA controller information */ iobuff_t tx_buff;/* Transmit buffer */ iobuff_t rx_buff;/* Receive buffer */
@@ -119,7 +119,7 @@ struct smsc_ircc_cb {struct qos_info qos;/* QoS capabilities for this device */ spinlock_t lock;/* For serializing operations */ - +__u32 new_speed;__u32 flags;/* Interface flags */
@@ -147,7 +147,7 @@ static void smsc_ircc_setup_io(struct smstatic void smsc_ircc_setup_qos (struct smsc_ircc_cb *self);static void smsc_ircc_init_chip (struct smsc_ircc_cb *self); static int __exit smsc_ircc_close(struct smsc_ircc_cb *self); -static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase); +static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase);static void smsc_ircc_dma_receive_complete (struct smsc_ircc_cb *self,int iobase);static void smsc_ircc_sir_receive (struct smsc_ircc_cb *self);static int smsc_ircc_hard_xmit_sir (struct sk_buff *skb,struct net_device *dev);
@@ -332,7 +332,7 @@ static int __init smsc_ircc_init(void)IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); dev_count=0 ; - +if ((ircc_fir>0 )&&(ircc_sir>0 )) {IRDA_MESSAGE (" Overriding FIR address 0x%04x\n" , ircc_fir);IRDA_MESSAGE (" Overriding SIR address 0x%04x\n" , ircc_sir);
@@ -352,9 +352,9 @@ static int __init smsc_ircc_init(void)if (!smsc_superio_lpc (ircc_cfg)) ret =0 ; } - +if (smsc_ircc_look_for_chips ()>0 ) ret =0 ; - +return ret; }
@@ -369,13 +369,13 @@ static int __init smsc_ircc_open(unsignestruct smsc_ircc_cb *self;struct net_device *dev;int err; - +IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); err =smsc_ircc_present (fir_base, sir_base); -if (err) +if (err) goto err_out; - + err = -ENOMEM ;if (dev_count >DIM (dev_self)) {IRDA_WARNING ("%s(), too many devices!\n" , __FUNCTION__);
@@ -402,7 +402,7 @@ static int __init smsc_ircc_open(unsigne dev->stop = smsc_ircc_net_close; dev->do_ioctl = smsc_ircc_net_ioctl; dev->get_stats = smsc_ircc_net_get_stats; - + self = dev->priv; self->netdev = dev;
@@ -414,7 +414,7 @@ static int __init smsc_ircc_open(unsigne dev_self[dev_count++] = self;spin_lock_init (&self->lock); - self->rx_buff.truesize =SMSC_IRCC2_RX_BUFF_TRUESIZE ; + self->rx_buff.truesize =SMSC_IRCC2_RX_BUFF_TRUESIZE ; self->tx_buff.truesize =SMSC_IRCC2_TX_BUFF_TRUESIZE ; self->rx_buff.head =
@@ -442,14 +442,14 @@ static int __init smsc_ircc_open(unsigne self->rx_buff.state =OUTSIDE_FRAME ; self->tx_buff.data = self->tx_buff.head; self->rx_buff.data = self->rx_buff.head; - +smsc_ircc_setup_io (self, fir_base, sir_base, dma, irq);smsc_ircc_setup_qos (self);smsc_ircc_init_chip (self); - -if (ircc_transceiver >0 && + +if (ircc_transceiver >0 && ircc_transceiver <SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS ) self->transceiver = ircc_transceiver;else
@@ -519,7 +519,7 @@ static int smsc_ircc_present(unsigned in dma = config &IRCC_INTERFACE_DMA_MASK ; irq = (config &IRCC_INTERFACE_IRQ_MASK ) >>4 ; -if (high !=0x10 || low !=0xb8 || (chip !=0xf1 && chip !=0xf2 )) { +if (high !=0x10 || low !=0xb8 || (chip !=0xf1 && chip !=0xf2 )) {IRDA_WARNING ("%s(), addr 0x%04x - no device found!\n" , __FUNCTION__, fir_base); goto out3;
@@ -543,8 +543,8 @@ static int smsc_ircc_present(unsigned in* Setup I/O * */ -static void smsc_ircc_setup_io (struct smsc_ircc_cb *self, -unsigned int fir_base,unsigned int sir_base, +static void smsc_ircc_setup_io (struct smsc_ircc_cb *self, +unsigned int fir_base,unsigned int sir_base,u8 dma,u8 irq) {unsigned char config, chip_dma, chip_irq;
@@ -569,7 +569,7 @@ static void smsc_ircc_setup_io(struct sm }else self->io.irq = chip_irq; - +if (dma <255 ) {if (dma != chip_dma) IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
@@ -591,7 +591,7 @@ static void smsc_ircc_setup_qos(struct s {/* Initialize QoS for this device */ irda_init_max_qos_capabilies (&self->qos); - + self->qos.baud_rate.bits =IR_9600 |IR_19200 |IR_38400 |IR_57600 |IR_115200 |IR_576000 |IR_1152000 |(IR_4000000 <<8 );
@@ -608,8 +608,8 @@ static void smsc_ircc_setup_qos(struct s*/ static void smsc_ircc_init_chip (struct smsc_ircc_cb *self) { -int iobase, ir_mode, ctrl, fast; - +int iobase, ir_mode, ctrl, fast; + IRDA_ASSERT( self != NULL, return; ); iobase = self->io.fir_base;
@@ -622,27 +622,27 @@ static void smsc_ircc_init_chip(struct soutb (0x00 , iobase+IRCC_MASTER );register_bank (iobase,1 ); -outb (((inb (iobase+IRCC_SCE_CFGA ) &0x87 ) | ir_mode), +outb (((inb (iobase+IRCC_SCE_CFGA ) &0x87 ) | ir_mode), iobase+IRCC_SCE_CFGA );#ifdef smsc_669/* Uses pin 88/89 for Rx/Tx */ -outb (((inb (iobase+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), +outb (((inb (iobase+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), iobase+IRCC_SCE_CFGB ); -#else +#else outb (((inb (iobase+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), iobase+IRCC_SCE_CFGB ); -#endif +#endif (void )inb (iobase+IRCC_FIFO_THRESHOLD );outb (SMSC_IRCC2_FIFO_THRESHOLD , iobase+IRCC_FIFO_THRESHOLD ); - +register_bank (iobase,4 );outb ((inb (iobase+IRCC_CONTROL ) &0x30 ) | ctrl, iobase+IRCC_CONTROL ); - +register_bank (iobase,0 );outb (fast, iobase+IRCC_LCR_A );smsc_ircc_set_sir_speed (self,SMSC_IRCC2_C_IRDA_FALLBACK_SPEED ); - +/* Power on device */ outb (0x00 , iobase+IRCC_MASTER ); }
@@ -667,7 +667,7 @@ static int smsc_ircc_net_ioctl(struct ne IRDA_ASSERT(self != NULL, return -1;);IRDA_DEBUG (2 ,"%s(), %s, (cmd=0x%X)\n" , __FUNCTION__, dev->name, cmd); - +switch (cmd) {case SIOCSBANDWIDTH :/* Set bandwidth */ if (!capable (CAP_NET_ADMIN ))
@@ -703,14 +703,14 @@ static int smsc_ircc_net_ioctl(struct nedefault : ret = -EOPNOTSUPP ; } - +return ret; }static struct net_device_stats *smsc_ircc_net_get_stats (struct net_device *dev) {struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->priv; - +return &self->stats; }
@@ -728,7 +728,7 @@ static void smsc_ircc_timeout(struct netunsigned long flags; self = (struct smsc_ircc_cb *) dev->priv; - +IRDA_WARNING ("%s: transmit timed out, changing speed to: %d\n" , dev->name, self->io.speed);spin_lock_irqsave (&self->lock, flags);
@@ -757,14 +757,14 @@ int smsc_ircc_hard_xmit_sir(struct sk_buIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); IRDA_ASSERT(dev != NULL, return 0;); - + self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); iobase = self->io.sir_base;netif_stop_queue (dev); - +/* Make sure test of self->io.speed & speed change are atomic */ spin_lock_irqsave (&self->lock, flags);
@@ -796,18 +796,18 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu self->tx_buff.data = self->tx_buff.head;/* Copy skb to tx_buff while wrapping, stuffing and making CRC */ - self->tx_buff.len =async_wrap_skb (skb, self->tx_buff.data, + self->tx_buff.len =async_wrap_skb (skb, self->tx_buff.data, self->tx_buff.truesize); - + self->stats.tx_bytes += self->tx_buff.len;/* Turn on transmit finished interrupt. Will fire immediately! */ -outb (UART_IER_THRI , iobase+UART_IER ); +outb (UART_IER_THRI , iobase+UART_IER );spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb); - +return 0 ; }
@@ -828,7 +828,7 @@ static void smsc_ircc_set_fir_speed(struswitch (speed) {default : -case 576000 : +case 576000 : ir_mode =IRCC_CFGA_IRDA_HDLC ; ctrl =IRCC_CRC ; fast =0 ;
@@ -855,10 +855,10 @@ static void smsc_ircc_set_fir_speed(struregister_bank (fir_base,0 );outb ((inb (fir_base+IRCC_LCR_A ) &0xbf ) | fast, fir_base+IRCC_LCR_A );#endif - +register_bank (fir_base,1 );outb (((inb (fir_base+IRCC_SCE_CFGA ) &IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK ) | ir_mode), fir_base+IRCC_SCE_CFGA ); - +register_bank (fir_base,4 );outb ((inb (fir_base+IRCC_CONTROL ) &0x30 ) | ctrl, fir_base+IRCC_CONTROL ); }
@@ -885,7 +885,7 @@ static void smsc_ircc_fir_start(struct s/* Reset everything */ /* Install FIR transmit handler */ - dev->hard_start_xmit = smsc_ircc_hard_xmit_fir; + dev->hard_start_xmit = smsc_ircc_hard_xmit_fir;/* Clear FIFO */ outb (inb (fir_base+IRCC_LCR_A )|IRCC_LCR_A_FIFO_RESET , fir_base+IRCC_LCR_A );
@@ -895,14 +895,14 @@ static void smsc_ircc_fir_start(struct sregister_bank (fir_base,1 ); -/* Select the TX/RX interface */ +/* Select the TX/RX interface */ #ifdef SMSC_669 /* Uses pin 88/89 for Rx/Tx */ -outb (((inb (fir_base+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), +outb (((inb (fir_base+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), fir_base+IRCC_SCE_CFGB ); -#else +#else outb (((inb (fir_base+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), fir_base+IRCC_SCE_CFGB ); -#endif +#endif (void )inb (fir_base+IRCC_FIFO_THRESHOLD );/* Enable SCE interrupts */
@@ -923,12 +923,12 @@ static void smsc_ircc_fir_stop(struct smint fir_base;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); - + IRDA_ASSERT(self != NULL, return;); fir_base = self->io.fir_base;register_bank (fir_base,0 ); -/*outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);*/ +/*outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);*/ outb (inb (fir_base+IRCC_LCR_B ) &IRCC_LCR_B_SIP_ENABLE , fir_base+IRCC_LCR_B ); }
@@ -947,7 +947,7 @@ static void smsc_ircc_change_speed(voidstruct net_device *dev;int iobase;int last_speed_was_sir; - +IRDA_DEBUG (0 ,"%s() changing speed to: %d\n" , __FUNCTION__, speed); IRDA_ASSERT(self != NULL, return;);
@@ -961,9 +961,9 @@ static void smsc_ircc_change_speed(void speed=1152000 ; self->io.speed = speed; last_speed_was_sir =0 ; -smsc_ircc_fir_start (self); +smsc_ircc_fir_start (self);#endif - +if (self->io.speed ==0 )smsc_ircc_sir_start (self);
@@ -974,17 +974,17 @@ static void smsc_ircc_change_speed(voidif (self->io.speed != speed)smsc_ircc_set_transceiver_for_speed (self, speed); self->io.speed = speed; - +if (speed <=SMSC_IRCC2_MAX_SIR_SPEED ) {if (!last_speed_was_sir) {smsc_ircc_fir_stop (self);smsc_ircc_sir_start (self); } -smsc_ircc_set_sir_speed (self, speed); +smsc_ircc_set_sir_speed (self, speed); }else {if (last_speed_was_sir) { -#if SMSC_IRCC2_C_SIR_STOP +#if SMSC_IRCC2_C_SIR_STOP smsc_ircc_sir_stop (self);#endif smsc_ircc_fir_start (self);
@@ -994,13 +994,13 @@ static void smsc_ircc_change_speed(void#if 0 self->tx_buff.len =10 ; self->tx_buff.data = self->tx_buff.head; - +smsc_ircc_dma_xmit (self, iobase,4000 );#endif /* Be ready for incoming frames */ smsc_ircc_dma_receive (self, iobase); } - +netif_wake_queue (dev); }
@@ -1013,7 +1013,7 @@ static void smsc_ircc_change_speed(voidvoid smsc_ircc_set_sir_speed (void *priv,__u32 speed) {struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv; -int iobase; +int iobase;int fcr;/* FIFO control reg */ int lcr;/* Line control reg */ int divisor;
@@ -1022,30 +1022,30 @@ void smsc_ircc_set_sir_speed(void *priv, IRDA_ASSERT(self != NULL, return;); iobase = self->io.sir_base; - +/* Update accounting for new speed */ self->io.speed = speed;/* Turn off interrupts */ -outb (0 , iobase+UART_IER ); +outb (0 , iobase+UART_IER ); divisor =SMSC_IRCC2_MAX_SIR_SPEED /speed; - + fcr =UART_FCR_ENABLE_FIFO ; -/* +/* * Use trigger level 1 to avoid 3 ms. timeout delay at 9600 bps, and * almost 1,7 ms at 19200 bps. At speeds above that we can just forget -* about this timeout since it will always be fast enough. +* about this timeout since it will always be fast enough. */ if (self->io.speed <38400 ) fcr |=UART_FCR_TRIGGER_1 ; -else +else fcr |=UART_FCR_TRIGGER_14 ; - +/* IrDA ports use 8N1 */ lcr =UART_LCR_WLEN8 ; - +outb (UART_LCR_DLAB | lcr, iobase+UART_LCR );/* Set DLAB */ outb (divisor &0xff , iobase+UART_DLL );/* Set speed */ outb (divisor >>8 , iobase+UART_DLM );
@@ -1092,24 +1092,24 @@ static int smsc_ircc_hard_xmit_fir(struc/* Note : you should make sure that speed changes * are not going to corrupt any outgoing frame. * Look at nsc-ircc for the gory details - Jean II */ -smsc_ircc_change_speed (self, speed); +smsc_ircc_change_speed (self, speed);spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb);return 0 ; }else self->new_speed = speed; } - +memcpy (self->tx_buff.head, skb->data, skb->len); self->tx_buff.len = skb->len; self->tx_buff.data = self->tx_buff.head; - - mtt =irda_get_mtt (skb); + + mtt =irda_get_mtt (skb);if (mtt) {int bofs; -/* +/* * Compute how many BOFs (STA or PA's) we need to waste the * min turn time given the speed of the link. */
@@ -1145,7 +1145,7 @@ static void smsc_ircc_dma_xmit(struct smoutb (0x00 , iobase+IRCC_LCR_B );#endif register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , +outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , iobase+IRCC_SCE_CFGB ); self->io.direction =IO_XMIT ;
@@ -1161,7 +1161,7 @@ static void smsc_ircc_dma_xmit(struct smoutb (self->tx_buff.len &0xff , iobase+IRCC_TX_SIZE_LO );/*outb(UART_MCR_OUT2, self->io.sir_base + UART_MCR);*/ - +/* Enable burst mode chip Tx DMA */ register_bank (iobase,1 ); outb(inb(iobase+IRCC_SCE_CFGB) | IRCC_CFGB_DMA_ENABLE |
@@ -1176,7 +1176,7 @@ static void smsc_ircc_dma_xmit(struct smregister_bank (iobase,0 );outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase+IRCC_IER );outb (IRCC_MASTER_INT_EN , iobase+IRCC_MASTER ); - +/* Enable transmit */ outb (IRCC_LCR_B_SCE_TRANSMIT |IRCC_LCR_B_SIP_ENABLE , iobase+IRCC_LCR_B ); }
@@ -1184,7 +1184,7 @@ static void smsc_ircc_dma_xmit(struct sm/* * Function smsc_ircc_dma_xmit_complete (self) * -* The transfer of a frame in finished. This function will only be called +* The transfer of a frame in finished. This function will only be called * by the interrupt handler * */
@@ -1217,7 +1217,7 @@ static void smsc_ircc_dma_xmit_complete(/* Check if it's time to change the speed */ if (self->new_speed) { -smsc_ircc_change_speed (self, self->new_speed); +smsc_ircc_change_speed (self, self->new_speed); self->new_speed =0 ; }
@@ -1231,22 +1231,22 @@ static void smsc_ircc_dma_xmit_complete(* if it starts to receive a frame. * */ -static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase) +static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase) {#if 0 /* Turn off chip DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , +outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , iobase+IRCC_SCE_CFGB );#endif - +/* Disable Tx */ register_bank (iobase,0 );outb (0x00 , iobase+IRCC_LCR_B );/* Turn off chip DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , +outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , iobase+IRCC_SCE_CFGB ); self->io.direction =IO_RECV ;
@@ -1263,7 +1263,7 @@ static int smsc_ircc_dma_receive(struct/* Enable burst mode chip Rx DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE | +outb (inb (iobase+IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE |IRCC_CFGB_DMA_BURST , iobase+IRCC_SCE_CFGB );/* Enable interrupt */
@@ -1274,9 +1274,9 @@ static int smsc_ircc_dma_receive(struct/* Enable receiver */ register_bank (iobase,0 ); -outb (IRCC_LCR_B_SCE_RECEIVE |IRCC_LCR_B_SIP_ENABLE , +outb (IRCC_LCR_B_SCE_RECEIVE |IRCC_LCR_B_SIP_ENABLE , iobase+IRCC_LCR_B ); - +return 0 ; }
@@ -1290,9 +1290,9 @@ static void smsc_ircc_dma_receive_comple {struct sk_buff *skb;int len, msgcnt, lsr; - +register_bank (iobase,0 ); - +IRDA_DEBUG (3 ,"%s\n" , __FUNCTION__);#if 0 /* Disable Rx */
@@ -1309,8 +1309,8 @@ static void smsc_ircc_dma_receive_comple len = self->rx_buff.truesize -get_dma_residue (self->io.dma); -/* Look for errors -*/ +/* Look for errors +*/ if (lsr & (IRCC_LSR_FRAME_ERROR |IRCC_LSR_CRC_ERROR |IRCC_LSR_SIZE_ERROR )) { self->stats.rx_errors++;
@@ -1337,9 +1337,9 @@ static void smsc_ircc_dma_receive_compleIRDA_WARNING ("%s(), memory squeeze, dropping frame.\n" , __FUNCTION__);return ; - } + }/* Make sure IP header gets aligned */ -skb_reserve (skb,1 ); +skb_reserve (skb,1 );memcpy (skb_put (skb, len), self->rx_buff.data, len); self->stats.rx_packets++;
@@ -1357,7 +1357,7 @@ static void smsc_ircc_dma_receive_comple* Receive one frame from the infrared port * */ -static void smsc_ircc_sir_receive (struct smsc_ircc_cb *self) +static void smsc_ircc_sir_receive (struct smsc_ircc_cb *self) {int boguscount =0 ;int iobase;
@@ -1366,12 +1366,12 @@ static void smsc_ircc_sir_receive(struct iobase = self->io.sir_base; -/* -* Receive all characters in Rx FIFO, unwrap and unstuff them. -* async_unwrap_char will deliver all found frames +/* +* Receive all characters in Rx FIFO, unwrap and unstuff them. +* async_unwrap_char will deliver all found frames */ do { - async_unwrap_char(self->netdev, &self->stats, &self->rx_buff, + async_unwrap_char(self->netdev, &self->stats, &self->rx_buff, inb(iobase+UART_RX)); /* Make sure we don't stay here to long */
@@ -1379,7 +1379,7 @@ static void smsc_ircc_sir_receive(structIRDA_DEBUG (2 ,"%s(), breaking!\n" , __FUNCTION__);break ; } - }while (inb (iobase+UART_LSR ) &UART_LSR_DR ); + }while (inb (iobase+UART_LSR ) &UART_LSR_DR ); }
@@ -1397,7 +1397,7 @@ static irqreturn_t smsc_ircc_interrupt(iirqreturn_t ret =IRQ_NONE ;if (dev ==NULL ) { -printk (KERN_WARNING "%s: irq %d for unknown device.\n" , +printk (KERN_WARNING "%s: irq %d for unknown device.\n" , driver_name, irq); goto irq_ret; }
@@ -1405,7 +1405,7 @@ static irqreturn_t smsc_ircc_interrupt(i IRDA_ASSERT(self != NULL, return IRQ_NONE;);/* Serialise the interrupt handler in various CPUs, stop Tx path */ -spin_lock (&self->lock); +spin_lock (&self->lock);/* Check if we should use the SIR interrupt handler */ if (self->io.speed <=SMSC_IRCC2_MAX_SIR_SPEED ) {
@@ -1417,7 +1417,7 @@ static irqreturn_t smsc_ircc_interrupt(iregister_bank (iobase,0 ); iir =inb (iobase+IRCC_IIR ); -if (iir ==0 ) +if (iir ==0 ) goto irq_ret_unlock; ret =IRQ_HANDLED ;
@@ -1425,7 +1425,7 @@ static irqreturn_t smsc_ircc_interrupt(ioutb (0 , iobase+IRCC_IER ); lcra =inb (iobase+IRCC_LCR_A ); lsr =inb (iobase+IRCC_LSR ); - +IRDA_DEBUG (2 ,"%s(), iir = 0x%02x\n" , __FUNCTION__, iir);if (iir &IRCC_IIR_EOM ) {
@@ -1433,7 +1433,7 @@ static irqreturn_t smsc_ircc_interrupt(ismsc_ircc_dma_receive_complete (self, iobase); elsesmsc_ircc_dma_xmit_complete (self ,iobase ); - +smsc_ircc_dma_receive (self, iobase); }
@@ -1476,7 +1476,7 @@ static irqreturn_t smsc_ircc_interrupt_s/* Clear interrupt */ lsr =inb (iobase+UART_LSR ); -IRDA_DEBUG (4 ,"%s(), iir=%02x, lsr=%02x, iobase=%#x\n" , +IRDA_DEBUG (4 ,"%s(), iir=%02x, lsr=%02x, iobase=%#x\n" , __FUNCTION__, iir, lsr, iobase);switch (iir) {
@@ -1496,13 +1496,13 @@ static irqreturn_t smsc_ircc_interrupt_sIRDA_DEBUG (0 ,"%s(), unhandled IIR=%#x\n" , __FUNCTION__, iir);break ; - } - + } +/* Make sure we don't stay here to long */ if (boguscount++ >100 )break ; - iir =inb (iobase +UART_IIR ) &UART_IIR_ID ; + iir =inb (iobase +UART_IIR ) &UART_IIR_ID ; }/*spin_unlock(&self->lock);*/ return IRQ_HANDLED ;
@@ -1529,7 +1529,7 @@ static int ircc_is_receiving(struct smsc get_dma_residue(self->io.dma)); status = (self->rx_buff.state !=OUTSIDE_FRAME ); - + return status; }#endif /* unused */
@@ -1549,14 +1549,14 @@ static int smsc_ircc_net_open(struct netunsigned long flags;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); - + IRDA_ASSERT(dev != NULL, return -1;); self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - + iobase = self->io.fir_base; -if (request_irq (self->io.irq, smsc_ircc_interrupt,0 , dev->name, +if (request_irq (self->io.irq, smsc_ircc_interrupt,0 , dev->name, (void *) dev)) {IRDA_DEBUG (0 ,"%s(), unable to allocate irq=%d\n" , __FUNCTION__, self->io.irq);
@@ -1568,14 +1568,14 @@ static int smsc_ircc_net_open(struct net self->io.speed =0 ;smsc_ircc_change_speed (self,SMSC_IRCC2_C_IRDA_FALLBACK_SPEED );spin_unlock_irqrestore (&self->lock, flags); - +/* Give self a hardware name */ /* It would be cool to offer the chip revision here - Jean II */ sprintf (hwname,"SMSC @ 0x%03x" , self->io.fir_base); -/* +/* * Open new IrLAP layer instance, now that everything should be -* initialized properly +* initialized properly */ self->irlap =irlap_open (dev, &self->qos, hwname);
@@ -1590,7 +1590,7 @@ static int smsc_ircc_net_open(struct net __FUNCTION__, self->io.dma);return -EAGAIN ; } - +netif_start_queue (dev);return 0 ;
@@ -1608,16 +1608,16 @@ static int smsc_ircc_net_close(struct neint iobase;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); - + IRDA_ASSERT(dev != NULL, return -1;); - self = (struct smsc_ircc_cb *) dev->priv; + self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - + iobase = self->io.fir_base;/* Stop device */ netif_stop_queue (dev); - +/* Stop and remove instance of IrLAP */ if (self->irlap)irlap_close (self->irlap);
@@ -1655,7 +1655,7 @@ static void smsc_ircc_wakeup(struct smsc* or give a good reason. - Jean II */ smsc_ircc_net_open (self->netdev); - +IRDA_MESSAGE ("%s, Waking up\n" , driver_name); }
@@ -1720,7 +1720,7 @@ static int __exit smsc_ircc_close(structrelease_region (self->io.fir_base, self->io.fir_ext); -IRDA_DEBUG (0 ,"%s(), releasing 0x%03x\n" , __FUNCTION__, +IRDA_DEBUG (0 ,"%s(), releasing 0x%03x\n" , __FUNCTION__, self->io.sir_base);release_region (self->io.sir_base, self->io.sir_ext);
@@ -1728,7 +1728,7 @@ static int __exit smsc_ircc_close(structif (self->tx_buff.head)dma_free_coherent (NULL , self->tx_buff.truesize, self->tx_buff.head, self->tx_buff_dma); - +if (self->rx_buff.head)dma_free_coherent (NULL , self->rx_buff.truesize, self->rx_buff.head, self->rx_buff_dma);
@@ -1763,9 +1763,9 @@ void smsc_ircc_sir_start(struct smsc_ircIRDA_DEBUG (3 ,"%s\n" , __FUNCTION__); - IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self != NULL, return;); dev= self->netdev; - IRDA_ASSERT(dev != NULL, return;); + IRDA_ASSERT(dev != NULL, return;); dev->hard_start_xmit = &smsc_ircc_hard_xmit_sir; fir_base = self->io.fir_base;
@@ -1784,7 +1784,7 @@ void smsc_ircc_sir_start(struct smsc_irc/* Initialize UART */ outb (UART_LCR_WLEN8 , sir_base+UART_LCR );/* Reset DLAB */ outb ((UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 ), sir_base+UART_MCR ); - +/* Turn on interrups */ outb (UART_IER_RLSI |UART_IER_RDI |UART_IER_THRI , sir_base+UART_IER );
@@ -1803,7 +1803,7 @@ void smsc_ircc_sir_stop(struct smsc_ircc/* Reset UART */ outb (0 , iobase+UART_MCR ); - +/* Turn off interrupts */ outb (0 , iobase+UART_IER ); }
@@ -1831,16 +1831,16 @@ static void smsc_ircc_sir_write_wakeup(s/* Finished with frame? */ if (self->tx_buff.len >0 ) {/* Write data left in transmit buffer */ - actual =smsc_ircc_sir_write (iobase, self->io.fifo_size, + actual =smsc_ircc_sir_write (iobase, self->io.fifo_size, self->tx_buff.data, self->tx_buff.len); self->tx_buff.data += actual; self->tx_buff.len -= actual; }else { - +/*if (self->tx_buff.len ==0) {*/ - -/* -* Now serial buffer is almost free & we can start + +/* +* Now serial buffer is almost free & we can start * transmission of another packet. But first we must check * if we need to change the speed of the hardware */
@@ -1857,14 +1857,14 @@ static void smsc_ircc_sir_write_wakeup(s self->stats.tx_packets++;if (self->io.speed <=115200 ) { -/* +/* * Reset Rx FIFO to make sure that all reflected transmit data * is discarded. This is needed for half duplex operation */ fcr =UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_RCVR ;if (self->io.speed <38400 ) fcr |=UART_FCR_TRIGGER_1 ; -else +else fcr |=UART_FCR_TRIGGER_14 ;outb (fcr, iobase+UART_FCR );
@@ -1884,13 +1884,13 @@ static void smsc_ircc_sir_write_wakeup(sstatic int smsc_ircc_sir_write (int iobase,int fifo_size,__u8 *buf,int len) {int actual =0 ; - +/* Tx FIFO should be empty! */ if (!(inb (iobase+UART_LSR ) &UART_LSR_THRE )) {IRDA_WARNING ("%s(), failed, fifo not empty!\n" , __FUNCTION__);return 0 ; } - +/* Fill FIFO with current frame */ while ((fifo_size-- >0 ) && (actual < len)) {/* Transmit next byte */
@@ -1921,10 +1921,10 @@ static int smsc_ircc_is_receiving(structstatic void smsc_ircc_probe_transceiver (struct smsc_ircc_cb *self) {unsigned int i; - + IRDA_ASSERT(self != NULL, return;); - -for (i=0 ; smsc_transceivers[i].name!=NULL ; i++) + +for (i=0 ; smsc_transceivers[i].name!=NULL ; i++)if ((*smsc_transceivers[i].probe)(self->io.fir_base)) {IRDA_MESSAGE (" %s transceiver found\n" , smsc_transceivers[i].name);
@@ -1933,7 +1933,7 @@ static void smsc_ircc_probe_transceiver( }IRDA_MESSAGE ("No transceiver found. Defaulting to %s\n" , smsc_transceivers[SMSC_IRCC2_C_DEFAULT_TRANSCEIVER ].name); - + self->transceiver=SMSC_IRCC2_C_DEFAULT_TRANSCEIVER ; }
@@ -1947,7 +1947,7 @@ static void smsc_ircc_probe_transceiver(static void smsc_ircc_set_transceiver_for_speed (struct smsc_ircc_cb *self,u32 speed) {unsigned int trx; - + trx = self->transceiver;if (trx>0 ) (*smsc_transceivers[trx-1 ].set_for_speed)(self->io.fir_base, speed); }
@@ -1979,9 +1979,9 @@ static void smsc_ircc_sir_wait_hw_transm {int iobase;int count =SMSC_IRCC2_HW_TRANSMITTER_TIMEOUT_US ; - + iobase = self->io.sir_base; - +/* Calibrated busy loop */ while ((count-- >0 ) && !(inb (iobase+UART_LSR ) &UART_LSR_TEMT ))udelay (1 );
@@ -2001,23 +2001,23 @@ static int __init smsc_ircc_look_for_chismsc_chip_address_t *address;char *type;unsigned int cfg_base, found; - + found =0 ; address = possible_addresses; - +while (address->cfg_base){ cfg_base = address->cfg_base; - +/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/ - +if ( address->type &SMSCSIO_TYPE_FDC ){ type ="FDC" ;if ((address->type) &SMSCSIO_TYPE_FLAT ) {if (!smsc_superio_flat (fdc_chips_flat,cfg_base, type)) found++; }if ((address->type) &SMSCSIO_TYPE_PAGED ) { -if (!smsc_superio_paged (fdc_chips_paged,cfg_base, type)) found++; - } +if (!smsc_superio_paged (fdc_chips_paged,cfg_base, type)) found++; + } }if ( address->type &SMSCSIO_TYPE_LPC ){ type ="LPC" ;
@@ -2025,13 +2025,13 @@ static int __init smsc_ircc_look_for_chiif (!smsc_superio_flat (lpc_chips_flat,cfg_base,type)) found++; }if ((address->type) &SMSCSIO_TYPE_PAGED ) { -if (!smsc_superio_paged (lpc_chips_paged,cfg_base,"LPC" )) found++; - } +if (!smsc_superio_paged (lpc_chips_paged,cfg_base,"LPC" )) found++; + } } address++; }return found; -} +}/* * Function smsc_superio_flat (chip, base, type)
@@ -2052,23 +2052,23 @@ static int __init smsc_superio_flat(consoutb (SMSCSIOFLAT_UARTMODE0C_REG , cfgbase); mode =inb (cfgbase+1 ); - +/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/ - +if (!(mode &SMSCSIOFLAT_UART2MODE_VAL_IRDA ))IRDA_WARNING ("%s(): IrDA not enabled\n" , __FUNCTION__);outb (SMSCSIOFLAT_UART2BASEADDR_REG , cfgbase); sirbase =inb (cfgbase+1 ) <<2 ; -/* FIR iobase */ +/* FIR iobase */ outb (SMSCSIOFLAT_FIRBASEADDR_REG , cfgbase); firbase =inb (cfgbase+1 ) <<3 ;/* DMA */ outb (SMSCSIOFLAT_FIRDMASELECT_REG , cfgbase); dma =inb (cfgbase+1 ) &SMSCSIOFLAT_FIRDMASELECT_MASK ; - +/* IRQ */ outb (SMSCSIOFLAT_UARTIRQSELECT_REG , cfgbase); irq =inb (cfgbase+1 ) &SMSCSIOFLAT_UART2IRQSELECT_MASK ;
@@ -2077,9 +2077,9 @@ static int __init smsc_superio_flat(consif (firbase) {if (smsc_ircc_open (firbase, sirbase, dma, irq) ==0 ) - ret=0 ; + ret=0 ; } - +/* Exit configuration */ outb (SMSCSIO_CFGEXITKEY , cfgbase);
@@ -2096,22 +2096,22 @@ static int __init smsc_superio_paged(con {unsigned short fir_io, sir_io;int ret = -ENODEV ; - +IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);if (smsc_ircc_probe (cfg_base,0x20 ,chips,type)==NULL )return ret; - +/* Select logical device (UART2) */ outb (0x07 , cfg_base);outb (0x05 , cfg_base +1 ); - +/* SIR iobase */ outb (0x60 , cfg_base); sir_io =inb (cfg_base +1 ) <<8 ;outb (0x61 , cfg_base); sir_io |=inb (cfg_base +1 ); - +/* Read FIR base */ outb (0x62 , cfg_base); fir_io =inb (cfg_base +1 ) <<8 ;
@@ -2121,9 +2121,9 @@ static int __init smsc_superio_paged(conif (fir_io) {if (smsc_ircc_open (fir_io, sir_io, ircc_dma, ircc_irq) ==0 ) - ret=0 ; + ret=0 ; } - +/* Exit configuration */ outb (SMSCSIO_CFGEXITKEY , cfg_base);
@@ -2145,7 +2145,7 @@ static int __init smsc_access(unsigned sstatic const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type) { -u8 devid,xdevid,rev; +u8 devid,xdevid,rev;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);
@@ -2168,14 +2168,14 @@ static const smsc_chip_t * __init smsc_iif (smsc_access (cfg_base,0x55 ))/* send second key and check */ return NULL ;#endif - +/* probe device ID */ if (smsc_access (cfg_base,reg))return NULL ; devid=inb (cfg_base+1 ); - +if (devid==0 )/* typical value for unused port */ return NULL ;
@@ -2192,7 +2192,7 @@ static const smsc_chip_t * __init smsc_iif (rev>=128 )/* i think this will make no sense */ return NULL ; -if (devid==xdevid)/* protection against false positives */ +if (devid==xdevid)/* protection against false positives */ return NULL ;/* Check for expected device ID; are there others? */
@@ -2208,10 +2208,10 @@ static const smsc_chip_t * __init smsc_iIRDA_MESSAGE ("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n" ,devid,rev,cfg_base,type,chip->name);if (chip->rev>rev){ -IRDA_MESSAGE ("Revision higher than expected\n" ); +IRDA_MESSAGE ("Revision higher than expected\n" );return NULL ; } - +if (chip->flags&NoIRDA)IRDA_MESSAGE ("chipset does not support IRDA\n" );
@@ -2270,10 +2270,10 @@ static void smsc_ircc_set_transceiver_sm {unsigned long jiffies_now, jiffies_timeout;u8 val; - + jiffies_now= jiffies; jiffies_timeout= jiffies+SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES ; - +/* ATC */ register_bank (fir_base,4 );outb ((inb (fir_base+IRCC_ATC ) &IRCC_ATC_MASK ) |IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE , fir_base+IRCC_ATC );
@@ -2298,25 +2298,25 @@ static int smsc_ircc_probe_transceiver_s/* * Function smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select(self, speed) * -* Set transceiver +* Set transceiver * */ static void smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select (int fir_base,u32 speed) {u8 fast_mode; - +switch (speed) {default :case 576000 : - fast_mode =0 ; + fast_mode =0 ;break ;case 1152000 :case 4000000 : fast_mode =IRCC_LCR_A_FAST ;break ; - + }register_bank (fir_base,0 );outb ((inb (fir_base+IRCC_LCR_A ) &0xbf ) | fast_mode, fir_base+IRCC_LCR_A );
@@ -2325,7 +2325,7 @@ static void smsc_ircc_set_transceiver_sm/* * Function smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select(fir_base) * -* Probe transceiver +* Probe transceiver * */
@@ -2337,25 +2337,25 @@ static int smsc_ircc_probe_transceiver_s/* * Function smsc_ircc_set_transceiver_toshiba_sat1800(fir_base, speed) * -* Set transceiver +* Set transceiver * */ static void smsc_ircc_set_transceiver_toshiba_sat1800 (int fir_base,u32 speed) {u8 fast_mode; - +switch (speed) {default :case 576000 : - fast_mode =0 ; + fast_mode =0 ;break ;case 1152000 :case 4000000 : fast_mode =/*IRCC_LCR_A_FAST |*/ IRCC_LCR_A_GP_DATA ;break ; - + }/* This causes an interrupt */ register_bank (fir_base,0 );
@@ -2365,7 +2365,7 @@ static void smsc_ircc_set_transceiver_to/* * Function smsc_ircc_probe_transceiver_toshiba_sat1800(fir_base) * -* Probe transceiver +* Probe transceiver * */
drivers/net/irda/smsc-ircc2.h +25 -25
101 lines not on this page · raw message
PATCH 2/9 smsc-ircc2: formatting fixes
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - some formatting changes for better readability.
---
smsc-ircc2.c | 637 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 315 insertions(+), 322 deletions(-)
drivers/net/irda/smsc-ircc2.c +315 -322
@@ -68,6 +68,36 @@#include "smsc-ircc2.h" #include "smsc-sio.h" + +MODULE_AUTHOR ("Daniele Peri <[email protected]>" ); +MODULE_DESCRIPTION ("SMC IrCC SIR/FIR controller driver" ); +MODULE_LICENSE ("GPL" ); + + +static int ircc_dma =255 ; +module_param (ircc_dma, int,0 ); +MODULE_PARM_DESC (ircc_dma,"DMA channel" ); + +static int ircc_irq =255 ; +module_param (ircc_irq, int,0 ); +MODULE_PARM_DESC (ircc_irq,"IRQ line" ); + +static int ircc_fir; +module_param (ircc_fir, int,0 ); +MODULE_PARM_DESC (ircc_fir,"FIR Base Address" ); + +static int ircc_sir; +module_param (ircc_sir, int,0 ); +MODULE_PARM_DESC (ircc_sir,"SIR Base Address" ); + +static int ircc_cfg; +module_param (ircc_cfg, int,0 ); +MODULE_PARM_DESC (ircc_cfg,"Configuration register base address" ); + +static int ircc_transceiver; +module_param (ircc_transceiver, int,0 ); +MODULE_PARM_DESC (ircc_transceiver,"Transceiver type" ); +/* Types */ struct smsc_transceiver {
@@ -136,7 +166,7 @@ static const char *driver_name = "smsc-i#define DIM (x) (sizeof(x)/(sizeof(*(x))))#define SMSC_IRCC2_C_IRDA_FALLBACK_SPEED 9600#define SMSC_IRCC2_C_DEFAULT_TRANSCEIVER 1 -#define SMSC_IRCC2_C_NET_TIMEOUT 0 +#define SMSC_IRCC2_C_NET_TIMEOUT 0#define SMSC_IRCC2_C_SIR_STOP 0/* Prototypes */
@@ -179,7 +209,7 @@ static void smsc_ircc_sir_wait_hw_transm/* Probing */ static int __init smsc_ircc_look_for_chips (void ); -static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type); +static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type);static int __init smsc_superio_flat (const smsc_chip_t *chips,unsigned short cfg_base,char *type);static int __init smsc_superio_paged (const smsc_chip_t *chips,unsigned short cfg_base,char *type);static int __init smsc_superio_fdc (unsigned short cfg_base);
@@ -203,12 +233,12 @@ static int smsc_ircc_pmproc(struct pm_de/* Transceivers for SMSC-ircc */ -static smsc_transceiver_t smsc_transceivers[]= +static smsc_transceiver_t smsc_transceivers[] = { - {"Toshiba Satellite 1800 (GP data pin select)" , smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800}, - {"Fast pin select" , smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select}, - {"ATC IRMode" , smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc}, - {NULL ,NULL } + {"Toshiba Satellite 1800 (GP data pin select)" , smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 }, + {"Fast pin select" , smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select }, + {"ATC IRMode" , smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc }, + {NULL ,NULL } };#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (DIM(smsc_transceivers)-1)
@@ -221,7 +251,7 @@ static smsc_transceiver_t smsc_transceiv#define FIR 4/* SuperIO Chip has fast IRDA */ #define SERx4 8/* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */ -static smsc_chip_t __initdata fdc_chips_flat[]= +static smsc_chip_t __initdata fdc_chips_flat[] = {/* Base address 0x3f0 or 0x370 */ {"37C44" ,KEY55_1 |NoIRDA,0x00 ,0x00 },/* This chip cannot be detected */
@@ -235,7 +265,7 @@ static smsc_chip_t __initdata fdc_chips_ { NULL } }; -static smsc_chip_t __initdata fdc_chips_paged[]= +static smsc_chip_t __initdata fdc_chips_paged[] = {/* Base address 0x3f0 or 0x370 */ {"37B72X" ,KEY55_1 |SIR |SERx4,0x4c ,0x00 },
@@ -254,7 +284,7 @@ static smsc_chip_t __initdata fdc_chips_ { NULL } }; -static smsc_chip_t __initdata lpc_chips_flat[]= +static smsc_chip_t __initdata lpc_chips_flat[] = {/* Base address 0x2E or 0x4E */ {"47N227" ,KEY55_1 |FIR |SERx4,0x5a ,0x00 },
@@ -262,7 +292,7 @@ static smsc_chip_t __initdata lpc_chips_ { NULL } }; -static smsc_chip_t __initdata lpc_chips_paged[]= +static smsc_chip_t __initdata lpc_chips_paged[] = {/* Base address 0x2E or 0x4E */ {"47B27X" ,KEY55_1 |SIR |SERx4,0x51 ,0x00 },
@@ -281,33 +311,25 @@ static smsc_chip_t __initdata lpc_chips_#define SMSCSIO_TYPE_FLAT 4#define SMSCSIO_TYPE_PAGED 8 -static smsc_chip_address_t __initdata possible_addresses[]= +static smsc_chip_address_t __initdata possible_addresses[] = { - {0x3f0 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, - {0x370 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, - {0xe0 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, - {0x2e ,SMSCSIO_TYPE_LPC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, - {0x4e ,SMSCSIO_TYPE_LPC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, - {0 ,0 } + {0x3f0 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, + {0x370 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, + {0xe0 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, + {0x2e ,SMSCSIO_TYPE_LPC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, + {0x4e ,SMSCSIO_TYPE_LPC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, + {0 ,0 } };/* Globals */ -static struct smsc_ircc_cb *dev_self[] = {NULL ,NULL }; - -static int ircc_irq=255 ; -static int ircc_dma=255 ; -static int ircc_fir=0 ; -static int ircc_sir=0 ; -static int ircc_cfg=0 ; -static int ircc_transceiver=0 ; - -static unsigned short dev_count=0 ; +static struct smsc_ircc_cb *dev_self[] = {NULL ,NULL }; +static unsigned short dev_count;static inline void register_bank (int iobase,int bank) { -outb (((inb (iobase+IRCC_MASTER ) &0xf0 ) | (bank &0x07 )), - iobase+IRCC_MASTER ); +outb (((inb (iobase +IRCC_MASTER ) &0xf0 ) | (bank &0x07 )), + iobase +IRCC_MASTER ); }
@@ -327,13 +349,13 @@ static inline void register_bank(int iob*/ static int __init smsc_ircc_init (void ) { -int ret=-ENODEV ; +int ret = -ENODEV ;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); - dev_count=0 ; + dev_count =0 ; -if ((ircc_fir>0 )&&(ircc_sir>0 )) { +if (ircc_fir >0 && ircc_sir >0 ) {IRDA_MESSAGE (" Overriding FIR address 0x%04x\n" , ircc_fir);IRDA_MESSAGE (" Overriding SIR address 0x%04x\n" , ircc_sir);
@@ -344,7 +366,7 @@ static int __init smsc_ircc_init(void) }/* try user provided configuration register base address */ -if (ircc_cfg>0 ) { +if (ircc_cfg >0 ) {IRDA_MESSAGE (" Overriding configuration address 0x%04x\n" , ircc_cfg);if (!smsc_superio_fdc (ircc_cfg))
@@ -353,7 +375,8 @@ static int __init smsc_ircc_init(void) ret =0 ; } -if (smsc_ircc_look_for_chips ()>0 ) ret =0 ; +if (smsc_ircc_look_for_chips () >0 ) + ret =0 ;return ret; }
@@ -373,7 +396,7 @@ static int __init smsc_ircc_open(unsigneIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); err =smsc_ircc_present (fir_base, sir_base); -if (err) +if (err) goto err_out; err = -ENOMEM ;
@@ -396,7 +419,7 @@ static int __init smsc_ircc_open(unsigne dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;#if SMSC_IRCC2_C_NET_TIMEOUT dev->tx_timeout = smsc_ircc_timeout; - dev->watchdog_timeo =HZ *2 ;/* Allow enough time for speed change */ + dev->watchdog_timeo =HZ *2 ;/* Allow enough time for speed change */ #endif dev->open = smsc_ircc_net_open; dev->stop = smsc_ircc_net_close;
@@ -444,19 +467,17 @@ static int __init smsc_ircc_open(unsigne self->rx_buff.data = self->rx_buff.head;smsc_ircc_setup_io (self, fir_base, sir_base, dma, irq); -smsc_ircc_setup_qos (self); -smsc_ircc_init_chip (self); -if (ircc_transceiver >0 && - ircc_transceiver <SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS ) +if (ircc_transceiver >0 && + ircc_transceiver <SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS ) self->transceiver = ircc_transceiver;else smsc_ircc_probe_transceiver (self); err =register_netdev (self->netdev); -if (err) { +if (err) {IRDA_ERROR ("%s, Network device registration failed!\n" , driver_name); goto err_out4;
@@ -469,6 +490,7 @@ static int __init smsc_ircc_open(unsigneIRDA_MESSAGE ("IrDA: Registered device %s\n" , dev->name);return 0 ; + err_out4:dma_free_coherent (NULL , self->tx_buff.truesize, self->tx_buff.head, self->tx_buff_dma);
@@ -511,16 +533,16 @@ static int smsc_ircc_present(unsigned inregister_bank (fir_base,3 ); - high =inb (fir_base+IRCC_ID_HIGH ); - low =inb (fir_base+IRCC_ID_LOW ); - chip =inb (fir_base+IRCC_CHIP_ID ); - version =inb (fir_base+IRCC_VERSION ); - config =inb (fir_base+IRCC_INTERFACE ); + high =inb (fir_base +IRCC_ID_HIGH ); + low =inb (fir_base +IRCC_ID_LOW ); + chip =inb (fir_base +IRCC_CHIP_ID ); + version =inb (fir_base +IRCC_VERSION ); + config =inb (fir_base +IRCC_INTERFACE ); dma = config &IRCC_INTERFACE_DMA_MASK ; irq = (config &IRCC_INTERFACE_IRQ_MASK ) >>4 ;if (high !=0x10 || low !=0xb8 || (chip !=0xf1 && chip !=0xf2 )) { -IRDA_WARNING ("%s(), addr 0x%04x - no device found!\n" , +IRDA_WARNING ("%s(), addr 0x%04x - no device found!\n" , __FUNCTION__, fir_base); goto out3; }
@@ -529,6 +551,7 @@ static int smsc_ircc_present(unsigned in chip & 0x0f, version, fir_base, sir_base, dma, irq);return 0 ; + out3:release_region (sir_base,SMSC_IRCC2_SIR_CHIP_IO_EXTENT ); out2:
@@ -550,9 +573,9 @@ static void smsc_ircc_setup_io(struct smunsigned char config, chip_dma, chip_irq;register_bank (fir_base,3 ); - config =inb (fir_base+IRCC_INTERFACE ); - chip_dma = config &IRCC_INTERFACE_DMA_MASK ; - chip_irq = (config &IRCC_INTERFACE_IRQ_MASK ) >>4 ; + config =inb (fir_base +IRCC_INTERFACE ); + chip_dma = config &IRCC_INTERFACE_DMA_MASK ; + chip_irq = (config &IRCC_INTERFACE_IRQ_MASK ) >>4 ; self->io.fir_base = fir_base; self->io.sir_base = sir_base;
@@ -610,41 +633,41 @@ static void smsc_ircc_init_chip(struct s {int iobase, ir_mode, ctrl, fast; - IRDA_ASSERT( self != NULL, return; ); - iobase = self->io.fir_base; + IRDA_ASSERT(self != NULL, return;); + iobase = self->io.fir_base; ir_mode =IRCC_CFGA_IRDA_SIR_A ; ctrl =0 ; fast =0 ;register_bank (iobase,0 ); -outb (IRCC_MASTER_RESET , iobase+IRCC_MASTER ); -outb (0x00 , iobase+IRCC_MASTER ); +outb (IRCC_MASTER_RESET , iobase +IRCC_MASTER ); +outb (0x00 , iobase +IRCC_MASTER );register_bank (iobase,1 ); -outb (((inb (iobase+IRCC_SCE_CFGA ) &0x87 ) | ir_mode), - iobase+IRCC_SCE_CFGA ); +outb (((inb (iobase +IRCC_SCE_CFGA ) &0x87 ) | ir_mode), + iobase +IRCC_SCE_CFGA );#ifdef smsc_669/* Uses pin 88/89 for Rx/Tx */ -outb (((inb (iobase+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), - iobase+IRCC_SCE_CFGB ); +outb (((inb (iobase +IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), + iobase +IRCC_SCE_CFGB );#else -outb (((inb (iobase+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), - iobase+IRCC_SCE_CFGB ); +outb (((inb (iobase +IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), + iobase +IRCC_SCE_CFGB );#endif - (void )inb (iobase+IRCC_FIFO_THRESHOLD ); -outb (SMSC_IRCC2_FIFO_THRESHOLD , iobase+IRCC_FIFO_THRESHOLD ); + (void )inb (iobase +IRCC_FIFO_THRESHOLD ); +outb (SMSC_IRCC2_FIFO_THRESHOLD , iobase +IRCC_FIFO_THRESHOLD );register_bank (iobase,4 ); -outb ((inb (iobase+IRCC_CONTROL ) &0x30 ) | ctrl, iobase+IRCC_CONTROL ); +outb ((inb (iobase +IRCC_CONTROL ) &0x30 ) | ctrl, iobase +IRCC_CONTROL );register_bank (iobase,0 ); -outb (fast, iobase+IRCC_LCR_A ); +outb (fast, iobase +IRCC_LCR_A );smsc_ircc_set_sir_speed (self,SMSC_IRCC2_C_IRDA_FALLBACK_SPEED );/* Power on device */ -outb (0x00 , iobase+IRCC_MASTER ); +outb (0x00 , iobase +IRCC_MASTER ); }/*
@@ -770,7 +793,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu/* Check if we need to change the speed */ speed =irda_get_next_speed (skb); -if ((speed != self->io.speed) && (speed !=-1 )) { +if (speed != self->io.speed && speed !=-1 ) {/* Check for empty frame */ if (!skb->len) {/*
@@ -787,9 +810,8 @@ int smsc_ircc_hard_xmit_sir(struct sk_buspin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb);return 0 ; - }else { - self->new_speed = speed; } + self->new_speed = speed; }/* Init tx buffer */
@@ -802,7 +824,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu self->stats.tx_bytes += self->tx_buff.len;/* Turn on transmit finished interrupt. Will fire immediately! */ -outb (UART_IER_THRI , iobase+UART_IER ); +outb (UART_IER_THRI , iobase +UART_IER );spin_unlock_irqrestore (&self->lock, flags);
@@ -826,7 +848,7 @@ static void smsc_ircc_set_fir_speed(stru self->io.speed = speed; -switch (speed) { +switch (speed) {default :case 576000 : ir_mode =IRCC_CFGA_IRDA_HDLC ;
@@ -853,14 +875,14 @@ static void smsc_ircc_set_fir_speed(stru Now in tranceiver!/* This causes an interrupt */ register_bank (fir_base,0 ); -outb ((inb (fir_base+IRCC_LCR_A ) &0xbf ) | fast, fir_base+IRCC_LCR_A ); +outb ((inb (fir_base +IRCC_LCR_A ) &0xbf ) | fast, fir_base +IRCC_LCR_A );#endif register_bank (fir_base,1 ); -outb (((inb (fir_base+IRCC_SCE_CFGA ) &IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK ) | ir_mode), fir_base+IRCC_SCE_CFGA ); +outb (((inb (fir_base +IRCC_SCE_CFGA ) &IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK ) | ir_mode), fir_base +IRCC_SCE_CFGA );register_bank (fir_base,4 ); -outb ((inb (fir_base+IRCC_CONTROL ) &0x30 ) | ctrl, fir_base+IRCC_CONTROL ); +outb ((inb (fir_base +IRCC_CONTROL ) &0x30 ) | ctrl, fir_base +IRCC_CONTROL ); }/*
@@ -888,28 +910,28 @@ static void smsc_ircc_fir_start(struct s dev->hard_start_xmit = smsc_ircc_hard_xmit_fir;/* Clear FIFO */ -outb (inb (fir_base+IRCC_LCR_A )|IRCC_LCR_A_FIFO_RESET , fir_base+IRCC_LCR_A ); +outb (inb (fir_base +IRCC_LCR_A ) |IRCC_LCR_A_FIFO_RESET , fir_base +IRCC_LCR_A );/* Enable interrupt */ -/*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base+IRCC_IER);*/ +/*outb(IRCC_IER_ACTIVE_FRAME|IRCC_IER_EOM, fir_base + IRCC_IER);*/ register_bank (fir_base,1 );/* Select the TX/RX interface */ #ifdef SMSC_669 /* Uses pin 88/89 for Rx/Tx */ -outb (((inb (fir_base+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), - fir_base+IRCC_SCE_CFGB ); +outb (((inb (fir_base +IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_COM ), + fir_base +IRCC_SCE_CFGB );#else -outb (((inb (fir_base+IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), - fir_base+IRCC_SCE_CFGB ); +outb (((inb (fir_base +IRCC_SCE_CFGB ) &0x3f ) |IRCC_CFGB_MUX_IR ), + fir_base +IRCC_SCE_CFGB );#endif - (void )inb (fir_base+IRCC_FIFO_THRESHOLD ); + (void )inb (fir_base +IRCC_FIFO_THRESHOLD );/* Enable SCE interrupts */ -outb (0 , fir_base+IRCC_MASTER ); +outb (0 , fir_base +IRCC_MASTER );register_bank (fir_base,0 ); -outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , fir_base+IRCC_IER ); -outb (IRCC_MASTER_INT_EN , fir_base+IRCC_MASTER ); +outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , fir_base +IRCC_IER ); +outb (IRCC_MASTER_INT_EN , fir_base +IRCC_MASTER ); }/*
@@ -928,8 +950,8 @@ static void smsc_ircc_fir_stop(struct sm fir_base = self->io.fir_base;register_bank (fir_base,0 ); -/*outb(IRCC_MASTER_RESET, fir_base+IRCC_MASTER);*/ -outb (inb (fir_base+IRCC_LCR_B ) &IRCC_LCR_B_SIP_ENABLE , fir_base+IRCC_LCR_B ); +/*outb(IRCC_MASTER_RESET, fir_base + IRCC_MASTER);*/ +outb (inb (fir_base +IRCC_LCR_B ) &IRCC_LCR_B_SIP_ENABLE , fir_base +IRCC_LCR_B ); }
@@ -964,26 +986,26 @@ static void smsc_ircc_change_speed(voidsmsc_ircc_fir_start (self);#endif -if (self->io.speed ==0 ) +if (self->io.speed ==0 )smsc_ircc_sir_start (self);#if 0 -if (!last_speed_was_sir) speed = self->io.speed; +if (!last_speed_was_sir) speed = self->io.speed;#endif -if (self->io.speed != speed)smsc_ircc_set_transceiver_for_speed (self, speed); +if (self->io.speed != speed) +smsc_ircc_set_transceiver_for_speed (self, speed); self->io.speed = speed; -if (speed <=SMSC_IRCC2_MAX_SIR_SPEED ) { -if (!last_speed_was_sir) { +if (speed <=SMSC_IRCC2_MAX_SIR_SPEED ) { +if (!last_speed_was_sir) {smsc_ircc_fir_stop (self);smsc_ircc_sir_start (self); }smsc_ircc_set_sir_speed (self, speed); - } -else { -if (last_speed_was_sir) { + }else { +if (last_speed_was_sir) {#if SMSC_IRCC2_C_SIR_STOP smsc_ircc_sir_stop (self);#endif
@@ -1027,9 +1049,9 @@ void smsc_ircc_set_sir_speed(void *priv, self->io.speed = speed;/* Turn off interrupts */ -outb (0 , iobase+UART_IER ); +outb (0 , iobase +UART_IER ); - divisor =SMSC_IRCC2_MAX_SIR_SPEED /speed; + divisor =SMSC_IRCC2_MAX_SIR_SPEED / speed; fcr =UART_FCR_ENABLE_FIFO ;
@@ -1038,22 +1060,20 @@ void smsc_ircc_set_sir_speed(void *priv,* almost 1,7 ms at 19200 bps. At speeds above that we can just forget * about this timeout since it will always be fast enough. */ -if (self->io.speed <38400 ) - fcr |=UART_FCR_TRIGGER_1 ; -else - fcr |=UART_FCR_TRIGGER_14 ; + fcr |= self->io.speed <38400 ? +UART_FCR_TRIGGER_1 :UART_FCR_TRIGGER_14 ;/* IrDA ports use 8N1 */ lcr =UART_LCR_WLEN8 ; -outb (UART_LCR_DLAB | lcr, iobase+UART_LCR );/* Set DLAB */ -outb (divisor &0xff , iobase+UART_DLL );/* Set speed */ -outb (divisor >>8 , iobase+UART_DLM ); -outb (lcr, iobase+UART_LCR );/* Set 8N1 */ -outb (fcr, iobase+UART_FCR );/* Enable FIFO's */ +outb (UART_LCR_DLAB | lcr, iobase +UART_LCR );/* Set DLAB */ +outb (divisor &0xff , iobase +UART_DLL );/* Set speed */ +outb (divisor >>8 , iobase +UART_DLM ); +outb (lcr, iobase +UART_LCR );/* Set 8N1 */ +outb (fcr, iobase +UART_FCR );/* Enable FIFO's */ /* Turn on interrups */ -outb (UART_IER_RLSI |UART_IER_RDI |UART_IER_THRI , iobase+UART_IER ); +outb (UART_IER_RLSI |UART_IER_RDI |UART_IER_THRI , iobase +UART_IER );IRDA_DEBUG (2 ,"%s() speed changed to: %d\n" , __FUNCTION__, speed); }
@@ -1086,7 +1106,7 @@ static int smsc_ircc_hard_xmit_fir(struc/* Check if we need to change the speed after this frame */ speed =irda_get_next_speed (skb); -if ((speed != self->io.speed) && (speed !=-1 )) { +if (speed != self->io.speed && speed !=-1 ) {/* Check for empty frame */ if (!skb->len) {/* Note : you should make sure that speed changes
@@ -1096,8 +1116,9 @@ static int smsc_ircc_hard_xmit_fir(strucspin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb);return 0 ; - }else - self->new_speed = speed; + } + + self->new_speed = speed; }memcpy (self->tx_buff.head, skb->data, skb->len);
@@ -1122,6 +1143,7 @@ static int smsc_ircc_hard_xmit_fir(struc/* Transmit frame */ smsc_ircc_dma_xmit (self, iobase,0 ); } +spin_unlock_irqrestore (&self->lock, flags);dev_kfree_skb (skb);
@@ -1142,30 +1164,30 @@ static void smsc_ircc_dma_xmit(struct sm#if 1 /* Disable Rx */ register_bank (iobase,0 ); -outb (0x00 , iobase+IRCC_LCR_B ); +outb (0x00 , iobase +IRCC_LCR_B );#endif register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , - iobase+IRCC_SCE_CFGB ); +outb (inb (iobase +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , + iobase +IRCC_SCE_CFGB ); self->io.direction =IO_XMIT ;/* Set BOF additional count for generating the min turn time */ register_bank (iobase,4 ); -outb (bofs &0xff , iobase+IRCC_BOF_COUNT_LO ); - ctrl =inb (iobase+IRCC_CONTROL ) &0xf0 ; -outb (ctrl | ((bofs >>8 ) &0x0f ), iobase+IRCC_BOF_COUNT_HI ); +outb (bofs &0xff , iobase +IRCC_BOF_COUNT_LO ); + ctrl =inb (iobase +IRCC_CONTROL ) &0xf0 ; +outb (ctrl | ((bofs >>8 ) &0x0f ), iobase +IRCC_BOF_COUNT_HI );/* Set max Tx frame size */ -outb (self->tx_buff.len >>8 , iobase+IRCC_TX_SIZE_HI ); -outb (self->tx_buff.len &0xff , iobase+IRCC_TX_SIZE_LO ); +outb (self->tx_buff.len >>8 , iobase +IRCC_TX_SIZE_HI ); +outb (self->tx_buff.len &0xff , iobase +IRCC_TX_SIZE_LO );/*outb(UART_MCR_OUT2, self->io.sir_base + UART_MCR);*/ /* Enable burst mode chip Tx DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE | -IRCC_CFGB_DMA_BURST , iobase+IRCC_SCE_CFGB ); +outb (inb (iobase +IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE | +IRCC_CFGB_DMA_BURST , iobase +IRCC_SCE_CFGB );/* Setup DMA controller (must be done after enabling chip DMA) */ irda_setup_dma(self->io.dma, self->tx_buff_dma, self->tx_buff.len,
@@ -1174,11 +1196,11 @@ static void smsc_ircc_dma_xmit(struct sm/* Enable interrupt */ register_bank (iobase,0 ); -outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase+IRCC_IER ); -outb (IRCC_MASTER_INT_EN , iobase+IRCC_MASTER ); +outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase +IRCC_IER ); +outb (IRCC_MASTER_INT_EN , iobase +IRCC_MASTER );/* Enable transmit */ -outb (IRCC_LCR_B_SCE_TRANSMIT |IRCC_LCR_B_SIP_ENABLE , iobase+IRCC_LCR_B ); +outb (IRCC_LCR_B_SCE_TRANSMIT |IRCC_LCR_B_SIP_ENABLE , iobase +IRCC_LCR_B ); }/*
@@ -1194,25 +1216,25 @@ static void smsc_ircc_dma_xmit_complete(#if 0 /* Disable Tx */ register_bank (iobase,0 ); -outb (0x00 , iobase+IRCC_LCR_B ); +outb (0x00 , iobase +IRCC_LCR_B );#endif register_bank (self->io.fir_base,1 ); -outb (inb (self->io.fir_base+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , - self->io.fir_base+IRCC_SCE_CFGB ); +outb (inb (self->io.fir_base +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , + self->io.fir_base +IRCC_SCE_CFGB );/* Check for underrun! */ register_bank (iobase,0 ); -if (inb (iobase+IRCC_LSR ) &IRCC_LSR_UNDERRUN ) { +if (inb (iobase +IRCC_LSR ) &IRCC_LSR_UNDERRUN ) { self->stats.tx_errors++; self->stats.tx_fifo_errors++;/* Reset error condition */ register_bank (iobase,0 ); -outb (IRCC_MASTER_ERROR_RESET , iobase+IRCC_MASTER ); -outb (0x00 , iobase+IRCC_MASTER ); +outb (IRCC_MASTER_ERROR_RESET , iobase +IRCC_MASTER ); +outb (0x00 , iobase +IRCC_MASTER ); }else { self->stats.tx_packets++; - self->stats.tx_bytes += self->tx_buff.len; + self->stats.tx_bytes += self->tx_buff.len; }/* Check if it's time to change the speed */
@@ -1236,26 +1258,26 @@ static int smsc_ircc_dma_receive(struct#if 0 /* Turn off chip DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , - iobase+IRCC_SCE_CFGB ); +outb (inb (iobase +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , + iobase +IRCC_SCE_CFGB );#endif /* Disable Tx */ register_bank (iobase,0 ); -outb (0x00 , iobase+IRCC_LCR_B ); +outb (0x00 , iobase +IRCC_LCR_B );/* Turn off chip DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , - iobase+IRCC_SCE_CFGB ); +outb (inb (iobase +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , + iobase +IRCC_SCE_CFGB ); self->io.direction =IO_RECV ; self->rx_buff.data = self->rx_buff.head;/* Set max Rx frame size */ register_bank (iobase,4 ); -outb ((2050 >>8 ) &0x0f , iobase+IRCC_RX_SIZE_HI ); -outb (2050 &0xff , iobase+IRCC_RX_SIZE_LO ); +outb ((2050 >>8 ) &0x0f , iobase +IRCC_RX_SIZE_HI ); +outb (2050 &0xff , iobase +IRCC_RX_SIZE_LO );/* Setup DMA controller */ irda_setup_dma(self->io.dma, self->rx_buff_dma, self->rx_buff.truesize,
@@ -1263,19 +1285,18 @@ static int smsc_ircc_dma_receive(struct/* Enable burst mode chip Rx DMA */ register_bank (iobase,1 ); -outb (inb (iobase+IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE | -IRCC_CFGB_DMA_BURST , iobase+IRCC_SCE_CFGB ); +outb (inb (iobase +IRCC_SCE_CFGB ) |IRCC_CFGB_DMA_ENABLE | +IRCC_CFGB_DMA_BURST , iobase +IRCC_SCE_CFGB );/* Enable interrupt */ register_bank (iobase,0 ); -outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase+IRCC_IER ); -outb (IRCC_MASTER_INT_EN , iobase+IRCC_MASTER ); - +outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase +IRCC_IER ); +outb (IRCC_MASTER_INT_EN , iobase +IRCC_MASTER );/* Enable receiver */ register_bank (iobase,0 );outb (IRCC_LCR_B_SCE_RECEIVE |IRCC_LCR_B_SIP_ENABLE , - iobase+IRCC_LCR_B ); + iobase +IRCC_LCR_B );return 0 ; }
@@ -1297,43 +1318,43 @@ static void smsc_ircc_dma_receive_comple#if 0 /* Disable Rx */ register_bank (iobase,0 ); -outb (0x00 , iobase+IRCC_LCR_B ); +outb (0x00 , iobase +IRCC_LCR_B );#endif register_bank (iobase,0 ); -outb (inb (iobase+IRCC_LSAR ) & ~IRCC_LSAR_ADDRESS_MASK , iobase+IRCC_LSAR ); - lsr=inb (iobase+IRCC_LSR ); - msgcnt =inb (iobase+IRCC_LCR_B ) &0x08 ; +outb (inb (iobase +IRCC_LSAR ) & ~IRCC_LSAR_ADDRESS_MASK , iobase +IRCC_LSAR ); + lsr=inb (iobase +IRCC_LSR ); + msgcnt =inb (iobase +IRCC_LCR_B ) &0x08 ;IRDA_DEBUG (2 ,"%s: dma count = %d\n" , __FUNCTION__,get_dma_residue (self->io.dma)); len = self->rx_buff.truesize -get_dma_residue (self->io.dma); -/* Look for errors -*/ - -if (lsr & (IRCC_LSR_FRAME_ERROR |IRCC_LSR_CRC_ERROR |IRCC_LSR_SIZE_ERROR )) { +/* Look for errors */ +if (lsr & (IRCC_LSR_FRAME_ERROR |IRCC_LSR_CRC_ERROR |IRCC_LSR_SIZE_ERROR )) { self->stats.rx_errors++; -if (lsr &IRCC_LSR_FRAME_ERROR ) self->stats.rx_frame_errors++; -if (lsr &IRCC_LSR_CRC_ERROR ) self->stats.rx_crc_errors++; -if (lsr &IRCC_LSR_SIZE_ERROR ) self->stats.rx_length_errors++; -if (lsr & (IRCC_LSR_UNDERRUN |IRCC_LSR_OVERRUN )) self->stats.rx_length_errors++; +if (lsr &IRCC_LSR_FRAME_ERROR ) + self->stats.rx_frame_errors++; +if (lsr &IRCC_LSR_CRC_ERROR ) + self->stats.rx_crc_errors++; +if (lsr &IRCC_LSR_SIZE_ERROR ) + self->stats.rx_length_errors++; +if (lsr & (IRCC_LSR_UNDERRUN |IRCC_LSR_OVERRUN )) + self->stats.rx_length_errors++;return ; } +/* Remove CRC */ -if (self->io.speed <4000000 ) - len -=2 ; -else - len -=4 ; + len -= self->io.speed <4000000 ?2 :4 ; -if ((len <2 ) || (len >2050 )) { +if (len <2 || len >2050 ) {IRDA_WARNING ("%s(), bogus len=%d\n" , __FUNCTION__, len);return ; }IRDA_DEBUG (2 ,"%s: msgcnt = %d, len=%d\n" , __FUNCTION__, msgcnt, len); - skb =dev_alloc_skb (len+1 ); -if (!skb) { + skb =dev_alloc_skb (len +1 ); +if (!skb) {IRDA_WARNING ("%s(), memory squeeze, dropping frame.\n" , __FUNCTION__);return ;
@@ -1372,14 +1393,14 @@ static void smsc_ircc_sir_receive(struct*/ do {async_unwrap_char (self->netdev, &self->stats, &self->rx_buff, -inb (iobase+UART_RX )); +inb (iobase +UART_RX ));/* Make sure we don't stay here to long */ if (boguscount++ >32 ) {IRDA_DEBUG (2 ,"%s(), breaking!\n" , __FUNCTION__);break ; } - }while (inb (iobase+UART_LSR ) &UART_LSR_DR ); + }while (inb (iobase +UART_LSR ) &UART_LSR_DR ); }
@@ -1408,7 +1429,7 @@ static irqreturn_t smsc_ircc_interrupt(ispin_lock (&self->lock);/* Check if we should use the SIR interrupt handler */ -if (self->io.speed <=SMSC_IRCC2_MAX_SIR_SPEED ) { +if (self->io.speed <=SMSC_IRCC2_MAX_SIR_SPEED ) { ret =smsc_ircc_interrupt_sir (dev); goto irq_ret_unlock; }
@@ -1416,15 +1437,15 @@ static irqreturn_t smsc_ircc_interrupt(i iobase = self->io.fir_base;register_bank (iobase,0 ); - iir =inb (iobase+IRCC_IIR ); + iir =inb (iobase +IRCC_IIR );if (iir ==0 ) goto irq_ret_unlock; ret =IRQ_HANDLED ;/* Disable interrupts */ -outb (0 , iobase+IRCC_IER ); - lcra =inb (iobase+IRCC_LCR_A ); - lsr =inb (iobase+IRCC_LSR ); +outb (0 , iobase +IRCC_IER ); + lcra =inb (iobase +IRCC_LCR_A ); + lsr =inb (iobase +IRCC_LSR );IRDA_DEBUG (2 ,"%s(), iir = 0x%02x\n" , __FUNCTION__, iir);
@@ -1444,7 +1465,7 @@ static irqreturn_t smsc_ircc_interrupt(i/* Enable interrupts again */ register_bank (iobase,0 ); -outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase+IRCC_IER ); +outb (IRCC_IER_ACTIVE_FRAME |IRCC_IER_EOM , iobase +IRCC_IER ); irq_ret_unlock:spin_unlock (&self->lock);
@@ -1469,12 +1490,12 @@ static irqreturn_t smsc_ircc_interrupt_s iobase = self->io.sir_base; - iir =inb (iobase+UART_IIR ) &UART_IIR_ID ; + iir =inb (iobase +UART_IIR ) &UART_IIR_ID ;if (iir ==0 )return IRQ_NONE ;while (iir) {/* Clear interrupt */ - lsr =inb (iobase+UART_LSR ); + lsr =inb (iobase +UART_LSR );IRDA_DEBUG (4 ,"%s(), iir=%02x, lsr=%02x, iobase=%#x\n" , __FUNCTION__, iir, lsr, iobase);
@@ -1624,9 +1645,7 @@ static int smsc_ircc_net_close(struct ne self->irlap =NULL ;free_irq (self->io.irq, dev); -disable_dma (self->io.dma); -free_dma (self->io.dma);return 0 ;
@@ -1637,12 +1656,10 @@ static void smsc_ircc_suspend(struct sms {IRDA_MESSAGE ("%s, Suspending\n" , driver_name); -if (self->io.suspended) -return ; - -smsc_ircc_net_close (self->netdev); - - self->io.suspended =1 ; +if (!self->io.suspended) { +smsc_ircc_net_close (self->netdev); + self->io.suspended =1 ; + } }static void smsc_ircc_wakeup (struct smsc_ircc_cb *self)
@@ -1703,14 +1720,14 @@ static int __exit smsc_ircc_close(struct/* Stop interrupts */ register_bank (iobase,0 ); -outb (0 , iobase+IRCC_IER ); -outb (IRCC_MASTER_RESET , iobase+IRCC_MASTER ); -outb (0x00 , iobase+IRCC_MASTER ); +outb (0 , iobase +IRCC_IER ); +outb (IRCC_MASTER_RESET , iobase +IRCC_MASTER ); +outb (0x00 , iobase +IRCC_MASTER );#if 0 /* Reset to SIR mode */ register_bank (iobase,1 ); -outb (IRCC_CFGA_IRDA_SIR_A |IRCC_CFGA_TX_POLARITY , iobase+IRCC_SCE_CFGA ); -outb (IRCC_CFGB_IR , iobase+IRCC_SCE_CFGB ); +outb (IRCC_CFGA_IRDA_SIR_A |IRCC_CFGA_TX_POLARITY , iobase +IRCC_SCE_CFGA ); +outb (IRCC_CFGB_IR , iobase +IRCC_SCE_CFGB );#endif spin_unlock_irqrestore (&self->lock, flags);
@@ -1744,7 +1761,7 @@ static void __exit smsc_ircc_cleanup(voiIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); -for (i=0 ; i <2 ; i++) { +for (i =0 ; i <2 ; i++) {if (dev_self[i])smsc_ircc_close (dev_self[i]); }
@@ -1764,7 +1781,7 @@ void smsc_ircc_sir_start(struct smsc_ircIRDA_DEBUG (3 ,"%s\n" , __FUNCTION__); IRDA_ASSERT(self != NULL, return;); - dev= self->netdev; + dev = self->netdev; IRDA_ASSERT(dev != NULL, return;); dev->hard_start_xmit = &smsc_ircc_hard_xmit_sir;
@@ -1772,25 +1789,25 @@ void smsc_ircc_sir_start(struct smsc_irc sir_base = self->io.sir_base;/* Reset everything */ -outb (IRCC_MASTER_RESET , fir_base+IRCC_MASTER ); +outb (IRCC_MASTER_RESET , fir_base +IRCC_MASTER );#if SMSC_IRCC2_C_SIR_STOP /*smsc_ircc_sir_stop(self);*/ #endif register_bank (fir_base,1 ); -outb (((inb (fir_base+IRCC_SCE_CFGA ) &IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK ) |IRCC_CFGA_IRDA_SIR_A ), fir_base+IRCC_SCE_CFGA ); +outb (((inb (fir_base +IRCC_SCE_CFGA ) &IRCC_SCE_CFGA_BLOCK_CTRL_BITS_MASK ) |IRCC_CFGA_IRDA_SIR_A ), fir_base +IRCC_SCE_CFGA );/* Initialize UART */ -outb (UART_LCR_WLEN8 , sir_base+UART_LCR );/* Reset DLAB */ -outb ((UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 ), sir_base+UART_MCR ); +outb (UART_LCR_WLEN8 , sir_base +UART_LCR );/* Reset DLAB */ +outb ((UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 ), sir_base +UART_MCR );/* Turn on interrups */ -outb (UART_IER_RLSI |UART_IER_RDI |UART_IER_THRI , sir_base+UART_IER ); +outb (UART_IER_RLSI |UART_IER_RDI |UART_IER_THRI , sir_base +UART_IER );IRDA_DEBUG (3 ,"%s() - exit\n" , __FUNCTION__); -outb (0x00 , fir_base+IRCC_MASTER ); +outb (0x00 , fir_base +IRCC_MASTER ); }#if SMSC_IRCC2_C_SIR_STOP
@@ -1802,10 +1819,10 @@ void smsc_ircc_sir_stop(struct smsc_ircc iobase = self->io.sir_base;/* Reset UART */ -outb (0 , iobase+UART_MCR ); +outb (0 , iobase +UART_MCR );/* Turn off interrupts */ - outb(0, iobase+UART_IER); + outb(0, iobase + UART_IER); }#endif
@@ -1856,21 +1873,19 @@ static void smsc_ircc_sir_write_wakeup(s } self->stats.tx_packets++; -if (self->io.speed <=115200 ) { -/* -* Reset Rx FIFO to make sure that all reflected transmit data -* is discarded. This is needed for half duplex operation -*/ - fcr =UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_RCVR ; -if (self->io.speed <38400 ) - fcr |=UART_FCR_TRIGGER_1 ; -else - fcr |=UART_FCR_TRIGGER_14 ; +if (self->io.speed <=115200 ) { +/* +* Reset Rx FIFO to make sure that all reflected transmit data +* is discarded. This is needed for half duplex operation +*/ + fcr =UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_RCVR ; + fcr |= self->io.speed <38400 ? +UART_FCR_TRIGGER_1 :UART_FCR_TRIGGER_14 ; -outb (fcr, iobase+UART_FCR ); +outb (fcr, iobase +UART_FCR ); -/* Turn on receive interrupts */ -outb (UART_IER_RDI , iobase+UART_IER ); +/* Turn on receive interrupts */ +outb (UART_IER_RDI , iobase +UART_IER ); } } }
@@ -1886,15 +1901,15 @@ static int smsc_ircc_sir_write(int iobasint actual =0 ;/* Tx FIFO should be empty! */ -if (!(inb (iobase+UART_LSR ) &UART_LSR_THRE )) { +if (!(inb (iobase +UART_LSR ) &UART_LSR_THRE )) {IRDA_WARNING ("%s(), failed, fifo not empty!\n" , __FUNCTION__);return 0 ; }/* Fill FIFO with current frame */ -while ((fifo_size-- >0 ) && (actual < len)) { +while (fifo_size-- >0 && actual < len) {/* Transmit next byte */ -outb (buf[actual], iobase+UART_TX ); +outb (buf[actual], iobase +UART_TX ); actual++; }return actual;
@@ -1924,17 +1939,18 @@ static void smsc_ircc_probe_transceiver( IRDA_ASSERT(self != NULL, return;); -for (i=0 ; smsc_transceivers[i].name!=NULL ; i++) -if ((*smsc_transceivers[i].probe)(self->io.fir_base)) { +for (i =0 ; smsc_transceivers[i].name !=NULL ; i++) +if (smsc_transceivers[i].probe (self->io.fir_base)) {IRDA_MESSAGE (" %s transceiver found\n" , smsc_transceivers[i].name); - self->transceiver= i+1 ; + self->transceiver= i +1 ;return ; } +IRDA_MESSAGE ("No transceiver found. Defaulting to %s\n" , smsc_transceivers[SMSC_IRCC2_C_DEFAULT_TRANSCEIVER ].name); - self->transceiver=SMSC_IRCC2_C_DEFAULT_TRANSCEIVER ; + self->transceiver =SMSC_IRCC2_C_DEFAULT_TRANSCEIVER ; }
@@ -1949,7 +1965,8 @@ static void smsc_ircc_set_transceiver_founsigned int trx; trx = self->transceiver; -if (trx>0 ) (*smsc_transceivers[trx-1 ].set_for_speed)(self->io.fir_base, speed); +if (trx >0 ) + smsc_transceivers[trx -1 ].set_for_speed (self->io.fir_base, speed); }/*
@@ -1977,16 +1994,14 @@ static void smsc_ircc_set_transceiver_fostatic void smsc_ircc_sir_wait_hw_transmitter_finish (struct smsc_ircc_cb *self) { -int iobase; +int iobase = self->io.sir_base;int count =SMSC_IRCC2_HW_TRANSMITTER_TIMEOUT_US ; - iobase = self->io.sir_base; -/* Calibrated busy loop */ -while ((count-- >0 ) && !(inb (iobase+UART_LSR ) &UART_LSR_TEMT )) +while (count-- >0 && !(inb (iobase +UART_LSR ) &UART_LSR_TEMT ))udelay (1 ); -if (count ==0 ) +if (count ==0 )IRDA_DEBUG (0 ,"%s(): stuck transmitter\n" , __FUNCTION__); }
@@ -1999,34 +2014,36 @@ static void smsc_ircc_sir_wait_hw_transmstatic int __init smsc_ircc_look_for_chips (void ) {smsc_chip_address_t *address; -char *type; +char *type;unsigned int cfg_base, found; found =0 ; address = possible_addresses; -while (address->cfg_base){ +while (address->cfg_base) { cfg_base = address->cfg_base;/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/ -if ( address->type &SMSCSIO_TYPE_FDC ){ +if (address->type &SMSCSIO_TYPE_FDC ) { type ="FDC" ; -if ((address->type) &SMSCSIO_TYPE_FLAT ) { -if (!smsc_superio_flat (fdc_chips_flat,cfg_base, type)) found++; - } -if ((address->type) &SMSCSIO_TYPE_PAGED ) { -if (!smsc_superio_paged (fdc_chips_paged,cfg_base, type)) found++; - } +if (address->type &SMSCSIO_TYPE_FLAT ) +if (!smsc_superio_flat (fdc_chips_flat, cfg_base, type)) + found++; + +if (address->type &SMSCSIO_TYPE_PAGED ) +if (!smsc_superio_paged (fdc_chips_paged, cfg_base, type)) + found++; } -if ( address->type &SMSCSIO_TYPE_LPC ){ +if (address->type &SMSCSIO_TYPE_LPC ) { type ="LPC" ; -if ((address->type) &SMSCSIO_TYPE_FLAT ) { -if (!smsc_superio_flat (lpc_chips_flat,cfg_base,type)) found++; - } -if ((address->type) &SMSCSIO_TYPE_PAGED ) { -if (!smsc_superio_paged (lpc_chips_paged,cfg_base,"LPC" )) found++; - } +if (address->type &SMSCSIO_TYPE_FLAT ) +if (!smsc_superio_flat (lpc_chips_flat, cfg_base, type)) + found++; + +if (address->type &SMSCSIO_TYPE_PAGED ) +if (!smsc_superio_paged (lpc_chips_paged, cfg_base, type)) + found++; } address++; }
@@ -2047,38 +2064,36 @@ static int __init smsc_superio_flat(consIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); -if (smsc_ircc_probe (cfgbase,SMSCSIOFLAT_DEVICEID_REG , chips, type)==NULL ) +if (smsc_ircc_probe (cfgbase,SMSCSIOFLAT_DEVICEID_REG , chips, type) ==NULL )return ret;outb (SMSCSIOFLAT_UARTMODE0C_REG , cfgbase); - mode =inb (cfgbase+1 ); + mode =inb (cfgbase +1 );/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/ -if (!(mode &SMSCSIOFLAT_UART2MODE_VAL_IRDA )) +if (!(mode &SMSCSIOFLAT_UART2MODE_VAL_IRDA ))IRDA_WARNING ("%s(): IrDA not enabled\n" , __FUNCTION__);outb (SMSCSIOFLAT_UART2BASEADDR_REG , cfgbase); - sirbase =inb (cfgbase+1 ) <<2 ; + sirbase =inb (cfgbase +1 ) <<2 ;/* FIR iobase */ outb (SMSCSIOFLAT_FIRBASEADDR_REG , cfgbase); - firbase =inb (cfgbase+1 ) <<3 ; + firbase =inb (cfgbase +1 ) <<3 ;/* DMA */ outb (SMSCSIOFLAT_FIRDMASELECT_REG , cfgbase); - dma =inb (cfgbase+1 ) &SMSCSIOFLAT_FIRDMASELECT_MASK ; + dma =inb (cfgbase +1 ) &SMSCSIOFLAT_FIRDMASELECT_MASK ;/* IRQ */ outb (SMSCSIOFLAT_UARTIRQSELECT_REG , cfgbase); - irq =inb (cfgbase+1 ) &SMSCSIOFLAT_UART2IRQSELECT_MASK ; + irq =inb (cfgbase +1 ) &SMSCSIOFLAT_UART2IRQSELECT_MASK ;IRDA_MESSAGE ("%s(): fir: 0x%02x, sir: 0x%02x, dma: %02d, irq: %d, mode: 0x%02x\n" , __FUNCTION__, firbase, sirbase, dma, irq, mode); -if (firbase) { -if (smsc_ircc_open (firbase, sirbase, dma, irq) ==0 ) - ret=0 ; - } +if (firbase &&smsc_ircc_open (firbase, sirbase, dma, irq) ==0 ) + ret =0 ;/* Exit configuration */ outb (SMSCSIO_CFGEXITKEY , cfgbase);
@@ -2099,7 +2114,7 @@ static int __init smsc_superio_paged(conIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); -if (smsc_ircc_probe (cfg_base,0x20 ,chips,type)==NULL ) +if (smsc_ircc_probe (cfg_base,0x20 , chips, type) ==NULL )return ret;/* Select logical device (UART2) */
@@ -2108,7 +2123,7 @@ static int __init smsc_superio_paged(con/* SIR iobase */ outb (0x60 , cfg_base); - sir_io =inb (cfg_base +1 ) <<8 ; + sir_io =inb (cfg_base +1 ) <<8 ;outb (0x61 , cfg_base); sir_io |=inb (cfg_base +1 );
@@ -2119,10 +2134,8 @@ static int __init smsc_superio_paged(con fir_io |=inb (cfg_base +1 );outb (0x2b , cfg_base);/* ??? */ -if (fir_io) { -if (smsc_ircc_open (fir_io, sir_io, ircc_dma, ircc_irq) ==0 ) - ret=0 ; - } +if (fir_io &&smsc_ircc_open (fir_io, sir_io, ircc_dma, ircc_irq) ==0 ) + ret =0 ;/* Exit configuration */ outb (SMSCSIO_CFGEXITKEY , cfg_base);
@@ -2131,21 +2144,17 @@ static int __init smsc_superio_paged(con } -static int __init smsc_access (unsigned short cfg_base,unsigned char reg) +static int __init smsc_access (unsigned short cfg_base,unsigned char reg) {IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);outb (reg, cfg_base); - -if (inb (cfg_base)!=reg) -return -1 ; - -return 0 ; +return inb (cfg_base) != reg ?-1 :0 ; } -static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type) +static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type) { -u8 devid,xdevid,rev; +u8 devid, xdevid, rev;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);
@@ -2158,7 +2167,7 @@ static const smsc_chip_t * __init smsc_ioutb (reg, cfg_base); - xdevid=inb (cfg_base+1 ); + xdevid =inb (cfg_base +1 );/* Enter configuration */
@@ -2171,48 +2180,46 @@ static const smsc_chip_t * __init smsc_i/* probe device ID */ -if (smsc_access (cfg_base,reg)) +if (smsc_access (cfg_base, reg))return NULL ; - devid=inb (cfg_base+1 ); - -if (devid==0 )/* typical value for unused port */ -return NULL ; + devid =inb (cfg_base +1 ); -if (devid==0xff )/* typical value for unused port */ +if (devid ==0 || devid ==0xff )/* typical values for unused port */ return NULL ;/* probe revision ID */ -if (smsc_access (cfg_base,reg+1 )) +if (smsc_access (cfg_base, reg +1 ))return NULL ; - rev=inb (cfg_base+1 ); + rev =inb (cfg_base +1 ); -if (rev>=128 )/* i think this will make no sense */ +if (rev >=128 )/* i think this will make no sense */ return NULL ; -if (devid==xdevid)/* protection against false positives */ +if (devid == xdevid)/* protection against false positives */ return NULL ;/* Check for expected device ID; are there others? */ -while (chip->devid!=devid) { +while (chip->devid != devid) { chip++; -if (chip->name==NULL ) +if (chip->name ==NULL )return NULL ; } -IRDA_MESSAGE ("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n" ,devid,rev,cfg_base,type,chip->name); +IRDA_MESSAGE ("found SMC SuperIO Chip (devid=0x%02x rev=%02X base=0x%04x): %s%s\n" , + devid, rev, cfg_base, type, chip->name); -if (chip->rev>rev){ +if (chip->rev > rev) {IRDA_MESSAGE ("Revision higher than expected\n" );return NULL ; } -if (chip->flags&NoIRDA) +if (chip->flags & NoIRDA)IRDA_MESSAGE ("chipset does not support IRDA\n" );return chip;
@@ -2226,8 +2233,8 @@ static int __init smsc_superio_fdc(unsigIRDA_WARNING ("%s: can't get cfg_base of 0x%03x\n" , __FUNCTION__, cfg_base); }else { -if (!smsc_superio_flat (fdc_chips_flat,cfg_base,"FDC" ) - ||!smsc_superio_paged (fdc_chips_paged,cfg_base,"FDC" )) +if (!smsc_superio_flat (fdc_chips_flat, cfg_base,"FDC" ) || + !smsc_superio_paged (fdc_chips_paged, cfg_base,"FDC" )) ret =0 ;release_region (cfg_base,2 );
@@ -2244,9 +2251,10 @@ static int __init smsc_superio_lpc(unsigIRDA_WARNING ("%s: can't get cfg_base of 0x%03x\n" , __FUNCTION__, cfg_base); }else { -if (!smsc_superio_flat (lpc_chips_flat,cfg_base,"LPC" ) - ||!smsc_superio_paged (lpc_chips_paged,cfg_base,"LPC" )) +if (!smsc_superio_flat (lpc_chips_flat, cfg_base,"LPC" ) || + !smsc_superio_paged (lpc_chips_paged, cfg_base,"LPC" )) ret =0 ; +release_region (cfg_base,2 ); }return ret;
@@ -2269,18 +2277,23 @@ static int __init smsc_superio_lpc(unsigstatic void smsc_ircc_set_transceiver_smsc_ircc_atc (int fir_base,u32 speed) {unsigned long jiffies_now, jiffies_timeout; -u8 val; +u8 val; - jiffies_now= jiffies; - jiffies_timeout= jiffies+SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES ; + jiffies_now = jiffies; + jiffies_timeout = jiffies +SMSC_IRCC2_ATC_PROGRAMMING_TIMEOUT_JIFFIES ;/* ATC */ register_bank (fir_base,4 ); -outb ((inb (fir_base+IRCC_ATC ) &IRCC_ATC_MASK ) |IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE , fir_base+IRCC_ATC ); -while ((val=(inb (fir_base+IRCC_ATC ) & IRCC_ATC_nPROGREADY)) && !time_after (jiffies, jiffies_timeout)); -if (val) +outb ((inb (fir_base +IRCC_ATC ) &IRCC_ATC_MASK ) | IRCC_ATC_nPROGREADY|IRCC_ATC_ENABLE , + fir_base +IRCC_ATC ); + +while ((val = (inb (fir_base +IRCC_ATC ) & IRCC_ATC_nPROGREADY)) && + !time_after (jiffies, jiffies_timeout)) +/* empty */ ; + +if (val)IRDA_WARNING ("%s(): ATC: 0x%02x\n" , __FUNCTION__, -inb (fir_base+IRCC_ATC )); +inb (fir_base +IRCC_ATC )); }/*
@@ -2304,22 +2317,20 @@ static int smsc_ircc_probe_transceiver_sstatic void smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select (int fir_base,u32 speed) { -u8 fast_mode; +u8 fast_mode; -switch (speed) - { -default : -case 576000 : +switch (speed) { +default : +case 576000 : fast_mode =0 ;break ; -case 1152000 : -case 4000000 : +case 1152000 : +case 4000000 : fast_mode =IRCC_LCR_A_FAST ;break ; - }register_bank (fir_base,0 ); -outb ((inb (fir_base+IRCC_LCR_A ) &0xbf ) | fast_mode, fir_base+IRCC_LCR_A ); +outb ((inb (fir_base +IRCC_LCR_A ) &0xbf ) | fast_mode, fir_base +IRCC_LCR_A ); }/*
@@ -2343,23 +2354,22 @@ static int smsc_ircc_probe_transceiver_sstatic void smsc_ircc_set_transceiver_toshiba_sat1800 (int fir_base,u32 speed) { -u8 fast_mode; +u8 fast_mode; -switch (speed) - { -default : -case 576000 : +switch (speed) { +default : +case 576000 : fast_mode =0 ;break ; -case 1152000 : -case 4000000 : +case 1152000 : +case 4000000 : fast_mode =/*IRCC_LCR_A_FAST |*/ IRCC_LCR_A_GP_DATA ;break ; }/* This causes an interrupt */ register_bank (fir_base,0 ); -outb ((inb (fir_base+IRCC_LCR_A ) &0xbf ) | fast_mode, fir_base+IRCC_LCR_A ); +outb ((inb (fir_base +IRCC_LCR_A ) &0xbf ) | fast_mode, fir_base +IRCC_LCR_A ); }/*
@@ -2377,20 +2387,3 @@ static int smsc_ircc_probe_transceiver_tmodule_init (smsc_ircc_init);module_exit (smsc_ircc_cleanup); - -MODULE_AUTHOR ("Daniele Peri <[email protected]>" ); -MODULE_DESCRIPTION ("SMC IrCC SIR/FIR controller driver" ); -MODULE_LICENSE ("GPL" ); - -module_param (ircc_dma, int,0 ); -MODULE_PARM_DESC (ircc_dma,"DMA channel" ); -module_param (ircc_irq, int,0 ); -MODULE_PARM_DESC (ircc_irq,"IRQ line" ); -module_param (ircc_fir, int,0 ); -MODULE_PARM_DESC (ircc_fir,"FIR Base Address" ); -module_param (ircc_sir, int,0 ); -MODULE_PARM_DESC (ircc_sir,"SIR Base Address" ); -module_param (ircc_cfg, int,0 ); -MODULE_PARM_DESC (ircc_cfg,"Configuration register base address" ); -module_param (ircc_transceiver, int,0 ); -MODULE_PARM_DESC (ircc_transceiver,"Transceiver type" );
PATCH 3/9 smsc-ircc2: drop DIM macro in favor of ARRAY_SIZE
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - remove home-grown DIM macro, use ARRAY_SIZE intead.
Also fix out-of-bound array access.
---
smsc-ircc2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/irda/smsc-ircc2.c +2 -3
@@ -163,7 +163,6 @@ struct smsc_ircc_cb {/* Constants */ static const char *driver_name ="smsc-ircc2" ; -#define DIM (x) (sizeof(x)/(sizeof(*(x))))#define SMSC_IRCC2_C_IRDA_FALLBACK_SPEED 9600#define SMSC_IRCC2_C_DEFAULT_TRANSCEIVER 1#define SMSC_IRCC2_C_NET_TIMEOUT 0
@@ -240,7 +239,7 @@ static smsc_transceiver_t smsc_transceiv { "ATC IRMode", smsc_ircc_set_transceiver_smsc_ircc_atc, smsc_ircc_probe_transceiver_smsc_ircc_atc }, { NULL, NULL } }; -#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (DIM(smsc_transceivers)-1) +#define SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS (ARRAY_SIZE(smsc_transceivers) - 1)/* SMC SuperIO chipsets definitions */
@@ -400,7 +399,7 @@ static int __init smsc_ircc_open(unsigne goto err_out; err = -ENOMEM ; -if (dev_count >DIM (dev_self)) { +if (dev_count >=ARRAY_SIZE (dev_self)) {IRDA_WARNING ("%s(), too many devices!\n" , __FUNCTION__); goto err_out1; }
PATCH 4/9 smsc-ircc2: remove typedefs
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - remove excessive typedefs.
---
smsc-ircc2.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-)
drivers/net/irda/smsc-ircc2.c +13 -26
@@ -105,17 +105,6 @@ struct smsc_transceiver {void (*set_for_speed)(int fir_base,u32 speed);int (*probe)(int fir_base); }; -typedef struct smsc_transceiver smsc_transceiver_t ; - -#if 0 -struct smc_chip { -char *name; -u16 flags; -u8 devid; -u8 rev; -}; -typedef struct smc_chip smc_chip_t ; -#endif struct smsc_chip {char *name;
@@ -126,13 +115,11 @@ struct smsc_chip {u8 devid;u8 rev; }; -typedef struct smsc_chip smsc_chip_t ;struct smsc_chip_address {unsigned int cfg_base;unsigned int type; }; -typedef struct smsc_chip_address smsc_chip_address_t ;/* Private data for each instance */ struct smsc_ircc_cb {
@@ -208,9 +195,9 @@ static void smsc_ircc_sir_wait_hw_transm/* Probing */ static int __init smsc_ircc_look_for_chips (void ); -static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type); -static int __init smsc_superio_flat (const smsc_chip_t *chips,unsigned short cfg_base,char *type); -static int __init smsc_superio_paged (const smsc_chip_t *chips,unsigned short cfg_base,char *type); +static const struct smsc_chip *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const struct smsc_chip *chip,char *type); +static int __init smsc_superio_flat (const struct smsc_chip *chips,unsigned short cfg_base,char *type); +static int __init smsc_superio_paged (const struct smsc_chip *chips,unsigned short cfg_base,char *type);static int __init smsc_superio_fdc (unsigned short cfg_base);static int __init smsc_superio_lpc (unsigned short cfg_base);
@@ -232,7 +219,7 @@ static int smsc_ircc_pmproc(struct pm_de/* Transceivers for SMSC-ircc */ -static smsc_transceiver_t smsc_transceivers[] = +static struct smsc_transceiver smsc_transceivers[] = { {"Toshiba Satellite 1800 (GP data pin select)" , smsc_ircc_set_transceiver_toshiba_sat1800, smsc_ircc_probe_transceiver_toshiba_sat1800 }, {"Fast pin select" , smsc_ircc_set_transceiver_smsc_ircc_fast_pin_select, smsc_ircc_probe_transceiver_smsc_ircc_fast_pin_select },
@@ -250,7 +237,7 @@ static smsc_transceiver_t smsc_transceiv#define FIR 4/* SuperIO Chip has fast IRDA */ #define SERx4 8/* SuperIO Chip supports 115,2 KBaud * 4=460,8 KBaud */ -static smsc_chip_t __initdata fdc_chips_flat[] = +static struct smsc_chip __initdata fdc_chips_flat[] = {/* Base address 0x3f0 or 0x370 */ {"37C44" ,KEY55_1 |NoIRDA,0x00 ,0x00 },/* This chip cannot be detected */
@@ -264,7 +251,7 @@ static smsc_chip_t __initdata fdc_chips_ { NULL } }; -static smsc_chip_t __initdata fdc_chips_paged[] = +static struct smsc_chip __initdata fdc_chips_paged[] = {/* Base address 0x3f0 or 0x370 */ {"37B72X" ,KEY55_1 |SIR |SERx4,0x4c ,0x00 },
@@ -283,7 +270,7 @@ static smsc_chip_t __initdata fdc_chips_ { NULL } }; -static smsc_chip_t __initdata lpc_chips_flat[] = +static struct smsc_chip __initdata lpc_chips_flat[] = {/* Base address 0x2E or 0x4E */ {"47N227" ,KEY55_1 |FIR |SERx4,0x5a ,0x00 },
@@ -291,7 +278,7 @@ static smsc_chip_t __initdata lpc_chips_ { NULL } }; -static smsc_chip_t __initdata lpc_chips_paged[] = +static struct smsc_chip __initdata lpc_chips_paged[] = {/* Base address 0x2E or 0x4E */ {"47B27X" ,KEY55_1 |SIR |SERx4,0x51 ,0x00 },
@@ -310,7 +297,7 @@ static smsc_chip_t __initdata lpc_chips_#define SMSCSIO_TYPE_FLAT 4#define SMSCSIO_TYPE_PAGED 8 -static smsc_chip_address_t __initdata possible_addresses[] = +static struct smsc_chip_address __initdata possible_addresses[] = { {0x3f0 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED }, {0x370 ,SMSCSIO_TYPE_FDC |SMSCSIO_TYPE_FLAT |SMSCSIO_TYPE_PAGED },
@@ -2012,7 +1999,7 @@ static void smsc_ircc_sir_wait_hw_transmstatic int __init smsc_ircc_look_for_chips (void ) { -smsc_chip_address_t *address; +struct smsc_chip_address *address;char *type;unsigned int cfg_base, found;
@@ -2055,7 +2042,7 @@ static int __init smsc_ircc_look_for_chi* Try to get configuration of a smc SuperIO chip with flat register model * */ -static int __init smsc_superio_flat (const smsc_chip_t *chips,unsigned short cfgbase,char *type) +static int __init smsc_superio_flat (const struct smsc_chip *chips,unsigned short cfgbase,char *type) {unsigned short firbase, sirbase;u8 mode, dma, irq;
@@ -2106,7 +2093,7 @@ static int __init smsc_superio_flat(cons* Try to get configuration of a smc SuperIO chip with paged register model * */ -static int __init smsc_superio_paged (const smsc_chip_t *chips,unsigned short cfg_base,char *type) +static int __init smsc_superio_paged (const struct smsc_chip *chips,unsigned short cfg_base,char *type) {unsigned short fir_io, sir_io;int ret = -ENODEV ;
@@ -2151,7 +2138,7 @@ static int __init smsc_access(unsigned sreturn inb (cfg_base) != reg ?-1 :0 ; } -static const smsc_chip_t *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const smsc_chip_t *chip,char *type) +static const struct smsc_chip *__init smsc_ircc_probe (unsigned short cfg_base,u8 reg,const struct smsc_chip *chip,char *type) {u8 devid, xdevid, rev;
PATCH 5/9 smsc-ircc2: dont pass iobase around
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - cleanup - do not pass around iobase, it can be
retrieved from smsc_ircc_cb structure.
---
smsc-ircc2.c | 61 +++++++++++++++++++++++++---------------------------------- 1 files changed, 26 insertions(+), 35 deletions(-)
drivers/net/irda/smsc-ircc2.c +26 -35
@@ -163,13 +163,13 @@ static void smsc_ircc_setup_io(struct smstatic void smsc_ircc_setup_qos (struct smsc_ircc_cb *self);static void smsc_ircc_init_chip (struct smsc_ircc_cb *self); static int __exit smsc_ircc_close(struct smsc_ircc_cb *self); -static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase); -static void smsc_ircc_dma_receive_complete (struct smsc_ircc_cb *self,int iobase); +static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self); +static void smsc_ircc_dma_receive_complete (struct smsc_ircc_cb *self);static void smsc_ircc_sir_receive (struct smsc_ircc_cb *self);static int smsc_ircc_hard_xmit_sir (struct sk_buff *skb,struct net_device *dev);static int smsc_ircc_hard_xmit_fir (struct sk_buff *skb,struct net_device *dev); -static void smsc_ircc_dma_xmit (struct smsc_ircc_cb *self,int iobase,int bofs); -static void smsc_ircc_dma_xmit_complete (struct smsc_ircc_cb *self,int iobase); +static void smsc_ircc_dma_xmit (struct smsc_ircc_cb *self,int bofs); +static void smsc_ircc_dma_xmit_complete (struct smsc_ircc_cb *self);static void smsc_ircc_change_speed (void *priv,u32 speed);static void smsc_ircc_set_sir_speed (void *priv,u32 speed);static irqreturn_t smsc_ircc_interrupt (int irq,void *dev_id,struct pt_regs *regs);
@@ -760,7 +760,6 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu {struct smsc_ircc_cb *self;unsigned long flags; -int iobase;s32 speed;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);
@@ -770,8 +769,6 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - iobase = self->io.sir_base; -netif_stop_queue (dev);/* Make sure test of self->io.speed & speed change are atomic */
@@ -810,7 +807,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu self->stats.tx_bytes += self->tx_buff.len;/* Turn on transmit finished interrupt. Will fire immediately! */ -outb (UART_IER_THRI , iobase +UART_IER ); +outb (UART_IER_THRI , self->io.sir_base +UART_IER );spin_unlock_irqrestore (&self->lock, flags);
@@ -953,14 +950,12 @@ static void smsc_ircc_change_speed(void {struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;struct net_device *dev; -int iobase;int last_speed_was_sir;IRDA_DEBUG (0 ,"%s() changing speed to: %d\n" , __FUNCTION__, speed); IRDA_ASSERT(self != NULL, return;); dev = self->netdev; - iobase = self->io.fir_base; last_speed_was_sir = self->io.speed <=SMSC_IRCC2_MAX_SIR_SPEED ;
@@ -1003,10 +998,10 @@ static void smsc_ircc_change_speed(void self->tx_buff.len =10 ; self->tx_buff.data = self->tx_buff.head; -smsc_ircc_dma_xmit (self, iobase,4000 ); +smsc_ircc_dma_xmit (self,4000 );#endif /* Be ready for incoming frames */ -smsc_ircc_dma_receive (self, iobase); +smsc_ircc_dma_receive (self); }netif_wake_queue (dev);
@@ -1076,15 +1071,12 @@ static int smsc_ircc_hard_xmit_fir(strucstruct smsc_ircc_cb *self;unsigned long flags;s32 speed; -int iobase;int mtt; IRDA_ASSERT(dev != NULL, return 0;); self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - iobase = self->io.fir_base; -netif_stop_queue (dev);/* Make sure test of self->io.speed & speed change are atomic */
@@ -1124,10 +1116,10 @@ static int smsc_ircc_hard_xmit_fir(strucif (bofs >4095 ) bofs =4095 ; -smsc_ircc_dma_xmit (self, iobase, bofs); +smsc_ircc_dma_xmit (self, bofs); }else {/* Transmit frame */ -smsc_ircc_dma_xmit (self, iobase,0 ); +smsc_ircc_dma_xmit (self,0 ); }spin_unlock_irqrestore (&self->lock, flags);
@@ -1137,13 +1129,14 @@ static int smsc_ircc_hard_xmit_fir(struc }/* -* Function smsc_ircc_dma_xmit (self, iobase) +* Function smsc_ircc_dma_xmit (self, bofs) * * Transmit data using DMA * */ -static void smsc_ircc_dma_xmit (struct smsc_ircc_cb *self,int iobase,int bofs) +static void smsc_ircc_dma_xmit (struct smsc_ircc_cb *self,int bofs) { +int iobase = self->io.fir_base;u8 ctrl;IRDA_DEBUG (3 ,"%s\n" , __FUNCTION__);
@@ -1196,17 +1189,19 @@ static void smsc_ircc_dma_xmit(struct sm* by the interrupt handler * */ -static void smsc_ircc_dma_xmit_complete (struct smsc_ircc_cb *self,int iobase) +static void smsc_ircc_dma_xmit_complete (struct smsc_ircc_cb *self) { +int iobase = self->io.fir_base; +IRDA_DEBUG (3 ,"%s\n" , __FUNCTION__);#if 0 /* Disable Tx */ register_bank (iobase,0 );outb (0x00 , iobase +IRCC_LCR_B );#endif -register_bank (self->io.fir_base,1 ); -outb (inb (self->io.fir_base +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , - self->io.fir_base +IRCC_SCE_CFGB ); +register_bank (iobase,1 ); +outb (inb (iobase +IRCC_SCE_CFGB ) & ~IRCC_CFGB_DMA_ENABLE , + iobase +IRCC_SCE_CFGB );/* Check for underrun! */ register_bank (iobase,0 );
@@ -1239,8 +1234,9 @@ static void smsc_ircc_dma_xmit_complete(* if it starts to receive a frame. * */ -static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self,int iobase) +static int smsc_ircc_dma_receive (struct smsc_ircc_cb *self) { +int iobase = self->io.fir_base;#if 0 /* Turn off chip DMA */ register_bank (iobase,1 );
@@ -1288,15 +1284,16 @@ static int smsc_ircc_dma_receive(struct }/* -* Function smsc_ircc_dma_receive_complete(self, iobase) +* Function smsc_ircc_dma_receive_complete(self) * * Finished with receiving frames * */ -static void smsc_ircc_dma_receive_complete (struct smsc_ircc_cb *self,int iobase) +static void smsc_ircc_dma_receive_complete (struct smsc_ircc_cb *self) {struct sk_buff *skb;int len, msgcnt, lsr; +int iobase = self->io.fir_base;register_bank (iobase,0 );
@@ -1437,11 +1434,11 @@ static irqreturn_t smsc_ircc_interrupt(iif (iir &IRCC_IIR_EOM ) {if (self->io.direction ==IO_RECV ) -smsc_ircc_dma_receive_complete (self, iobase); +smsc_ircc_dma_receive_complete (self);else -smsc_ircc_dma_xmit_complete (self, iobase); +smsc_ircc_dma_xmit_complete (self); -smsc_ircc_dma_receive (self, iobase); +smsc_ircc_dma_receive (self); }if (iir &IRCC_IIR_ACTIVE_FRAME ) {
@@ -1551,7 +1548,6 @@ static int ircc_is_receiving(struct smscstatic int smsc_ircc_net_open (struct net_device *dev) {struct smsc_ircc_cb *self; -int iobase;char hwname[16 ];unsigned long flags;
@@ -1561,8 +1557,6 @@ static int smsc_ircc_net_open(struct net self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - iobase = self->io.fir_base; -if (request_irq (self->io.irq, smsc_ircc_interrupt,0 , dev->name, (void *) dev)) { IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
@@ -1612,7 +1606,6 @@ static int smsc_ircc_net_open(struct netstatic int smsc_ircc_net_close (struct net_device *dev) {struct smsc_ircc_cb *self; -int iobase;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__);
@@ -1620,8 +1613,6 @@ static int smsc_ircc_net_close(struct ne self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); - iobase = self->io.fir_base; -/* Stop device */ netif_stop_queue (dev);
PATCH 6/9 smsc-ircc2: add to sysfs as platform device, new PM
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - add sysfs support (platform device and driver) and
switch power management to the new scheme.
---
smsc-ircc2.c | 125 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 67 insertions(+), 58 deletions(-)
drivers/net/irda/smsc-ircc2.c +67 -58
@@ -73,7 +73,6 @@ MODULE_AUTHOR("Daniele Peri <[email protected]MODULE_DESCRIPTION ("SMC IrCC SIR/FIR controller driver" );MODULE_LICENSE ("GPL" ); -static int ircc_dma =255 ;module_param (ircc_dma, int,0 );MODULE_PARM_DESC (ircc_dma,"DMA channel" );
@@ -144,17 +143,20 @@ struct smsc_ircc_cb {int tx_len;/* Number of frames in tx_buff */ int transceiver; -struct pm_dev *pmdev; +struct platform_device *pldev; };/* Constants */ -static const char *driver_name ="smsc-ircc2" ; +#define SMSC_IRCC2_DRIVER_NAME "smsc-ircc2" +#define SMSC_IRCC2_C_IRDA_FALLBACK_SPEED 9600#define SMSC_IRCC2_C_DEFAULT_TRANSCEIVER 1#define SMSC_IRCC2_C_NET_TIMEOUT 0#define SMSC_IRCC2_C_SIR_STOP 0 +static const char *driver_name =SMSC_IRCC2_DRIVER_NAME ; +/* Prototypes */ static int smsc_ircc_open (unsigned int firbase,unsigned int sirbase,u8 dma,u8 irq);
@@ -187,7 +189,6 @@ static int smsc_ircc_net_ioctl(struct nstatic void smsc_ircc_timeout (struct net_device *dev);#endif static struct net_device_stats *smsc_ircc_net_get_stats (struct net_device *dev); -static int smsc_ircc_pmproc (struct pm_dev *dev,pm_request_t rqst,void *data);static int smsc_ircc_is_receiving (struct smsc_ircc_cb *self);static void smsc_ircc_probe_transceiver (struct smsc_ircc_cb *self);static void smsc_ircc_set_transceiver_for_speed (struct smsc_ircc_cb *self,u32 speed);
@@ -212,10 +213,15 @@ static int smsc_ircc_probe_transceiver_/* Power Management */ -static void smsc_ircc_suspend (struct smsc_ircc_cb *self); -static void smsc_ircc_wakeup (struct smsc_ircc_cb *self); -static int smsc_ircc_pmproc (struct pm_dev *dev,pm_request_t rqst,void *data); +static int smsc_ircc_suspend (struct device *dev,pm_message_t state,u32 level); +static int smsc_ircc_resume (struct device *dev,u32 level); +static struct device_driver smsc_ircc_driver = { + .name =SMSC_IRCC2_DRIVER_NAME , + .bus = &platform_bus_type, + .suspend = smsc_ircc_suspend, + .resume = smsc_ircc_resume, +};/* Transceivers for SMSC-ircc */
@@ -335,34 +341,42 @@ static inline void register_bank(int iob*/ static int __init smsc_ircc_init (void ) { -int ret = -ENODEV ; +int ret;IRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); + ret =driver_register (&smsc_ircc_driver); +if (ret) { +IRDA_ERROR ("%s, Can't register driver!\n" , driver_name); +return ret; + } + dev_count =0 ;if (ircc_fir >0 && ircc_sir >0 ) {IRDA_MESSAGE (" Overriding FIR address 0x%04x\n" , ircc_fir);IRDA_MESSAGE (" Overriding SIR address 0x%04x\n" , ircc_sir); -if (smsc_ircc_open (ircc_fir, ircc_sir, ircc_dma, ircc_irq) ==0 ) -return 0 ; +if (smsc_ircc_open (ircc_fir, ircc_sir, ircc_dma, ircc_irq)) + ret = -ENODEV ; + }else { -return -ENODEV ; - } +/* try user provided configuration register base address */ +if (ircc_cfg >0 ) { +IRDA_MESSAGE (" Overriding configuration address " +"0x%04x\n" , ircc_cfg); +if (!smsc_superio_fdc (ircc_cfg)) + ret =0 ; +if (!smsc_superio_lpc (ircc_cfg)) + ret =0 ; + } -/* try user provided configuration register base address */ -if (ircc_cfg >0 ) { -IRDA_MESSAGE (" Overriding configuration address 0x%04x\n" , - ircc_cfg); -if (!smsc_superio_fdc (ircc_cfg)) - ret =0 ; -if (!smsc_superio_lpc (ircc_cfg)) +if (smsc_ircc_look_for_chips () >0 ) ret =0 ; } -if (smsc_ircc_look_for_chips () >0 ) - ret =0 ; +if (ret) +driver_unregister (&smsc_ircc_driver);return ret; }
@@ -420,7 +434,7 @@ static int __init smsc_ircc_open(unsigne dev->irq = self->io.irq = irq;/* Need to store self somewhere */ - dev_self[dev_count++] = self; + dev_self[dev_count] = self;spin_lock_init (&self->lock); self->rx_buff.truesize =SMSC_IRCC2_RX_BUFF_TRUESIZE ;
@@ -469,14 +483,22 @@ static int __init smsc_ircc_open(unsigne goto err_out4; } - self->pmdev =pm_register (PM_SYS_DEV ,PM_SYS_IRDA , smsc_ircc_pmproc); -if (self->pmdev) - self->pmdev->data = self; + self->pldev =platform_device_register_simple (SMSC_IRCC2_DRIVER_NAME , + dev_count,NULL ,0 ); +if (IS_ERR (self->pldev)) { + err =PTR_ERR (self->pldev); + goto err_out5; + } +dev_set_drvdata (&self->pldev->dev, self);IRDA_MESSAGE ("IrDA: Registered device %s\n" , dev->name); + dev_count++;return 0 ; + err_out5: +unregister_netdev (self->netdev); + err_out4:dma_free_coherent (NULL , self->tx_buff.truesize, self->tx_buff.head, self->tx_buff_dma);
@@ -485,7 +507,7 @@ static int __init smsc_ircc_open(unsigne self->rx_buff.head, self->rx_buff_dma); err_out2:free_netdev (self->netdev); - dev_self[--dev_count] =NULL ; + dev_self[dev_count] =NULL ; err_out1:release_region (fir_base,SMSC_IRCC2_FIR_CHIP_IO_EXTENT );release_region (sir_base,SMSC_IRCC2_SIR_CHIP_IO_EXTENT );
@@ -1628,44 +1650,31 @@ static int smsc_ircc_net_close(struct nereturn 0 ; } - -static void smsc_ircc_suspend (struct smsc_ircc_cb *self) +static int smsc_ircc_suspend (struct device *dev,pm_message_t state,u32 level) { +struct smsc_ircc_cb *self =dev_get_drvdata (dev); +IRDA_MESSAGE ("%s, Suspending\n" , driver_name); -if (!self->io.suspended) { +if (level ==SUSPEND_DISABLE && !self->io.suspended) {smsc_ircc_net_close (self->netdev); self->io.suspended =1 ; } + +return 0 ; } -static void smsc_ircc_wakeup (struct smsc_ircc_cb *self) +static int smsc_ircc_resume (struct device *dev,u32 level) { -if (!self->io.suspended) -return ; +struct smsc_ircc_cb *self =dev_get_drvdata (dev); -/* The code was doing a "cli()" here, but this can't be right. -* If you need protection, do it in net_open with a spinlock -* or give a good reason. - Jean II */ - -smsc_ircc_net_open (self->netdev); - -IRDA_MESSAGE ("%s, Waking up\n" , driver_name); -} - -static int smsc_ircc_pmproc (struct pm_dev *dev,pm_request_t rqst,void *data) -{ -struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->data; -if (self) { -switch (rqst) { -case PM_SUSPEND : -smsc_ircc_suspend (self); -break ; -case PM_RESUME : -smsc_ircc_wakeup (self); -break ; - } - } +if (level ==RESUME_ENABLE && self->io.suspended) { + +smsc_ircc_net_open (self->netdev); + self->io.suspended =0 ; + +IRDA_MESSAGE ("%s, Waking up\n" , driver_name); + }return 0 ; }
@@ -1684,10 +1693,7 @@ static int __exit smsc_ircc_close(struct IRDA_ASSERT(self != NULL, return -1;); - iobase = self->io.fir_base; - -if (self->pmdev) -pm_unregister (self->pmdev); +platform_device_unregister (self->pldev);/* Remove netdevice */ unregister_netdev (self->netdev);
@@ -1696,6 +1702,7 @@ static int __exit smsc_ircc_close(structspin_lock_irqsave (&self->lock, flags);/* Stop interrupts */ + iobase = self->io.fir_base;register_bank (iobase,0 );outb (0 , iobase +IRCC_IER );outb (IRCC_MASTER_RESET , iobase +IRCC_MASTER );
@@ -1742,6 +1749,8 @@ static void __exit smsc_ircc_cleanup(voiif (dev_self[i])smsc_ircc_close (dev_self[i]); } + +driver_unregister (&smsc_ircc_driver); }/*
PATCH 7/9 smsc-ircc2: PM cleanup - do not close device when suspending
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - avoid closing device and releasing DMA/interrupt
when suspending - they may not be available any more at resume time.
---
drivers/net/irda/smsc-ircc2.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-)
drivers/net/irda/smsc-ircc2.c +29 -6
@@ -1579,6 +1579,11 @@ static int smsc_ircc_net_open(struct net self = (struct smsc_ircc_cb *) dev->priv; IRDA_ASSERT(self != NULL, return 0;); +if (self->io.suspended) { +IRDA_DEBUG (0 ,"%s(), device is suspended\n" , __FUNCTION__); +return -EAGAIN ; + } +if (request_irq (self->io.irq, smsc_ircc_interrupt,0 , dev->name, (void *) dev)) { IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
@@ -1654,11 +1659,17 @@ static int smsc_ircc_suspend(struct devi {struct smsc_ircc_cb *self =dev_get_drvdata (dev); -IRDA_MESSAGE ("%s, Suspending\n" , driver_name); -if (level ==SUSPEND_DISABLE && !self->io.suspended) { -smsc_ircc_net_close (self->netdev); +IRDA_DEBUG ("%s, Suspending\n" , driver_name); + +rtnl_lock (); +if (netif_running (self->netdev)) { +netif_device_detach (self->netdev); +disable_irq (self->io.irq); +disable_dma (self->io.dma); + } self->io.suspended =1 ; +rtnl_unlock (); }return 0 ;
@@ -1667,13 +1678,25 @@ static int smsc_ircc_suspend(struct devistatic int smsc_ircc_resume (struct device *dev,u32 level) {struct smsc_ircc_cb *self =dev_get_drvdata (dev); +unsigned long flags;if (level ==RESUME_ENABLE && self->io.suspended) { +IRDA_DEBUG ("%s, Waking up\n" , driver_name); -smsc_ircc_net_open (self->netdev); +rtnl_lock (); +if (netif_running (self->netdev)) { +spin_lock_irqsave (&self->lock, flags); + self->io.speed =0 ; +smsc_ircc_change_speed (self, +SMSC_IRCC2_C_IRDA_FALLBACK_SPEED ); +spin_unlock_irqrestore (&self->lock, flags); + +enable_dma (self->io.dma); +enable_irq (self->io.irq); +netif_device_attach (self->netdev); + } self->io.suspended =0 ; - -IRDA_MESSAGE ("%s, Waking up\n" , driver_name); +rtnl_unlock (); }return 0 ; }
PATCH 8/9 smsc-ircc2: use netdev_priv()
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - use netdev_priv() instead of accessing pointer
directly.
---
smsc-ircc2.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-)
drivers/net/irda/smsc-ircc2.c +11 -12
@@ -426,7 +426,7 @@ static int __init smsc_ircc_open(unsigne dev->do_ioctl = smsc_ircc_net_ioctl; dev->get_stats = smsc_ircc_net_get_stats; - self = dev->priv; + self =netdev_priv (dev); self->netdev = dev;/* Make ifconfig display some details */
@@ -693,7 +693,7 @@ static int smsc_ircc_net_ioctl(struct ne IRDA_ASSERT(dev != NULL, return -1;); - self = dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return -1;);
@@ -740,7 +740,7 @@ static int smsc_ircc_net_ioctl(struct nestatic struct net_device_stats *smsc_ircc_net_get_stats (struct net_device *dev) { -struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) dev->priv; +struct smsc_ircc_cb *self =netdev_priv (dev);return &self->stats; }
@@ -755,11 +755,9 @@ static struct net_device_stats *smsc_ircstatic void smsc_ircc_timeout (struct net_device *dev) { -struct smsc_ircc_cb *self; +struct smsc_ircc_cb *self =netdev_priv (dev);unsigned long flags; - self = (struct smsc_ircc_cb *) dev->priv; -IRDA_WARNING ("%s: transmit timed out, changing speed to: %d\n" , dev->name, self->io.speed);spin_lock_irqsave (&self->lock, flags);
@@ -788,7 +786,7 @@ int smsc_ircc_hard_xmit_sir(struct sk_bu IRDA_ASSERT(dev != NULL, return 0;); - self = (struct smsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);netif_stop_queue (dev);
@@ -1096,7 +1094,7 @@ static int smsc_ircc_hard_xmit_fir(strucint mtt; IRDA_ASSERT(dev != NULL, return 0;); - self = (struct smsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);netif_stop_queue (dev);
@@ -1427,7 +1425,8 @@ static irqreturn_t smsc_ircc_interrupt(i driver_name, irq); goto irq_ret; } - self = (struct smsc_ircc_cb *) dev->priv; + + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return IRQ_NONE;);/* Serialise the interrupt handler in various CPUs, stop Tx path */
@@ -1485,7 +1484,7 @@ static irqreturn_t smsc_ircc_interrupt(i*/ static irqreturn_t smsc_ircc_interrupt_sir (struct net_device *dev) { -struct smsc_ircc_cb *self = dev->priv; +struct smsc_ircc_cb *self =netdev_priv (dev);int boguscount =0 ;int iobase;int iir, lsr;
@@ -1576,7 +1575,7 @@ static int smsc_ircc_net_open(struct netIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct smsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);if (self->io.suspended) {
@@ -1637,7 +1636,7 @@ static int smsc_ircc_net_close(struct neIRDA_DEBUG (1 ,"%s\n" , __FUNCTION__); IRDA_ASSERT(dev != NULL, return -1;); - self = (struct smsc_ircc_cb *) dev->priv; + self =netdev_priv (dev); IRDA_ASSERT(self != NULL, return 0;);/* Stop device */
PATCH 9/9 smsc-ircc2: dont use void * where specific type will do
In reply to Dmitry TorokhovIRDA: smsc-ircc2 - do not over-use void * pointers, use specific
types wherever possible.
---
smsc-ircc2.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
drivers/net/irda/smsc-ircc2.c +4 -6
@@ -172,8 +172,8 @@ static int smsc_ircc_hard_xmit_sir(strustatic int smsc_ircc_hard_xmit_fir (struct sk_buff *skb,struct net_device *dev);static void smsc_ircc_dma_xmit (struct smsc_ircc_cb *self,int bofs);static void smsc_ircc_dma_xmit_complete (struct smsc_ircc_cb *self); -static void smsc_ircc_change_speed (void *priv,u32 speed); -static void smsc_ircc_set_sir_speed (void *priv,u32 speed); +static void smsc_ircc_change_speed (struct smsc_ircc_cb *self,u32 speed); +static void smsc_ircc_set_sir_speed (struct smsc_ircc_cb *self,u32 speed);static irqreturn_t smsc_ircc_interrupt (int irq,void *dev_id,struct pt_regs *regs);static irqreturn_t smsc_ircc_interrupt_sir (struct net_device *dev);static void smsc_ircc_sir_start (struct smsc_ircc_cb *self);
@@ -966,9 +966,8 @@ static void smsc_ircc_fir_stop(struct sm* This function *must* be called with spinlock held, because it may * be called from the irq handler. - Jean II */ -static void smsc_ircc_change_speed (void *priv,u32 speed) +static void smsc_ircc_change_speed (struct smsc_ircc_cb *self,u32 speed) { -struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;struct net_device *dev;int last_speed_was_sir;
@@ -1033,9 +1032,8 @@ static void smsc_ircc_change_speed(void* Set speed of IrDA port to specified baudrate * */ -void smsc_ircc_set_sir_speed (void *priv,__u32 speed) +void smsc_ircc_set_sir_speed (struct smsc_ircc_cb *self,__u32 speed) { -struct smsc_ircc_cb *self = (struct smsc_ircc_cb *) priv;int iobase;int fcr;/* FIFO control reg */ int lcr;/* Line control reg */