s390: lcs and claw patches for linux-2.6.29-rc2
Subsystems (4)
cover s390: lcs and claw patches for linux-2.6.29-rc2
Signature · 13 lines
Jeff, here are 2 patches for s390 network device drivers. The patches apply to linux-2.6.29-rc2. Heiko Carstens (1) lcs: fix compilation for !CONFIG_IP_MULTICAST Andy Richter (1) claw: convert claw printk messages to dev_xxx / pr_xxx macros Thanks and kind regards, Ursula Braun
PATCH 1/2 lcs: fix compilation for !CONFIG_IP_MULTICAST
From: Heiko Carstens <[email protected]>
drivers/s390/net/lcs.c: In function 'lcs_new_device':drivers/s390/net/lcs.c:2179: error: implicit declaration of function 'lcs_set_multicast_list'
Reported-by Kamalesh Babulal <[email protected]>
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Ursula Braun <[email protected]>
---
drivers/s390/net/lcs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/s390/net/lcs.c +6 -2
@@ -70,7 +70,9 @@ static char debug_buffer[255];static void lcs_tasklet (unsigned long );static void lcs_start_kernel_thread (struct work_struct *);static void lcs_get_frames_cb (struct lcs_channel *,struct lcs_buffer *); +#ifdef CONFIG_IP_MULTICAST static int lcs_send_delipm (struct lcs_card *,struct lcs_ipm_list *); +#endif /* CONFIG_IP_MULTICAST */ static int lcs_recovery (void *ptr);/**
@@ -1285,6 +1287,8 @@ out:lcs_clear_thread_running_bit (card,LCS_SET_MC_THREAD ); return 0; } +#endif /* CONFIG_IP_MULTICAST */ +/** * function called by net device to * handle multicast address relevant things
@@ -1292,6 +1296,7 @@ out:static void lcs_set_multicast_list (struct net_device *dev) { +#ifdef CONFIG_IP_MULTICAST struct lcs_card *card;LCS_DBF_TEXT (4 , trace,"setmulti" );
@@ -1299,9 +1304,8 @@ lcs_set_multicast_list(struct net_deviceif (!lcs_set_thread_start_bit (card,LCS_SET_MC_THREAD ))schedule_work (&card->kernel_thread_starter); -} -#endif /* CONFIG_IP_MULTICAST */ +}static long lcs_check_irb_error (struct ccw_device *cdev,struct irb *irb)
PATCH 2/2 kmsg: convert claw printk messages
In reply to Ursula BraunFrom: Andy Richter <[email protected]>
claw printks are converted to dev_xxx and pr_xxx macros.
Signed-off-by Andy Richter <[email protected]>
Signed-off-by Ursula Braun <[email protected]>
---
drivers/s390/net/claw.c | 431 +++++++++++++++++++++++++----------------------- 1 file changed, 233 insertions(+), 198 deletions(-)
drivers/s390/net/claw.c +233 -198
@@ -60,6 +60,9 @@* 1.25 Added Packing support * 1.5 */ + +#define KMSG_COMPONENT "claw" +#include <asm/ccwdev.h> #include <asm/ccwgroup.h> #include <asm/debug.h>
@@ -94,7 +97,7 @@CLAW uses the s390dbf file system see claw_trace and claw_setup */ - +static char version[]__initdata ="CLAW driver" ;static char debug_buffer[255 ];/** * Debug Facility Stuff
@@ -206,20 +209,30 @@ static struct net_device_stats *claw_stastatic int pages_to_order_of_mag (int num_of_pages);static struct sk_buff *claw_pack_skb (struct claw_privbk *privptr);/* sysfs Functions */ -static ssize_t claw_hname_show (struct device *dev,struct device_attribute *attr,char *buf); -static ssize_t claw_hname_write (struct device *dev,struct device_attribute *attr, +static ssize_t claw_hname_show (struct device *dev, +struct device_attribute *attr,char *buf); +static ssize_t claw_hname_write (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count); -static ssize_t claw_adname_show (struct device *dev,struct device_attribute *attr,char *buf); -static ssize_t claw_adname_write (struct device *dev,struct device_attribute *attr, +static ssize_t claw_adname_show (struct device *dev, +struct device_attribute *attr,char *buf); +static ssize_t claw_adname_write (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count); -static ssize_t claw_apname_show (struct device *dev,struct device_attribute *attr,char *buf); -static ssize_t claw_apname_write (struct device *dev,struct device_attribute *attr, +static ssize_t claw_apname_show (struct device *dev, +struct device_attribute *attr,char *buf); +static ssize_t claw_apname_write (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count); -static ssize_t claw_wbuff_show (struct device *dev,struct device_attribute *attr,char *buf); -static ssize_t claw_wbuff_write (struct device *dev,struct device_attribute *attr, +static ssize_t claw_wbuff_show (struct device *dev, +struct device_attribute *attr,char *buf); +static ssize_t claw_wbuff_write (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count); -static ssize_t claw_rbuff_show (struct device *dev,struct device_attribute *attr,char *buf); -static ssize_t claw_rbuff_write (struct device *dev,struct device_attribute *attr, +static ssize_t claw_rbuff_show (struct device *dev, +struct device_attribute *attr,char *buf); +static ssize_t claw_rbuff_write (struct device *dev, +struct device_attribute *attr,const char *buf,size_t count);static int claw_add_files (struct device *dev);static void claw_remove_files (struct device *dev);
@@ -298,8 +311,8 @@ claw_probe(struct ccwgroup_device *cgdevif (rc) {probe_error (cgdev);put_device (&cgdev->dev); -printk (KERN_WARNING "add_files failed %s %s Exit Line %d \n" , -dev_name (&cgdev->cdev[0 ]->dev), __func__, __LINE__); +dev_err (&cgdev->dev,"Creating the /proc files for a new" +" CLAW device failed\n" );CLAW_DBF_TEXT_ (2 , setup,"probex%d" , rc);return rc; }
@@ -496,7 +509,8 @@ claw_open(struct net_device *dev) ~(DEV_STAT_CHN_END | DEV_STAT_DEV_END)) != 0x00) || (((privptr->channel[READ].flag | privptr->channel[WRITE].flag) & CLAW_TIMER) != 0x00)) { -printk (KERN_INFO "%s: remote side is not ready\n" , dev->name); +dev_info (&privptr->channel[READ ].cdev->dev, +"%s: remote side is not ready\n" , dev->name);CLAW_DBF_TEXT (2 , trace,"notrdy" );for ( i =0 ; i <2 ; i++) {
@@ -582,10 +596,9 @@ claw_irq_handler(struct ccw_device *cdevCLAW_DBF_TEXT (4 , trace,"clawirq" );/* Bypass all 'unsolicited interrupts' */ if (!cdev->dev.driver_data) { -printk (KERN_WARNING "claw: unsolicited interrupt for device:" -"%s received c-%02x d-%02x\n" , -dev_name (&cdev->dev), irb->scsw.cmd.cstat, - irb->scsw.cmd.dstat); +dev_warn (&cdev->dev,"An uninitialized CLAW device received an" +" IRQ, c-%02x d-%02x\n" , + irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);CLAW_DBF_TEXT (2 , trace,"badirq" );return ; }
@@ -597,8 +610,7 @@ claw_irq_handler(struct ccw_device *cdevelse if (privptr->channel[WRITE ].cdev == cdev) p_ch = &privptr->channel[WRITE ];else { -printk (KERN_WARNING "claw: Can't determine channel for " -"interrupt, device %s\n" ,dev_name (&cdev->dev)); +dev_warn (&cdev->dev,"The device is not a CLAW device\n" );CLAW_DBF_TEXT (2 , trace,"badchan" );return ; }
@@ -612,7 +624,8 @@ claw_irq_handler(struct ccw_device *cdev/* Check for good subchannel return code, otherwise info message */ if (irb->scsw.cmd.cstat && !(irb->scsw.cmd.cstat &SCHN_STAT_PCI )) { - printk(KERN_INFO "%s: subchannel check for device: %04x -" + dev_info(&cdev->dev, + "%s: subchannel check for device: %04x -" " Sch Stat %02x Dev Stat %02x CPA - %04x\n", dev->name, p_ch->devno, irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
@@ -651,7 +664,7 @@ claw_irq_handler(struct ccw_device *cdevwake_up (&p_ch->wait);/* wake claw_open (READ)*/ }else if (p_ch->flag ==CLAW_WRITE ) { p_ch->claw_state =CLAW_START_WRITE ; -/* send SYSTEM_VALIDATE */ +/* send SYSTEM_VALIDATE */ claw_strt_read (dev,LOCK_NO ); claw_send_control(dev, SYSTEM_VALIDATE_REQUEST,
@@ -659,10 +672,9 @@ claw_irq_handler(struct ccw_device *cdev p_env->host_name, p_env->adapter_name); }else { -printk (KERN_WARNING "claw: unsolicited " -"interrupt for device:" -"%s received c-%02x d-%02x\n" , -dev_name (&cdev->dev), +dev_warn (&cdev->dev,"The CLAW device received" +" an unexpected IRQ, " +"c-%02x d-%02x\n" , irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);return ;
@@ -677,8 +689,8 @@ claw_irq_handler(struct ccw_device *cdev (p_ch->irb->ecw[0] & 0x40) == 0x40 || (p_ch->irb->ecw[0]) == 0) { privptr->stats.rx_errors++; -printk (KERN_INFO "%s: Restart is " -"required after remote " +dev_info (&cdev->dev, +"%s: Restart is required after remote " "side recovers \n" , dev->name); }
@@ -713,11 +725,13 @@ claw_irq_handler(struct ccw_device *cdevreturn ;case CLAW_START_WRITE :if (p_ch->irb->scsw.cmd.dstat &DEV_STAT_UNIT_CHECK ) { -printk (KERN_INFO "%s: Unit Check Occured in " +dev_info (&cdev->dev, +"%s: Unit Check Occured in " "write channel\n" , dev->name);clear_bit (0 , (void *)&p_ch->IO_active);if (p_ch->irb->ecw[0 ] &0x80 ) { -printk (KERN_INFO "%s: Resetting Event " +dev_info (&cdev->dev, +"%s: Resetting Event " "occurred:\n" , dev->name);init_timer (&p_ch->timer); p_ch->timer.function =
@@ -725,7 +739,8 @@ claw_irq_handler(struct ccw_device *cdev p_ch->timer.data = (unsigned long )p_ch; p_ch->timer.expires = jiffies +10 *HZ ;add_timer (&p_ch->timer); -printk (KERN_INFO "%s: write connection " +dev_info (&cdev->dev, +"%s: write connection " "restarting\n" , dev->name); }CLAW_DBF_TEXT (4 , trace,"rstrtwrt" );
@@ -733,9 +748,10 @@ claw_irq_handler(struct ccw_device *cdev }if (p_ch->irb->scsw.cmd.dstat &DEV_STAT_UNIT_EXCEP ) {clear_bit (0 , (void *)&p_ch->IO_active); -printk (KERN_INFO "%s: Unit Exception " -"Occured in write channel\n" , - dev->name); +dev_info (&cdev->dev, +"%s: Unit Exception " +"occurred in write channel\n" , + dev->name); } if (!((p_ch->irb->scsw.cmd.stctl & SCSW_STCTL_SEC_STATUS) || (p_ch->irb->scsw.cmd.stctl == SCSW_STCTL_STATUS_PEND) ||
@@ -757,8 +773,9 @@ claw_irq_handler(struct ccw_device *cdevCLAW_DBF_TEXT (4 , trace,"StWtExit" );return ;default : -printk (KERN_WARNING "%s: wrong selection code - irq " -"state=%d\n" , dev->name, p_ch->claw_state); +dev_warn (&cdev->dev, +"The CLAW device for %s received an unexpected IRQ\n" , + dev->name);CLAW_DBF_TEXT (2 , trace,"badIRQ" );return ; }
@@ -910,8 +927,10 @@ claw_release(struct net_device *dev)if (((privptr->channel[READ ].last_dstat | privptr->channel[WRITE ].last_dstat) & ~(DEV_STAT_CHN_END |DEV_STAT_DEV_END )) !=0x00 ) { -printk (KERN_WARNING "%s: channel problems during close - " -"read: %02x - write: %02x\n" , +dev_warn (&privptr->channel[READ ].cdev->dev, +"Deactivating %s completed with incorrect" +" subchannel status " +"(read %02x, write %02x)\n" , dev->name, privptr->channel[READ ].last_dstat, privptr->channel[WRITE ].last_dstat);
@@ -1076,8 +1095,8 @@ add_claw_reads(struct net_device *dev, s }if ( privptr-> p_read_active_first ==NULL ) { - privptr-> p_read_active_first= p_first;/* set new first */ - privptr-> p_read_active_last = p_last;/* set new last */ + privptr->p_read_active_first = p_first;/* set new first */ + privptr->p_read_active_last = p_last;/* set new last */ }else {
@@ -1113,7 +1132,7 @@ add_claw_reads(struct net_device *dev, s privptr->p_read_active_last->r_TIC_2.cda= (__u32 )__pa (&p_first->read); } -/* chain in new set of blocks */ +/* chain in new set of blocks */ privptr->p_read_active_last->next = p_first; privptr->p_read_active_last=p_last; }/* end of if ( privptr-> p_read_active_first ==NULL) */
@@ -1135,21 +1154,18 @@ ccw_check_return_code(struct ccw_devicecase -EBUSY :/* BUSY is a transient state no action needed */ break ;case -ENODEV : -printk (KERN_EMERG "%s: Missing device called " -"for IO ENODEV\n" ,dev_name (&cdev->dev)); -break ; -case -EIO : -printk (KERN_EMERG "%s: Status pending... EIO \n" , -dev_name (&cdev->dev)); +dev_err (&cdev->dev,"The remote channel adapter is not" +" available\n" );break ;case -EINVAL : -printk (KERN_EMERG "%s: Invalid Dev State EINVAL \n" , -dev_name (&cdev->dev)); +dev_err (&cdev->dev, +"The status of the remote channel adapter" +" is not valid\n" );break ;default : -printk (KERN_EMERG "%s: Unknown error in " -"Do_IO %d\n" ,dev_name (&cdev->dev), - return_code); +dev_err (&cdev->dev,"The common device layer" +" returned error code %d\n" , + return_code); } }CLAW_DBF_TEXT (4 , trace,"ccwret" );
@@ -1163,40 +1179,41 @@ static void ccw_check_unit_check(struct chbk * p_ch, unsigned char sense ) {struct net_device *ndev = p_ch->ndev; +struct device *dev = &p_ch->cdev->dev;CLAW_DBF_TEXT (4 , trace,"unitchek" ); -printk (KERN_INFO "%s: Unit Check with sense byte:0x%04x\n" , - ndev->name, sense); +dev_warn (dev,"The communication peer of %s disconnected\n" , + ndev->name);if (sense &0x40 ) {if (sense &0x01 ) { -printk (KERN_WARNING "%s: Interface disconnect or " -"Selective reset " -"occurred (remote side)\n" , ndev->name); - } -else { -printk (KERN_WARNING "%s: System reset occured" -" (remote side)\n" , ndev->name); +dev_warn (dev,"The remote channel adapter for" +" %s has been reset\n" , + ndev->name); } }else if (sense &0x20 ) {if (sense &0x04 ) { -printk (KERN_WARNING "%s: Data-streaming " -"timeout)\n" , ndev->name); +dev_warn (dev,"A data streaming timeout occurred" +" for %s\n" , + ndev->name); }else { -printk (KERN_WARNING "%s: Data-transfer parity" -" error\n" , ndev->name); +dev_warn (dev,"A data transfer parity error occurred" +" for %s\n" , + ndev->name); } }else if (sense &0x10 ) {if (sense &0x20 ) { -printk (KERN_WARNING "%s: Hardware malfunction " -"(remote side)\n" , ndev->name); +dev_warn (dev,"The remote channel adapter for %s" +" is faulty\n" , + ndev->name); }else { -printk (KERN_WARNING "%s: read-data parity error " -"(remote side)\n" , ndev->name); +dev_warn (dev,"A read data parity error occurred" +" for %s\n" , + ndev->name); } }
@@ -1375,7 +1392,7 @@ claw_hw_tx(struct sk_buff *skb, struct n*/ if (p_first_ccw!=NULL ) { -/* setup ending ccw sequence for this segment */ +/* setup ending ccw sequence for this segment */ pEnd=privptr->p_end_ccw;if (pEnd->write1) { pEnd->write1=0x00 ;/* second end ccw is now active */
@@ -1697,10 +1714,11 @@ init_ccw_bk(struct net_device *dev) p_buf-> w_TIC_1.flags =0 ; p_buf-> w_TIC_1.count =0 ; -if (((unsigned long )p_buff+privptr->p_env->write_size) >= +if (((unsigned long )p_buff + + privptr->p_env->write_size) >= ((unsigned long )(p_buff+2 * - (privptr->p_env->write_size) -1 ) &PAGE_MASK )) { - p_buff= p_buff+privptr->p_env->write_size; + (privptr->p_env->write_size) -1 ) &PAGE_MASK )) { + p_buff = p_buff+privptr->p_env->write_size; } } }
@@ -1840,15 +1858,16 @@ init_ccw_bk(struct net_device *dev) p_buf->header.opcode=0xff ; p_buf->header.flag=CLAW_PENDING ; -if (((unsigned long )p_buff+privptr->p_env->read_size) >= - ((unsigned long )(p_buff+2 *(privptr->p_env->read_size) -1 ) - &PAGE_MASK ) ) { +if (((unsigned long )p_buff+privptr->p_env->read_size) >= + ((unsigned long )(p_buff+2 *(privptr->p_env->read_size) + -1 ) + &PAGE_MASK )) { p_buff= p_buff+privptr->p_env->read_size; }else { p_buff= (void *)((unsigned long ) - (p_buff+2 *(privptr->p_env->read_size) -1 ) + (p_buff+2 *(privptr->p_env->read_size)-1 ) &PAGE_MASK ) ; } }/* for read_buffers */
@@ -1856,24 +1875,28 @@ init_ccw_bk(struct net_device *dev)else {/* read Size >= PAGE_SIZE */ for (i=0 ; i< privptr->p_env->read_buffers ; i++) { p_buff = (void *)__get_free_pages (__GFP_DMA, - (int )pages_to_order_of_mag (privptr->p_buff_pages_perread) ); + (int )pages_to_order_of_mag ( + privptr->p_buff_pages_perread));if (p_buff==NULL ) {free_pages ((unsigned long )privptr->p_buff_ccw, - (int )pages_to_order_of_mag (privptr->p_buff_ccw_num)); + (int )pages_to_order_of_mag (privptr-> + p_buff_ccw_num));/* free the write pages */ p_buf=privptr->p_buff_write;while (p_buf!=NULL ) { -free_pages ((unsigned long )p_buf->p_buffer, - (int )pages_to_order_of_mag ( - privptr->p_buff_pages_perwrite )); +free_pages ( + (unsigned long )p_buf->p_buffer, + (int )pages_to_order_of_mag ( + privptr->p_buff_pages_perwrite)); p_buf=p_buf->next; }/* free any read pages already alloc */ p_buf=privptr->p_buff_read;while (p_buf!=NULL ) { -free_pages ((unsigned long )p_buf->p_buffer, - (int )pages_to_order_of_mag ( - privptr->p_buff_pages_perread )); +free_pages ( + (unsigned long )p_buf->p_buffer, + (int )pages_to_order_of_mag ( + privptr->p_buff_pages_perread)); p_buf=p_buf->next; } privptr->p_buff_ccw=NULL ;
@@ -2003,7 +2026,7 @@ claw_process_control( struct net_device tdev = &privptr->channel[READ ].cdev->dev;memcpy ( &temp_host_name, p_env->host_name,8 );memcpy ( &temp_ws_name, p_env->adapter_name ,8 ); -printk (KERN_INFO "%s: CLAW device %.8s: " +dev_info (tdev,"%s: CLAW device %.8s: " "Received Control Packet\n" , dev->name, temp_ws_name);if (privptr->release_pend==1 ) {
@@ -2022,32 +2045,30 @@ claw_process_control( struct net_deviceif (p_ctlbk->version !=CLAW_VERSION_ID ) {claw_snd_sys_validate_rsp (dev, p_ctlbk,CLAW_RC_WRONG_VERSION ); -printk ("%s: %d is wrong version id. " -"Expected %d\n" , - dev->name, p_ctlbk->version, -CLAW_VERSION_ID ); +dev_warn (tdev,"The communication peer of %s" +" uses an incorrect API version %d\n" , + dev->name, p_ctlbk->version); } p_sysval = (struct sysval *)&(p_ctlbk->data); -printk ("%s: Recv Sys Validate Request: " -"Vers=%d,link_id=%d,Corr=%d,WS name=%." -"8s,Host name=%.8s\n" , - dev->name, p_ctlbk->version, - p_ctlbk->linkid, - p_ctlbk->correlator, - p_sysval->WS_name, - p_sysval->host_name); +dev_info (tdev,"%s: Recv Sys Validate Request: " +"Vers=%d,link_id=%d,Corr=%d,WS name=%.8s," +"Host name=%.8s\n" , + dev->name, p_ctlbk->version, + p_ctlbk->linkid, + p_ctlbk->correlator, + p_sysval->WS_name, + p_sysval->host_name);if (memcmp (temp_host_name, p_sysval->host_name,8 )) {claw_snd_sys_validate_rsp (dev, p_ctlbk,CLAW_RC_NAME_MISMATCH );CLAW_DBF_TEXT (2 , setup,"HSTBAD" );CLAW_DBF_TEXT_ (2 , setup,"%s" , p_sysval->host_name);CLAW_DBF_TEXT_ (2 , setup,"%s" , temp_host_name); -printk (KERN_INFO "%s: Host name mismatch\n" , - dev->name); -printk (KERN_INFO "%s: Received :%s: " -"expected :%s: \n" , - dev->name, +dev_warn (tdev, +"Host name %s for %s does not match the" +" remote adapter name %s\n" , p_sysval->host_name, + dev->name, temp_host_name); }if (memcmp (temp_ws_name, p_sysval->WS_name,8 )) {
@@ -2056,35 +2077,38 @@ claw_process_control( struct net_deviceCLAW_DBF_TEXT (2 , setup,"WSNBAD" );CLAW_DBF_TEXT_ (2 , setup,"%s" , p_sysval->WS_name);CLAW_DBF_TEXT_ (2 , setup,"%s" , temp_ws_name); -printk (KERN_INFO "%s: WS name mismatch\n" , - dev->name); -printk (KERN_INFO "%s: Received :%s: " -"expected :%s: \n" , - dev->name, - p_sysval->WS_name, - temp_ws_name); +dev_warn (tdev,"Adapter name %s for %s does not match" +" the remote host name %s\n" , + p_sysval->WS_name, + dev->name, + temp_ws_name); }if ((p_sysval->write_frame_size < p_env->write_size) && (p_env->packing ==0 )) {claw_snd_sys_validate_rsp (dev, p_ctlbk,CLAW_RC_HOST_RCV_TOO_SMALL ); -printk (KERN_INFO "%s: host write size is too " -"small\n" , dev->name); +dev_warn (tdev, +"The local write buffer is smaller than the" +" remote read buffer\n" );CLAW_DBF_TEXT (2 , setup,"wrtszbad" ); }if ((p_sysval->read_frame_size < p_env->read_size) && (p_env->packing ==0 )) {claw_snd_sys_validate_rsp (dev, p_ctlbk,CLAW_RC_HOST_RCV_TOO_SMALL ); -printk (KERN_INFO "%s: host read size is too " -"small\n" , dev->name); +dev_warn (tdev, +"The local read buffer is smaller than the" +" remote write buffer\n" );CLAW_DBF_TEXT (2 , setup,"rdsizbad" ); }claw_snd_sys_validate_rsp (dev, p_ctlbk,0 ); -printk (KERN_INFO "%s: CLAW device %.8s: System validate " -"completed.\n" , dev->name, temp_ws_name); -printk ("%s: sys Validate Rsize:%d Wsize:%d\n" , dev->name, - p_sysval->read_frame_size, p_sysval->write_frame_size); +dev_info (tdev, +"CLAW device %.8s: System validate" +" completed.\n" , temp_ws_name); +dev_info (tdev, +"%s: sys Validate Rsize:%d Wsize:%d\n" , + dev->name, p_sysval->read_frame_size, + p_sysval->write_frame_size); privptr->system_validate_comp =1 ;if (strncmp (p_env->api_type,WS_APPL_NAME_PACKED ,6 ) ==0 ) p_env->packing =PACKING_ASK ;
@@ -2092,8 +2116,10 @@ claw_process_control( struct net_devicebreak ;case SYSTEM_VALIDATE_RESPONSE : p_sysval = (struct sysval *)&(p_ctlbk->data); - printk("%s: Recv Sys Validate Resp: Vers=%d,Corr=%d,RC=%d," - "WS name=%.8s,Host name=%.8s\n", + dev_info(tdev, + "Settings for %s validated (version=%d, " + "remote device=%d, rc=%d, adapter name=%.8s, " + "host name=%.8s)\n", dev->name, p_ctlbk->version, p_ctlbk->correlator,
@@ -2102,41 +2128,39 @@ claw_process_control( struct net_device p_sysval->host_name);switch (p_ctlbk->rc) {case 0 : -printk (KERN_INFO "%s: CLAW device " -"%.8s: System validate " -"completed.\n" , - dev->name, temp_ws_name); +dev_info (tdev,"%s: CLAW device " +"%.8s: System validate completed.\n" , + dev->name, temp_ws_name);if (privptr->system_validate_comp ==0 )claw_strt_conn_req (dev); privptr->system_validate_comp =1 ;break ;case CLAW_RC_NAME_MISMATCH : -printk (KERN_INFO "%s: Sys Validate " -"Resp : Host, WS name is " -"mismatch\n" , - dev->name); +dev_warn (tdev,"Validating %s failed because of" +" a host or adapter name mismatch\n" , + dev->name);break ;case CLAW_RC_WRONG_VERSION : -printk (KERN_INFO "%s: Sys Validate " -"Resp : Wrong version\n" , +dev_warn (tdev,"Validating %s failed because of a" +" version conflict\n" , dev->name);break ;case CLAW_RC_HOST_RCV_TOO_SMALL : -printk (KERN_INFO "%s: Sys Validate " -"Resp : bad frame size\n" , +dev_warn (tdev,"Validating %s failed because of a" +" frame size conflict\n" , dev->name);break ;default : -printk (KERN_INFO "%s: Sys Validate " -"error code=%d \n" , - dev->name, p_ctlbk->rc); +dev_warn (tdev,"The communication peer of %s rejected" +" the connection\n" , + dev->name);break ; }break ;case CONNECTION_REQUEST : p_connect = (struct conncmd *)&(p_ctlbk->data); - printk(KERN_INFO "%s: Recv Conn Req: Vers=%d,link_id=%d," + dev_info(tdev, "%s: Recv Conn Req: Vers=%d,link_id=%d," "Corr=%d,HOST appl=%.8s,WS appl=%.8s\n", dev->name, p_ctlbk->version,
@@ -2146,21 +2170,21 @@ claw_process_control( struct net_device p_connect->WS_name);if (privptr->active_link_ID !=0 ) {claw_snd_disc (dev, p_ctlbk); -printk (KERN_INFO "%s: Conn Req error : " -"already logical link is active \n" , +dev_info (tdev,"%s rejected a connection request" +" because it is already active\n" , dev->name); }if (p_ctlbk->linkid !=1 ) {claw_snd_disc (dev, p_ctlbk); -printk (KERN_INFO "%s: Conn Req error : " -"req logical link id is not 1\n" , +dev_info (tdev,"%s rejected a request to open multiple" +" connections\n" , dev->name); } rc =find_link (dev, p_connect->host_name, p_connect->WS_name);if (rc !=0 ) {claw_snd_disc (dev, p_ctlbk); -printk (KERN_INFO "%s: Conn Resp error: " -"req appl name does not match\n" , +dev_info (tdev,"%s rejected a connection request" +" because of a type mismatch\n" , dev->name); } claw_send_control(dev,
@@ -2172,7 +2196,7 @@ claw_process_control( struct net_device p_env->packing =PACK_SEND ;claw_snd_conn_req (dev,0 ); } -printk (KERN_INFO "%s: CLAW device %.8s: Connection " +dev_info (tdev,"%s: CLAW device %.8s: Connection " "completed link_id=%d.\n" , dev->name, temp_ws_name, p_ctlbk->linkid);
@@ -2182,7 +2206,7 @@ claw_process_control( struct net_devicebreak ;case CONNECTION_RESPONSE : p_connect = (struct conncmd *)&(p_ctlbk->data); - printk(KERN_INFO "%s: Revc Conn Resp: Vers=%d,link_id=%d," + dev_info(tdev, "%s: Recv Conn Resp: Vers=%d,link_id=%d," "Corr=%d,RC=%d,Host appl=%.8s, WS appl=%.8s\n", dev->name, p_ctlbk->version,
@@ -2193,16 +2217,18 @@ claw_process_control( struct net_device p_connect->WS_name);if (p_ctlbk->rc !=0 ) { -printk (KERN_INFO "%s: Conn Resp error: rc=%d \n" , - dev->name, p_ctlbk->rc); +dev_warn (tdev,"The communication peer of %s rejected" +" a connection request\n" , + dev->name);return 1 ; } rc =find_link (dev, p_connect->host_name, p_connect->WS_name);if (rc !=0 ) {claw_snd_disc (dev, p_ctlbk); -printk (KERN_INFO "%s: Conn Resp error: " -"req appl name does not match\n" , +dev_warn (tdev,"The communication peer of %s" +" rejected a connection " +"request because of a type mismatch\n" , dev->name); }/* should be until CONNECTION_CONFIRM */
@@ -2210,7 +2236,8 @@ claw_process_control( struct net_devicebreak ;case CONNECTION_CONFIRM : p_connect = (struct conncmd *)&(p_ctlbk->data); - printk(KERN_INFO "%s: Recv Conn Confirm:Vers=%d,link_id=%d," + dev_info(tdev, + "%s: Recv Conn Confirm:Vers=%d,link_id=%d," "Corr=%d,Host appl=%.8s,WS appl=%.8s\n", dev->name, p_ctlbk->version,
@@ -2221,21 +2248,21 @@ claw_process_control( struct net_deviceif (p_ctlbk->linkid == -(privptr->active_link_ID)) { privptr->active_link_ID = p_ctlbk->linkid;if (p_env->packing >PACKING_ASK ) { -printk (KERN_INFO "%s: Confirmed Now packing\n" , - dev->name); +dev_info (tdev, +"%s: Confirmed Now packing\n" , dev->name); p_env->packing =DO_PACKED ; } p_ch = &privptr->channel[WRITE ];wake_up (&p_ch->wait); }else { -printk (KERN_INFO "%s: Conn confirm: " -"unexpected linkid=%d \n" , +dev_warn (tdev,"Activating %s failed because of" +" an incorrect link ID=%d\n" , dev->name, p_ctlbk->linkid);claw_snd_disc (dev, p_ctlbk); }break ;case DISCONNECT : -printk (KERN_INFO "%s: Disconnect: " +dev_info (tdev,"%s: Disconnect: " "Vers=%d,link_id=%d,Corr=%d\n" , dev->name, p_ctlbk->version, p_ctlbk->linkid, p_ctlbk->correlator);
@@ -2247,12 +2274,13 @@ claw_process_control( struct net_device privptr->active_link_ID =0 ;break ;case CLAW_ERROR : -printk (KERN_INFO "%s: CLAW ERROR detected\n" , +dev_warn (tdev,"The communication peer of %s failed\n" , dev->name);break ;default : -printk (KERN_INFO "%s: Unexpected command code=%d \n" , - dev->name, p_ctlbk->command); +dev_warn (tdev,"The communication peer of %s sent" +" an unknown command code\n" , + dev->name);break ; }
@@ -2294,12 +2322,14 @@ claw_send_control(struct net_device *devmemcpy (&p_sysval->host_name, local_name,8 );memcpy (&p_sysval->WS_name, remote_name,8 );if (privptr->p_env->packing >0 ) { - p_sysval->read_frame_size=DEF_PACK_BUFSIZE ; - p_sysval->write_frame_size=DEF_PACK_BUFSIZE ; + p_sysval->read_frame_size =DEF_PACK_BUFSIZE ; + p_sysval->write_frame_size =DEF_PACK_BUFSIZE ; }else {/* how big is the biggest group of packets */ - p_sysval->read_frame_size=privptr->p_env->read_size; - p_sysval->write_frame_size=privptr->p_env->write_size; + p_sysval->read_frame_size = + privptr->p_env->read_size; + p_sysval->write_frame_size = + privptr->p_env->write_size; }memset (&p_sysval->reserved,0x00 ,4 );break ;
@@ -2511,8 +2541,10 @@ unpack_read(struct net_device *dev ) mtc_this_frm=1 ;if (p_this_ccw->header.length!= privptr->p_env->read_size ) { -printk (KERN_INFO " %s: Invalid frame detected " -"length is %02x\n" , +dev_warn (p_dev, +"The communication peer of %s" +" sent a faulty" +" frame of length %02x\n" , dev->name, p_this_ccw->header.length); } }
@@ -2544,7 +2576,7 @@ unpack_next: goto NextFrame; p_packd = p_this_ccw->p_buffer+pack_off; p_packh = (struct clawph *) p_packd; -if ((p_packh->len ==0 ) ||/* all done with this frame? */ +if ((p_packh->len ==0 ) ||/* done with this frame? */ (p_packh->flag !=0 )) goto NextFrame; bytes_to_mov = p_packh->len;
@@ -2594,9 +2626,9 @@ unpack_next:netif_rx (skb); }else { +dev_info (p_dev,"Allocating a buffer for" +" incoming data failed\n" ); privptr->stats.rx_dropped++; -printk (KERN_WARNING "%s: %s() low on memory\n" , - dev->name,__func__); } privptr->mtc_offset=0 ; privptr->mtc_logical_link=-1 ;
@@ -2720,8 +2752,8 @@ claw_strt_out_IO( struct net_device *devif (test_and_set_bit (0 , (void *)&p_ch->IO_active) ==0 ) { parm = (unsigned long ) p_ch;CLAW_DBF_TEXT (2 , trace,"StWrtIO" ); - rc =ccw_device_start (p_ch->cdev,&p_first_ccw->write, parm, -0xff ,0 ); + rc =ccw_device_start (p_ch->cdev, &p_first_ccw->write, parm, +0xff ,0 );if (rc !=0 ) {ccw_check_return_code (p_ch->cdev, rc); }
@@ -2880,8 +2912,8 @@ claw_new_device(struct ccwgroup_device *int ret;struct ccw_dev_id dev_id; -printk (KERN_INFO "claw: add for %s\n" , -dev_name (&cgdev->cdev[READ ]->dev)); +dev_info (&cgdev->dev,"add for %s\n" , +dev_name (&cgdev->cdev[READ ]->dev));CLAW_DBF_TEXT (2 , setup,"new_dev" ); privptr = cgdev->dev.driver_data; cgdev->cdev[READ ]->dev.driver_data = privptr;
@@ -2897,29 +2929,28 @@ claw_new_device(struct ccwgroup_device *if (ret ==0 ) ret =add_channel (cgdev->cdev[1 ],1 ,privptr);if (ret !=0 ) { -printk (KERN_WARNING -"add channel failed with ret = %d\n" , ret); +dev_warn (&cgdev->dev,"Creating a CLAW group device" +" failed with error code %d\n" , ret); goto out; } ret =ccw_device_set_online (cgdev->cdev[READ ]);if (ret !=0 ) { -printk (KERN_WARNING -"claw: ccw_device_set_online %s READ failed " -"with ret = %d\n" ,dev_name (&cgdev->cdev[READ ]->dev), - ret); +dev_warn (&cgdev->dev, +"Setting the read subchannel online" +" failed with error code %d\n" , ret); goto out; } ret =ccw_device_set_online (cgdev->cdev[WRITE ]);if (ret !=0 ) { -printk (KERN_WARNING -"claw: ccw_device_set_online %s WRITE failed " -"with ret = %d\n" ,dev_name (&cgdev->cdev[WRITE ]->dev), - ret); +dev_warn (&cgdev->dev, +"Setting the write subchannel online " +"failed with error code %d\n" , ret); goto out; } dev =alloc_netdev (0 ,"claw%d" ,claw_init_netdevice);if (!dev) { -printk (KERN_WARNING "%s:alloc_netdev failed\n" ,__func__); +dev_warn (&cgdev->dev, +"Activating the CLAW device failed\n" ); goto out; } dev->ml_priv = privptr;
@@ -2947,13 +2978,13 @@ claw_new_device(struct ccwgroup_device * privptr->channel[WRITE ].ndev = dev; privptr->p_env->ndev = dev; -printk (KERN_INFO "%s:readsize=%d writesize=%d " +dev_info (&cgdev->dev,"%s:readsize=%d writesize=%d " "readbuffer=%d writebuffer=%d read=0x%04x write=0x%04x\n" , dev->name, p_env->read_size, p_env->write_size, p_env->read_buffers, p_env->write_buffers, p_env->devno[READ ], p_env->devno[WRITE ]); -printk (KERN_INFO "%s:host_name:%.8s, adapter_name " +dev_info (&cgdev->dev,"%s:host_name:%.8s, adapter_name " ":%.8s api_type: %.8s\n" , dev->name, p_env->host_name, p_env->adapter_name , p_env->api_type);
@@ -2997,8 +3028,8 @@ claw_shutdown_device(struct ccwgroup_dev ndev = priv->channel[READ ].ndev;if (ndev) {/* Close the device */ -printk (KERN_INFO -"%s: shuting down \n" ,ndev->name); +dev_info (&cgdev->dev,"%s: shutting down \n" , + ndev->name);if (ndev->flags &IFF_RUNNING ) ret =claw_release (ndev); ndev->flags &=~IFF_RUNNING ;
@@ -3023,8 +3054,7 @@ claw_remove_device(struct ccwgroup_devicCLAW_DBF_TEXT_ (2 , setup,"%s" ,dev_name (&cgdev->dev)); priv = cgdev->dev.driver_data;BUG_ON (!priv); -printk (KERN_INFO "claw: %s() called %s will be removed.\n" , - __func__,dev_name (&cgdev->cdev[0 ]->dev)); +dev_info (&cgdev->dev," will be removed.\n" );if (cgdev->state ==CCWGROUP_ONLINE )claw_shutdown_device (cgdev);claw_remove_files (&cgdev->dev);
@@ -3063,7 +3093,8 @@ claw_hname_show(struct device *dev, stru }static ssize_t -claw_hname_write (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +claw_hname_write (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct claw_privbk *priv;struct claw_env * p_env;
@@ -3100,7 +3131,8 @@ claw_adname_show(struct device *dev, str }static ssize_t -claw_adname_write (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +claw_adname_write (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct claw_privbk *priv;struct claw_env * p_env;
@@ -3138,7 +3170,8 @@ claw_apname_show(struct device *dev, str }static ssize_t -claw_apname_write (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +claw_apname_write (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct claw_privbk *priv;struct claw_env * p_env;
@@ -3185,7 +3218,8 @@ claw_wbuff_show(struct device *dev, stru }static ssize_t -claw_wbuff_write (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +claw_wbuff_write (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct claw_privbk *priv;struct claw_env * p_env;
@@ -3226,7 +3260,8 @@ claw_rbuff_show(struct device *dev, stru }static ssize_t -claw_rbuff_write (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) +claw_rbuff_write (struct device *dev,struct device_attribute *attr, +const char *buf,size_t count) {struct claw_privbk *priv;struct claw_env *p_env;
@@ -3289,7 +3324,7 @@ claw_cleanup(void) {unregister_cu3088_discipline (&claw_group_driver);claw_unregister_debug_facility (); -printk (KERN_INFO "claw: Driver unloaded\n" ); +pr_info ("Driver unloaded\n" ); }
@@ -3303,12 +3338,12 @@ static int __initclaw_init (void) {int ret =0 ; -printk (KERN_INFO "claw: starting driver\n" ); +pr_info ("Loading %s\n" , version); ret =claw_register_debug_facility ();if (ret) { -printk (KERN_WARNING "claw: %s() debug_register failed %d\n" , - __func__,ret); +pr_err ("Registering with the S/390 debug feature" +" failed with error code %d\n" , ret);return ret; }CLAW_DBF_TEXT (2 , setup,"init_mod" );
@@ -3316,8 +3351,8 @@ claw_init(void)if (ret) {CLAW_DBF_TEXT (2 , setup,"init_bad" );claw_unregister_debug_facility (); -printk (KERN_WARNING "claw; %s() cu3088 register failed %d\n" , - __func__,ret); +pr_err ("Registering with the cu3088 device driver failed " +"with error code %d\n" , ret); }return ret; }