bfa: update printk() usage
Subsystems (2)
cover bfa: update printk() usage
Hi all,
sparked off by a recent discussion here is a patchset to update the printk() usage in bfa.
All 'legacy' printk() calls are moved to structured logging (ie dev_printk() and friends), and the code is restructured to move the debugging code over to that, too.
As usual, comments and reviews are welcome.
Hannes Reinecke (4):
bfa: Remove legacy printk() usage
bfa: drop unused 'bfad' and 'pcidev' arguments
bfa: remove bfa_pcidev_s
bfa: move bfa_sm_fault() to dev_err()
drivers/scsi/bfa/bfa.h | 8 +--- drivers/scsi/bfa/bfa_core.c | 51 +++++++++++-------------- drivers/scsi/bfa/bfa_cs.h | 2 +- drivers/scsi/bfa/bfa_fcpim.c | 8 ++-- drivers/scsi/bfa/bfa_ioc.c | 68 +++++++++++++++++----------------- drivers/scsi/bfa/bfa_ioc.h | 23 +++--------- drivers/scsi/bfa/bfa_ioc_ct.c | 8 ++-- drivers/scsi/bfa/bfa_modules.h | 28 +++++--------- drivers/scsi/bfa/bfa_svc.c | 31 ++++++---------- drivers/scsi/bfa/bfad.c | 82 +++++++++++++++++------------------------ drivers/scsi/bfa/bfad_bsg.c | 12 ++---- drivers/scsi/bfa/bfad_debugfs.c | 32 ++++++---------- drivers/scsi/bfa/bfad_drv.h | 4 +- drivers/scsi/bfa/bfad_im.c | 14 +++---- 14 files changed, 150 insertions(+), 221 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/4 bfa: Remove legacy printk() usage
Replace the remaining callsites to use dev_printk() and friends.
--- drivers/scsi/bfa/bfad.c | 55 +++++++++++++++++------------------------ drivers/scsi/bfa/bfad_bsg.c | 12 +++------ drivers/scsi/bfa/bfad_debugfs.c | 32 +++++++++--------------- drivers/scsi/bfa/bfad_drv.h | 3 +++ drivers/scsi/bfa/bfad_im.c | 14 +++++------ 5 files changed, 48 insertions(+), 68 deletions(-)
drivers/scsi/bfa/bfad.c +23 -32
@@ -170,8 +170,7 @@ bfad_sm_uninit(struct bfad_s *bfad, enum bfad_sm_event event) bfad->bfad_tsk =kthread_create (bfad_worker, (void *) bfad,"%s" ,"bfad_worker" );if (IS_ERR (bfad->bfad_tsk)) { -printk (KERN_INFO "bfad[%d]: Kernel thread " -"creation failed!\n" , bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Kernel thread creation failed!\n" );bfa_sm_send_event (bfad,BFAD_E_KTHREAD_CREATE_FAILED ); }bfa_sm_send_event (bfad,BFAD_E_INIT );
@@ -205,8 +204,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)/* Enable Interrupt and wait bfa_init completion */ if (bfad_setup_intr (bfad)) { -printk (KERN_WARNING "bfad%d: bfad_setup_intr failed\n" , - bfad->inst_no); +BFA_MSG (KERN_WARNING , bfad,"bfad_setup_intr failed\n" );bfa_sm_send_event (bfad,BFAD_E_INIT_FAILED );break ; }
@@ -218,8 +216,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)/* Set up interrupt handler for each vectors */ if ((bfad->bfad_flags &BFAD_MSIX_ON ) &&bfad_install_msix_handler (bfad)) { -printk (KERN_WARNING "%s: install_msix failed, bfad%d\n" , - __func__, bfad->inst_no); +BFA_MSG (KERN_WARNING , bfad,"install_msix failed\n" ); }bfad_init_timer (bfad);
@@ -229,9 +226,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)if ((bfad->bfad_flags &BFAD_HAL_INIT_DONE )) {bfa_sm_send_event (bfad,BFAD_E_INIT_SUCCESS ); }else { -printk (KERN_WARNING -"bfa %s: bfa init failed\n" , - bfad->pci_name); +BFA_MSG (KERN_WARNING , bfad,"bfa init failed\n" );spin_lock_irqsave (&bfad->bfad_lock, flags);bfa_fcs_init (&bfad->bfa_fcs);spin_unlock_irqrestore (&bfad->bfad_lock, flags);
@@ -722,7 +717,7 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)int rc = -ENODEV ;if (pci_enable_device (pdev)) { -printk (KERN_ERR "pci_enable_device fail %p\n" , pdev); +dev_err (&pdev->dev,"pci_enable_device fail %p\n" , pdev); goto out; }
@@ -737,7 +732,7 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad)if (rc) { rc = -ENODEV ; -printk (KERN_ERR "dma_set_mask_and_coherent fail %p\n" , pdev); +dev_err (&pdev->dev,"dma_set_mask_and_coherent fail\n" ); goto out_release_region; }
@@ -748,7 +743,7 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) bfad->pci_bar2_kva =pci_iomap (pdev,2 ,pci_resource_len (pdev,2 ));if (bfad->pci_bar0_kva ==NULL ) { -printk (KERN_ERR "Fail to map bar0\n" ); +BFA_MSG (KERN_ERR , bfad,"Fail to map bar0\n" ); rc = -ENODEV ; goto out_release_region; }
@@ -774,13 +769,13 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) pcie_max_read_reqsz <= 4096 && is_power_of_2(pcie_max_read_reqsz)) {int max_rq =pcie_get_readrq (pdev); -printk (KERN_WARNING "BFA[%s]: " +dev_warn (&pdev->dev,"BFA[%s]: " "pcie_max_read_request_size is %d, " "reset to %d\n" , bfad->pci_name, max_rq, pcie_max_read_reqsz);pcie_set_readrq (pdev, pcie_max_read_reqsz); } else { -printk (KERN_WARNING "BFA[%s]: invalid " +dev_warn (&pdev->dev,"BFA[%s]: invalid " "pcie_max_read_request_size %d ignored\n" , bfad->pci_name, pcie_max_read_reqsz); }
@@ -822,10 +817,8 @@ bfad_drv_init(struct bfad_s *bfad) rc =bfad_hal_mem_alloc (bfad);if (rc !=BFA_STATUS_OK ) { -printk (KERN_WARNING "bfad%d bfad_hal_mem_alloc failure\n" , - bfad->inst_no); -printk (KERN_WARNING -"Not enough memory to attach all QLogic BR-series HBA ports. System may need more memory.\n" ); +BFA_MSG (KERN_WARNING , bfad,"bfad_hal_mem_alloc failure\n" ); +BFA_MSG (KERN_WARNING , bfad,"Not enough memory to attach all QLogic BR-series HBA ports. System may need more memory.\n" );return BFA_STATUS_FAILED ; }
@@ -1011,7 +1004,7 @@ bfad_start_ops(struct bfad_s *bfad) {/* BFAD level FC4 IM specific resource allocation */ retval =bfad_im_probe (bfad);if (retval !=BFA_STATUS_OK ) { -printk (KERN_WARNING "bfad_im_probe failed\n" ); +BFA_MSG (KERN_WARNING , bfad,"bfad_im_probe failed\n" );if (bfa_sm_cmp_state (bfad, bfad_sm_initializing))bfa_sm_set_state (bfad, bfad_sm_failed);return BFA_STATUS_FAILED ;
@@ -1038,8 +1031,8 @@ bfad_start_ops(struct bfad_s *bfad) { fc_vport =fc_vport_create (bfad->pport.im_port->shost,0 , &vid);if (!fc_vport) {wwn2str (pwwn_buf, vid.port_name); -printk (KERN_WARNING "bfad%d: failed to create pbc vport" -" %s\n" , bfad->inst_no, pwwn_buf); +BFA_MSG (KERN_WARNING , bfad,"failed to create pbc vport %s\n" , + pwwn_buf); }list_del (&vport->list_entry);kfree (vport);
@@ -1220,19 +1213,17 @@ bfad_setup_intr(struct bfad_s *bfad) msix_entries, bfad->nvec);/* In CT1 & CT2, try to allocate just one vector */ if (error == -ENOSPC &&bfa_asic_id_ctc (pdev->device)) { -printk (KERN_WARNING "bfa %s: trying one msix " -"vector failed to allocate %d[%d]\n" , - bfad->pci_name, bfad->nvec, error); +BFA_MSG (KERN_WARNING , bfad,"trying one msix vector " +"failed to allocate %d[%d]\n" , + bfad->nvec, error); bfad->nvec =1 ; error =pci_enable_msix_exact (bfad->pcidev, msix_entries,1 ); }if (error) { -printk (KERN_WARNING "bfad%d: " -"pci_enable_msix_exact failed (%d), " -"use line based.\n" , - bfad->inst_no, error); +BFA_MSG (KERN_WARNING , bfad,"pci_enable_msix_exact " +"failed (%d), use line based.\n" , error); goto line_based; }
@@ -1306,7 +1297,7 @@ bfad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) bfad->trcmod =kzalloc (sizeof (struct bfa_trc_mod_s ),GFP_KERNEL );if (!bfad->trcmod) { -printk (KERN_WARNING "Error alloc trace buffer!\n" ); +dev_warn (&pdev->dev,"Error alloc trace buffer!\n" ); error = -ENOMEM ; goto out_alloc_trace_failure; }
@@ -1328,7 +1319,7 @@ bfad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) retval =bfad_pci_init (pdev, bfad);if (retval) { -printk (KERN_WARNING "bfad_pci_init failure!\n" ); +dev_warn (&pdev->dev,"bfad_pci_init failure!\n" ); error = retval; goto out_pci_init_failure; }
@@ -1749,14 +1740,14 @@ bfad_read_firmware(struct pci_dev *pdev, u32 **bfi_image,const struct firmware *fw;if (request_firmware (&fw, fw_name, &pdev->dev)) { -printk (KERN_ALERT "Can't locate firmware %s\n" , fw_name); +dev_alert (&pdev->dev,"Can't locate firmware %s\n" , fw_name); *bfi_image =NULL ; goto out; } *bfi_image =vmalloc (fw->size);if (NULL == *bfi_image) { -printk (KERN_ALERT "Fail to allocate buffer for fw image " +dev_alert (&pdev->dev,"Fail to allocate buffer for fw image " "size=%x!\n" , (u32 ) fw->size); goto out; }
drivers/scsi/bfa/bfad_bsg.c +4 -8
@@ -3441,16 +3441,14 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job)/* allocate memory for req / rsp buffers */ req_kbuf =kzalloc (job->request_payload.payload_len,GFP_KERNEL );if (!req_kbuf) { -printk (KERN_INFO "bfa %s: fcpt request buffer alloc failed\n" , - bfad->pci_name); +BFA_MSG (KERN_INFO , bfad,"fcpt request buffer alloc failed\n" ); rc = -ENOMEM ; goto out_free_mem; } rsp_kbuf =kzalloc (job->reply_payload.payload_len,GFP_KERNEL );if (!rsp_kbuf) { -printk (KERN_INFO "bfa %s: fcpt response buffer alloc failed\n" , - bfad->pci_name); +BFA_MSG (KERN_INFO , bfad,"fcpt response buffer alloc failed\n" ); rc = -ENOMEM ; goto out_free_mem; }
@@ -3464,8 +3462,7 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job) job->request_payload.payload_len, &drv_fcxp->num_req_sgles);if (!drv_fcxp->reqbuf_info) { -printk (KERN_INFO "bfa %s: fcpt request fcxp_map_sg failed\n" , - bfad->pci_name); +BFA_MSG (KERN_INFO , bfad,"fcpt request fcxp_map_sg failed\n" ); rc = -ENOMEM ; goto out_free_mem; }
@@ -3480,8 +3477,7 @@ bfad_im_bsg_els_ct_request(struct bsg_job *job) job->reply_payload.payload_len, &drv_fcxp->num_rsp_sgles);if (!drv_fcxp->rspbuf_info) { -printk (KERN_INFO "bfa %s: fcpt response fcxp_map_sg failed\n" , - bfad->pci_name); +BFA_MSG (KERN_INFO , bfad,"fcpt response fcxp_map_sg failed\n" ); rc = -ENOMEM ; goto out_free_mem; }
drivers/scsi/bfa/bfad_debugfs.c +11 -21
@@ -76,8 +76,7 @@ bfad_debugfs_open_fwtrc(struct inode *inode, struct file *file) fw_debug->debug_buffer =vzalloc (fw_debug->buffer_len);if (!fw_debug->debug_buffer) {kfree (fw_debug); -printk (KERN_INFO "bfad[%d]: Failed to allocate fwtrc buffer\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed to allocate fwtrc buffer\n" );return -ENOMEM ; }
@@ -90,8 +89,7 @@ bfad_debugfs_open_fwtrc(struct inode *inode, struct file *file)vfree (fw_debug->debug_buffer); fw_debug->debug_buffer =NULL ;kfree (fw_debug); -printk (KERN_INFO "bfad[%d]: Failed to collect fwtrc\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed to collect fwtrc\n" );return -ENOMEM ; }
@@ -118,8 +116,7 @@ bfad_debugfs_open_fwsave(struct inode *inode, struct file *file) fw_debug->debug_buffer =vzalloc (fw_debug->buffer_len);if (!fw_debug->debug_buffer) {kfree (fw_debug); -printk (KERN_INFO "bfad[%d]: Failed to allocate fwsave buffer\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed to allocate fwsave buffer\n" );return -ENOMEM ; }
@@ -132,8 +129,7 @@ bfad_debugfs_open_fwsave(struct inode *inode, struct file *file)vfree (fw_debug->debug_buffer); fw_debug->debug_buffer =NULL ;kfree (fw_debug); -printk (KERN_INFO "bfad[%d]: Failed to collect fwsave\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed to collect fwsave\n" );return -ENOMEM ; }
@@ -256,9 +252,8 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf, rc =sscanf (kern_buf,"%x:%x" , &addr, &len);if (rc <2 || len > (UINT_MAX >>2 )) { -printk (KERN_INFO -"bfad[%d]: %s failed to read user buf\n" , - bfad->inst_no, __func__); +BFA_MSG (KERN_INFO , bfad,"%s failed to read user buf\n" , + __func__);kfree (kern_buf);return -EINVAL ; }
@@ -270,8 +265,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf, bfad->regdata =kzalloc (len <<2 ,GFP_KERNEL );if (!bfad->regdata) { -printk (KERN_INFO "bfad[%d]: Failed to allocate regrd buffer\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed to allocate regrd buffer\n" );return -ENOMEM ; }
@@ -282,8 +276,7 @@ bfad_debugfs_write_regrd(struct file *file, const char __user *buf,/* offset and len sanity check */ rc =bfad_reg_offset_check (bfa, addr, len);if (rc) { -printk (KERN_INFO "bfad[%d]: Failed reg offset check\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed reg offset check\n" );kfree (bfad->regdata); bfad->regdata =NULL ; bfad->reglen =0 ;
@@ -323,9 +316,8 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf, rc =sscanf (kern_buf,"%x:%x" , &addr, &val);if (rc <2 ) { -printk (KERN_INFO -"bfad[%d]: %s failed to read user buf\n" , - bfad->inst_no, __func__); +BFA_MSG (KERN_INFO , bfad,"%s failed to read user buf\n" , + __func__);kfree (kern_buf);return -EINVAL ; }
@@ -336,9 +328,7 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,/* offset and len sanity check */ rc =bfad_reg_offset_check (bfa, addr,1 );if (rc) { -printk (KERN_INFO -"bfad[%d]: Failed reg offset check\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed reg offset check\n" );return -EINVAL ; }
drivers/scsi/bfa/bfad_drv.h +3 -0
@@ -286,6 +286,9 @@ do { \ dev_printk(level, &((bfad)->pcidev)->dev, fmt, ##arg); \ }while (0 ) +#define BFA_MSG(level, bfad, fmt, arg...) \ + dev_warn(&((bfad)->pcidev)->dev, "bfad%d: " fmt, (bfad)->inst_no, ##arg); +bfa_status_t bfad_vport_create (struct bfad_s *bfad,u16 vf_id,struct bfa_lport_cfg_s *port_cfg,struct device *dev);
drivers/scsi/bfa/bfad_im.c +7 -7
@@ -542,7 +542,7 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port, error =idr_alloc (&bfad_im_port_index, im_port,0 ,0 ,GFP_KERNEL );if (error <0 ) {mutex_unlock (&bfad_mutex); -printk (KERN_WARNING "idr_alloc failure\n" ); +BFA_MSG (KERN_WARNING , bfad,"idr_alloc failure\n" ); goto out; } im_port->idr_id = error;
@@ -570,7 +570,7 @@ bfad_im_scsi_host_alloc(struct bfad_s *bfad, struct bfad_im_port_s *im_port, error =scsi_add_host_with_dma (im_port->shost, dev, &bfad->pcidev->dev);if (error) { -printk (KERN_WARNING "scsi_add_host failure %d\n" , error); +BFA_MSG (KERN_WARNING , bfad,"scsi_add_host failure %d\n" , error); goto out_fc_rel; }
@@ -1136,7 +1136,7 @@ bfad_im_itnim_work_handler(struct work_struct *work) itnim->scsi_tgt_id, fcid_str, wwpn_str); }else { -printk (KERN_WARNING +BFA_MSG (KERN_WARNING , bfad,"%s: itnim %llx is already in online state\n" , __func__,bfa_fcs_itnim_get_pwwn (&itnim->fcs_itnim));
@@ -1237,9 +1237,9 @@ bfad_im_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmndspin_lock_irqsave (&bfad->bfad_lock, flags);if (!(bfad->bfad_flags &BFAD_HAL_START_DONE )) { -printk (KERN_WARNING -"bfad%d, queuecommand %p %x failed, BFA stopped\n" , - bfad->inst_no, cmnd, cmnd->cmnd[0 ]); +BFA_MSG (KERN_WARNING , bfad, +"queuecommand %p %x failed, BFA stopped\n" , + cmnd, cmnd->cmnd[0 ]); cmnd->result =DID_NO_CONNECT <<16 ; goto out_fail_cmd; }
@@ -1254,7 +1254,7 @@ bfad_im_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd hal_io =bfa_ioim_alloc (&bfad->bfa, (struct bfad_ioim_s *) cmnd, itnim->bfa_itnim, sg_cnt);if (!hal_io) { -printk (KERN_WARNING "hal_io failure\n" ); +BFA_MSG (KERN_WARNING , bfad,"hal_io failure\n" );spin_unlock_irqrestore (&bfad->bfad_lock, flags);scsi_dma_unmap (cmnd);return SCSI_MLQUEUE_HOST_BUSY ;
Signature · 1 line
2.16.4
Re: [PATCH 1/4] bfa: Remove legacy printk() usage
Hi Hannes,
Quoted 17 lines
Replace the remaining callsites to use
dev_printk()and friends.drivers/scsi/bfa/bfad_debugfs.c +1
-3@@ -336,9 +328,7 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,/* offset and len sanity check */ rc =bfad_reg_offset_check (bfa, addr,1 );if (rc) { -printk (KERN_INFO -"bfad[%d]: Failed reg offset check\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed reg offset check\n" );return -EINVAL ; }drivers/scsi/bfa/bfad_drv.h +0
-0
drivers/scsi/bfa/bfad_drv.h do { \ · line 291
Quoted 6 lines
drivers/scsi/bfa/bfad_drv.h +3
-0@@ -286,6 +286,9 @@ do { \ dev_printk(level, &((bfad)->pcidev)->dev, fmt, ##arg); \ }while (0 ) +#define BFA_MSG(level, bfad, fmt, arg...) \ + dev_warn(&((bfad)->pcidev)->dev, "bfad%d: " fmt, (bfad)->inst_no, ##arg); +
Looks like all the KERN_{INFO,ALERT,ERR} messages get turned into KERN_WARNING with this change. 'level' doesn't appear to be used anywhere. Am I missing something?
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Re: [PATCH 1/4] bfa: Remove legacy printk() usage
Quoted 23 lines · Martin K. Petersen
Hi Hannes,
Quoted 20 lines
Replace the remaining callsites to use
dev_printk()and friends.drivers/scsi/bfa/bfad_debugfs.c +1
-3@@ -336,9 +328,7 @@ bfad_debugfs_write_regwr(struct file *file, const char __user *buf,/* offset and len sanity check */ rc =bfad_reg_offset_check (bfa, addr,1 );if (rc) { -printk (KERN_INFO -"bfad[%d]: Failed reg offset check\n" , - bfad->inst_no); +BFA_MSG (KERN_INFO , bfad,"Failed reg offset check\n" );return -EINVAL ; }drivers/scsi/bfa/bfad_drv.h +0
-0@@ -286,6 +286,9 @@ do { \ dev_printk(level, &((bfad)->pcidev)->dev, fmt, ##arg); \ }while (0 )
Quoted 8 lines
drivers/scsi/bfa/bfad_drv.h do { \ · line 291
Quoted 3 lines
drivers/scsi/bfa/bfad_drv.h +3
-0+#define BFA_MSG(level, bfad, fmt, arg...) \ + dev_warn(&((bfad)->pcidev)->dev, "bfad%d: " fmt, (bfad)->inst_no, ##arg); +Looks like all the KERN_{INFO,ALERT,ERR} messages get turned into
KERN_WARNINGwith this change. 'level' doesn't appear to be used anywhere. Am I missing something?
Ouch, indeed. I'll fix it up.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH 2/4 bfa: drop unused 'bfad' and 'pcidev' arguments
In reply to Hannes ReineckeThe various bfa modules all have an 'attach' function, most of which have two pointless arguments 'bfad' and 'pcidev'. Remove them.
--- drivers/scsi/bfa/bfa.h | 3 --- drivers/scsi/bfa/bfa_core.c | 30 +++++++++++++++--------------- drivers/scsi/bfa/bfa_fcpim.c | 8 +++----- drivers/scsi/bfa/bfa_ioc.c | 3 +-- drivers/scsi/bfa/bfa_ioc.h | 1 - drivers/scsi/bfa/bfa_modules.h | 28 ++++++++++------------------ drivers/scsi/bfa/bfa_svc.c | 23 ++++++++--------------- 7 files changed, 37 insertions(+), 59 deletions(-)
drivers/scsi/bfa/bfa.h +0 -3
@@ -293,9 +293,6 @@ struct bfa_iocfc_s {void bfa_iocfc_meminfo (struct bfa_iocfc_cfg_s *cfg,struct bfa_meminfo_s *meminfo,struct bfa_s *bfa); -void bfa_iocfc_attach (struct bfa_s *bfa,void *bfad, -struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev);void bfa_iocfc_init (struct bfa_s *bfa);void bfa_iocfc_start (struct bfa_s *bfa);void bfa_iocfc_stop (struct bfa_s *bfa);
drivers/scsi/bfa/bfa_core.c +15 -15
@@ -1033,12 +1033,11 @@ bfa_iocfc_send_cfg(void *bfa_arg) }static void -bfa_iocfc_init_mem (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, +bfa_iocfc_init_mem (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg,struct bfa_pcidev_s *pcidev) {struct bfa_iocfc_s *iocfc = &bfa->iocfc; - bfa->bfad = bfad; iocfc->bfa = bfa; iocfc->cfg = *cfg;
@@ -1513,8 +1512,8 @@ bfa_iocfc_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo,/* * Query IOC memory requirement information. */ -void -bfa_iocfc_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, +static void +bfa_iocfc_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg,struct bfa_pcidev_s *pcidev) {int i;
@@ -1531,7 +1530,7 @@ bfa_iocfc_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,bfa_ioc_pci_init (&bfa->ioc, pcidev,BFI_PCIFN_CLASS_FC );bfa_ioc_mbox_register (&bfa->ioc, bfa_mbox_isrs); -bfa_iocfc_init_mem (bfa, bfad, cfg, pcidev); +bfa_iocfc_init_mem (bfa, cfg, pcidev);bfa_iocfc_mem_claim (bfa, cfg);INIT_LIST_HEAD (&bfa->timer_mod.timer_q);
@@ -1833,6 +1832,7 @@ bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,struct list_head *dm_qe, *km_qe; bfa->fcs =BFA_FALSE ; + bfa->bfad = bfad;WARN_ON ((cfg ==NULL ) || (meminfo ==NULL ));
@@ -1855,16 +1855,16 @@ bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, kva_elem->kva_curp = kva_elem->kva; } -bfa_iocfc_attach (bfa, bfad, cfg, pcidev); -bfa_fcdiag_attach (bfa, bfad, cfg, pcidev); -bfa_sgpg_attach (bfa, bfad, cfg, pcidev); -bfa_fcport_attach (bfa, bfad, cfg, pcidev); -bfa_fcxp_attach (bfa, bfad, cfg, pcidev); -bfa_lps_attach (bfa, bfad, cfg, pcidev); -bfa_uf_attach (bfa, bfad, cfg, pcidev); -bfa_rport_attach (bfa, bfad, cfg, pcidev); -bfa_fcp_attach (bfa, bfad, cfg, pcidev); -bfa_dconf_attach (bfa, bfad, cfg); +bfa_iocfc_attach (bfa, cfg, pcidev); +bfa_fcdiag_attach (bfa, cfg); +bfa_sgpg_attach (bfa, cfg); +bfa_fcport_attach (bfa, cfg); +bfa_fcxp_attach (bfa, cfg); +bfa_lps_attach (bfa, cfg); +bfa_uf_attach (bfa, cfg); +bfa_rport_attach (bfa, cfg); +bfa_fcp_attach (bfa, cfg); +bfa_dconf_attach (bfa, cfg);bfa_com_port_attach (bfa);bfa_com_ablk_attach (bfa);bfa_com_cee_attach (bfa);
drivers/scsi/bfa/bfa_fcpim.c +3 -5
@@ -305,8 +305,7 @@ bfa_fcpim_meminfo(struct bfa_iocfc_cfg_s *cfg, u32 *km_len)static void -bfa_fcpim_attach (struct bfa_fcp_mod_s *fcp,void *bfad, -struct bfa_iocfc_cfg_s *cfg,struct bfa_pcidev_s *pcidev) +bfa_fcpim_attach (struct bfa_fcp_mod_s *fcp,struct bfa_iocfc_cfg_s *cfg) {struct bfa_fcpim_s *fcpim = &fcp->fcpim;struct bfa_s *bfa = fcp->bfa;
@@ -3679,8 +3678,7 @@ bfa_fcp_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo, }void -bfa_fcp_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_fcp_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_fcp_mod_s *fcp =BFA_FCP_MOD (bfa);struct bfa_mem_dma_s *seg_ptr;
@@ -3710,7 +3708,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, } fcp->throttle_update_required =1 ; -bfa_fcpim_attach (fcp, bfad, cfg, pcidev); +bfa_fcpim_attach (fcp, cfg);bfa_iotag_attach (fcp);
drivers/scsi/bfa/bfa_ioc.c +1 -2
@@ -6066,11 +6066,10 @@ bfa_dconf_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo, }void -bfa_dconf_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg) +bfa_dconf_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_dconf_mod_s *dconf =BFA_DCONF_MOD (bfa); - dconf->bfad = bfad; dconf->bfa = bfa; dconf->instance = bfa->ioc.port_id;bfa_trc (bfa, dconf->instance);
drivers/scsi/bfa/bfa_ioc.h +0 -1
@@ -782,7 +782,6 @@ struct bfa_dconf_mod_s {bfa_boolean_t min_cfg;struct bfa_timer_s timer;struct bfa_s *bfa; -void *bfad;void *trcmod;struct bfa_dconf_s *dconf;struct bfa_mem_kva_s kva_seg;
drivers/scsi/bfa/bfa_modules.h +10 -18
@@ -56,7 +56,7 @@ enum {#define BFA_CACHELINE_SZ (256)struct bfa_s { -void *bfad;/* BFA driver instance */ +struct bfad_s *bfad;/* BFA driver instance */ struct bfa_plog_s *plog;/* portlog buffer */ struct bfa_trc_mod_s *trcmod;/* driver tracing */ struct bfa_ioc_s ioc;/* IOC module */
@@ -74,12 +74,11 @@ struct bfa_s {extern bfa_boolean_t bfa_auto_recover; -void bfa_dconf_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *); +void bfa_dconf_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_dconf_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *);void bfa_dconf_iocdisable (struct bfa_s *); -void bfa_fcp_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_fcp_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_fcp_iocdisable (struct bfa_s *bfa);void bfa_fcp_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *);
@@ -88,36 +87,29 @@ void bfa_fcport_start(struct bfa_s *);void bfa_fcport_iocdisable (struct bfa_s *);void bfa_fcport_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_fcport_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_fcport_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_fcxp_iocdisable (struct bfa_s *);void bfa_fcxp_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_fcxp_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_fcxp_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_fcdiag_iocdisable (struct bfa_s *); -void bfa_fcdiag_attach (struct bfa_s *bfa,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_fcdiag_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *);void bfa_ioim_lm_init (struct bfa_s *);void bfa_lps_iocdisable (struct bfa_s *bfa);void bfa_lps_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_lps_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_lps_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_rport_iocdisable (struct bfa_s *bfa);void bfa_rport_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_rport_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_rport_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_sgpg_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_sgpg_attach (struct bfa_s *,void *bfad,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_sgpg_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_uf_iocdisable (struct bfa_s *);void bfa_uf_meminfo (struct bfa_iocfc_cfg_s *,struct bfa_meminfo_s *,struct bfa_s *); -void bfa_uf_attach (struct bfa_s *,void *,struct bfa_iocfc_cfg_s *, -struct bfa_pcidev_s *); +void bfa_uf_attach (struct bfa_s *,struct bfa_iocfc_cfg_s *);void bfa_uf_start (struct bfa_s *);#endif /* __BFA_MODULES_H__ */
drivers/scsi/bfa/bfa_svc.c +8 -15
@@ -487,8 +487,7 @@ bfa_fcxp_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo, }void -bfa_fcxp_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_fcxp_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_fcxp_mod_s *mod =BFA_FCXP_MOD (bfa);
@@ -1477,8 +1476,7 @@ bfa_lps_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo,* bfa module attach at initialization time */ void -bfa_lps_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_lps_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_lps_mod_s *mod =BFA_LPS_MOD (bfa);struct bfa_lps_s *lps;
@@ -3021,8 +3019,7 @@ bfa_fcport_mem_claim(struct bfa_fcport_s *fcport)* Memory initialization. */ void -bfa_fcport_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_fcport_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_fcport_s *fcport =BFA_FCPORT_MOD (bfa);struct bfa_port_cfg_s *port_cfg = &fcport->cfg;
@@ -4810,8 +4807,7 @@ bfa_rport_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo, }void -bfa_rport_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_rport_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_rport_mod_s *mod =BFA_RPORT_MOD (bfa);struct bfa_rport_s *rp;
@@ -5176,8 +5172,7 @@ bfa_sgpg_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo, }void -bfa_sgpg_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_sgpg_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_sgpg_mod_s *mod =BFA_SGPG_MOD (bfa);struct bfa_sgpg_s *hsgpg;
@@ -5450,8 +5445,7 @@ bfa_uf_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *minfo, }void -bfa_uf_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_uf_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_uf_mod_s *ufm =BFA_UF_MOD (bfa);
@@ -5707,13 +5701,12 @@ bfa_fcdiag_set_busy_status(struct bfa_fcdiag_s *fcdiag) }void -bfa_fcdiag_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_fcdiag_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_fcdiag_s *fcdiag =BFA_FCDIAG_MOD (bfa);struct bfa_dport_s *dport = &fcdiag->dport; - fcdiag->bfa = bfa; + fcdiag->bfa = bfa; fcdiag->trcmod = bfa->trcmod;/* The common DIAG attach bfa_diag_attach() will do all memory claim */ dport->bfa = bfa;
Signature · 1 line
2.16.4
PATCH 3/4 bfa: remove bfa_pcidev_s
In reply to Hannes ReineckeReplace the internal PCI abstraction in struct bfa_pcidev_s by using the generic struct pci_dev.
--- drivers/scsi/bfa/bfa.h | 5 ++--- drivers/scsi/bfa/bfa_core.c | 27 ++++++++++----------------- drivers/scsi/bfa/bfa_ioc.c | 15 +++++++-------- drivers/scsi/bfa/bfa_ioc.h | 22 +++++----------------- drivers/scsi/bfa/bfa_ioc_ct.c | 8 ++++---- drivers/scsi/bfa/bfa_svc.c | 8 ++++---- drivers/scsi/bfa/bfad.c | 13 +++---------- drivers/scsi/bfa/bfad_drv.h | 1 - 8 files changed, 35 insertions(+), 64 deletions(-)
drivers/scsi/bfa/bfa.h +2 -3
@@ -17,6 +17,7 @@#include "bfi.h" #include "bfa_ioc.h" +struct bfad_s ;struct bfa_s ;typedef void (*bfa_isr_func_t ) (struct bfa_s *bfa,struct bfi_msg_s *m);
@@ -393,9 +394,7 @@ void bfa_cfg_get_min(struct bfa_iocfc_cfg_s *cfg);void bfa_cfg_get_meminfo (struct bfa_iocfc_cfg_s *cfg,struct bfa_meminfo_s *meminfo,struct bfa_s *bfa); -void bfa_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_meminfo_s *meminfo, -struct bfa_pcidev_s *pcidev); +void bfa_attach (struct bfa_s *bfa,struct bfad_s *bfad);void bfa_detach (struct bfa_s *bfa);void bfa_cb_init (void *bfad,bfa_status_t status);void bfa_cb_updateq (void *bfad,bfa_status_t status);
drivers/scsi/bfa/bfa_core.c +10 -17
@@ -851,7 +851,7 @@ bfa_isr_enable(struct bfa_s *bfa)bfa_msix_ctrl_install (bfa); -if (bfa_asic_id_ct2 (bfa->ioc.pcidev.device_id)) { +if (bfa_asic_id_ct2 (bfa_ioc_devid (&bfa->ioc))) { umsk = __HFN_INT_ERR_MASK_CT2; umsk |= port_id ==0 ? __HFN_INT_FN0_MASK_CT2 : __HFN_INT_FN1_MASK_CT2;
@@ -910,14 +910,14 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec) intr =readl (bfa->iocfc.bfa_regs.intr_status); -if (bfa_asic_id_ct2 (bfa->ioc.pcidev.device_id)) { +if (bfa_asic_id_ct2 (bfa_ioc_devid (&bfa->ioc))) { halt_isr = intr & __HFN_INT_CPQ_HALT_CT2; pss_isr = intr & __HFN_INT_ERR_PSS_CT2; lpu_isr = intr & (__HFN_INT_MBOX_LPU0_CT2 | __HFN_INT_MBOX_LPU1_CT2); intr &= __HFN_INT_ERR_MASK_CT2; }else { - halt_isr =bfa_asic_id_ct (bfa->ioc.pcidev.device_id) ? + halt_isr =bfa_asic_id_ct (bfa_ioc_devid (&bfa->ioc)) ? (intr & __HFN_INT_LL_HALT) :0 ; pss_isr = intr & __HFN_INT_ERR_PSS; lpu_isr = intr & (__HFN_INT_MBOX_LPU0 | __HFN_INT_MBOX_LPU1);
@@ -1033,8 +1033,7 @@ bfa_iocfc_send_cfg(void *bfa_arg) }static void -bfa_iocfc_init_mem (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +bfa_iocfc_init_mem (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg) {struct bfa_iocfc_s *iocfc = &bfa->iocfc;
@@ -1514,7 +1513,7 @@ bfa_iocfc_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo,*/ static void bfa_iocfc_attach (struct bfa_s *bfa,struct bfa_iocfc_cfg_s *cfg, -struct bfa_pcidev_s *pcidev) +struct pci_dev *pcidev) {int i;struct bfa_ioc_s *ioc = &bfa->ioc;
@@ -1530,7 +1529,7 @@ bfa_iocfc_attach(struct bfa_s *bfa, struct bfa_iocfc_cfg_s *cfg,bfa_ioc_pci_init (&bfa->ioc, pcidev,BFI_PCIFN_CLASS_FC );bfa_ioc_mbox_register (&bfa->ioc, bfa_mbox_isrs); -bfa_iocfc_init_mem (bfa, cfg, pcidev); +bfa_iocfc_init_mem (bfa, cfg);bfa_iocfc_mem_claim (bfa, cfg);INIT_LIST_HEAD (&bfa->timer_mod.timer_q);
@@ -1807,13 +1806,6 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo,* * @param[out] bfa Pointer to bfa_t. * @param[in] bfad Opaque handle back to the driver's IOC structure -* @param[in] cfg Pointer to bfa_ioc_cfg_t. Should be same structure -* that was used in bfa_cfg_get_meminfo(). -* @param[in] meminfo Pointer to bfa_meminfo_t. The driver should -* use the bfa_cfg_get_meminfo() call to -* find the memory blocks required, allocate the -* required memory and provide the starting addresses. -* @param[in] pcidev pointer to struct bfa_pcidev_s * * @return * void
@@ -1824,9 +1816,10 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo,* */ void -bfa_attach (struct bfa_s *bfa,void *bfad,struct bfa_iocfc_cfg_s *cfg, -struct bfa_meminfo_s *meminfo,struct bfa_pcidev_s *pcidev) +bfa_attach (struct bfa_s *bfa,struct bfad_s *bfad) { +struct bfa_iocfc_cfg_s *cfg = &bfad->ioc_cfg; +struct bfa_meminfo_s *meminfo = &bfad->meminfo;struct bfa_mem_dma_s *dma_info, *dma_elem;struct bfa_mem_kva_s *kva_info, *kva_elem;struct list_head *dm_qe, *km_qe;
@@ -1855,7 +1848,7 @@ bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, kva_elem->kva_curp = kva_elem->kva; } -bfa_iocfc_attach (bfa, cfg, pcidev); +bfa_iocfc_attach (bfa, cfg, bfad->pcidev);bfa_fcdiag_attach (bfa, cfg);bfa_sgpg_attach (bfa, cfg);bfa_fcport_attach (bfa, cfg);
drivers/scsi/bfa/bfa_ioc.c +7 -8
@@ -1628,7 +1628,7 @@ bfa_status_t bfa_ioc_flash_img_get_chnk(struct bfa_ioc_s *ioc, u32 off, u32 *fwimg) { - return bfa_flash_raw_read(ioc->pcidev.pci_bar_kva, + return bfa_flash_raw_read(bfa_ioc_bar0(ioc), BFA_FLASH_PART_FWIMG_ADDR + (off * sizeof(u32)), (char *)fwimg, BFI_FLASH_CHUNK_SZ); }
@@ -2388,11 +2388,10 @@ bfa_ioc_detach(struct bfa_ioc_s *ioc)* @param[in] pcidev PCI device information for this IOC */ void -bfa_ioc_pci_init (struct bfa_ioc_s *ioc,struct bfa_pcidev_s *pcidev, +bfa_ioc_pci_init (struct bfa_ioc_s *ioc,struct pci_dev *pcidev,enum bfi_pcifn_class clscode) { ioc->clscode = clscode; - ioc->pcidev = *pcidev;/* * Initialize IOC and device personality
@@ -2400,7 +2399,7 @@ bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev, ioc->port0_mode = ioc->port1_mode =BFI_PORT_MODE_FC ; ioc->asic_mode =BFI_ASIC_MODE_FC ; -switch (pcidev->device_id) { +switch (pcidev->device) {case BFA_PCI_DEVICE_ID_FC_8G1P :case BFA_PCI_DEVICE_ID_FC_8G2P : ioc->asic_gen =BFI_ASIC_GEN_CB ;
@@ -2428,7 +2427,7 @@ bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev,case BFA_PCI_DEVICE_ID_CT2_QUAD : ioc->asic_gen =BFI_ASIC_GEN_CT2 ;if (clscode ==BFI_PCIFN_CLASS_FC && - pcidev->ssid ==BFA_PCI_CT2_SSID_FC ) { + pcidev->subsystem_device ==BFA_PCI_CT2_SSID_FC ) { ioc->asic_mode =BFI_ASIC_MODE_FC16 ; ioc->fcmode =BFA_TRUE ; ioc->port_mode = ioc->port_mode_cfg =BFA_MODE_HBA ;
@@ -2436,7 +2435,7 @@ bfa_ioc_pci_init(struct bfa_ioc_s *ioc, struct bfa_pcidev_s *pcidev, }else { ioc->port0_mode = ioc->port1_mode =BFI_PORT_MODE_ETH ; ioc->asic_mode =BFI_ASIC_MODE_ETH ; -if (pcidev->ssid == BFA_PCI_CT2_SSID_FCoE) { +if (pcidev->subsystem_device == BFA_PCI_CT2_SSID_FCoE) { ioc->port_mode = ioc->port_mode_cfg =BFA_MODE_CNA ; ioc->ad_cap_bm =BFA_CM_CNA ;
@@ -2664,7 +2663,7 @@ bfa_ioc_adapter_is_disabled(struct bfa_ioc_s *ioc)if (!bfa_ioc_state_disabled (ioc_state))return BFA_FALSE ; -if (ioc->pcidev.device_id !=BFA_PCI_DEVICE_ID_FC_8G1P ) { +if (bfa_ioc_devid (ioc) !=BFA_PCI_DEVICE_ID_FC_8G1P ) { ioc_state =bfa_ioc_get_cur_ioc_fwstate (ioc);if (!bfa_ioc_state_disabled (ioc_state))return BFA_FALSE ;
@@ -2802,7 +2801,7 @@ bfa_ioc_get_adapter_model(struct bfa_ioc_s *ioc, char *model) ioc_attr = ioc->attr; -if (bfa_asic_id_ct2 (ioc->pcidev.device_id) && +if (bfa_asic_id_ct2 (bfa_ioc_devid (ioc)) && (!bfa_mfg_is_mezz (ioc_attr->card_type)))snprintf (model,BFA_ADAPTER_MODEL_NAME_LEN ,"%s-%u-%u%s" ,BFA_MFG_NAME , ioc_attr->card_type, nports,"p" );
drivers/scsi/bfa/bfa_ioc.h +5 -17
@@ -143,17 +143,6 @@ static inline void bfa_mem_kva_setup(struct bfa_meminfo_s *meminfo, ((_mod)->dma_seg[BFI_MEM_SEG_FROM_TAG (_tag, _rqsz)].dma_curp + \BFI_MEM_SEG_REQ_OFFSET (_tag, _rqsz) * (_rqsz)) -/* -* PCI device information required by IOC - */ -struct bfa_pcidev_s { -int pci_slot; -u8 pci_func; -u16 device_id; -u16 ssid; -void __iomem *pci_bar_kva; -}; -/* * Structure used to remember the DMA-able memory block's KVA and Physical * Address
@@ -293,7 +282,6 @@ struct bfa_iocpf_s {struct bfa_ioc_s {bfa_fsm_t fsm;struct bfa_s *bfa; -struct bfa_pcidev_s pcidev;struct bfa_timer_mod_s *timer_mod;struct bfa_timer_s ioc_timer;struct bfa_timer_s sem_timer;
@@ -803,9 +791,9 @@ bfa_status_t bfa_dconf_update(struct bfa_s *bfa);/* * IOC specfic macros */ -#define bfa_ioc_pcifn (__ioc) ((__ioc)->pcidev.pci_func) -#define bfa_ioc_devid (__ioc) ((__ioc)->pcidev.device_id) -#define bfa_ioc_bar0 (__ioc) ((__ioc)->pcidev.pci_bar_kva) +#define bfa_ioc_pcifn (__ioc) (PCI_FUNC((__ioc)->bfa->bfad->pcidev->devfn)) +#define bfa_ioc_devid (__ioc) ((__ioc)->bfa->bfad->pcidev->device) +#define bfa_ioc_bar0 (__ioc) ((__ioc)->bfa->bfad->pci_bar0_kva)#define bfa_ioc_portid (__ioc) ((__ioc)->port_id)#define bfa_ioc_asic_gen (__ioc) ((__ioc)->asic_gen)#define bfa_ioc_is_cna (__ioc) \
@@ -849,7 +837,7 @@ void bfa_ioc_mbox_regisr(struct bfa_ioc_s *ioc, enum bfi_mclass mc,*/ #define bfa_ioc_pll_init_asic (__ioc) \ - ((__ioc)->ioc_hwif->ioc_pll_init((__ioc)->pcidev.pci_bar_kva, \ + ((__ioc)->ioc_hwif->ioc_pll_init(bfa_ioc_bar0(__ioc), \ (__ioc)->asic_mode))bfa_status_t bfa_ioc_pll_init (struct bfa_ioc_s *ioc);
@@ -879,7 +867,7 @@ void bfa_ioc_attach(struct bfa_ioc_s *ioc, void *bfa,void bfa_ioc_auto_recover (bfa_boolean_t auto_recover);void bfa_ioc_detach (struct bfa_ioc_s *ioc);void bfa_ioc_suspend (struct bfa_ioc_s *ioc); -void bfa_ioc_pci_init (struct bfa_ioc_s *ioc,struct bfa_pcidev_s *pcidev, +void bfa_ioc_pci_init (struct bfa_ioc_s *ioc,struct pci_dev *pcidev,enum bfi_pcifn_class clscode);void bfa_ioc_mem_claim (struct bfa_ioc_s *ioc,u8 *dm_kva,u64 dm_pa);void bfa_ioc_enable (struct bfa_ioc_s *ioc);
drivers/scsi/bfa/bfa_ioc_ct.c +4 -4
@@ -304,7 +304,7 @@ bfa_ioc_ct2_reg_init(struct bfa_ioc_s *ioc)static void bfa_ioc_ct_map_port (struct bfa_ioc_s *ioc) { -void __iomem *rb = ioc->pcidev.pci_bar_kva; +void __iomem *rb =bfa_ioc_bar0 (ioc);u32 r32;/*
@@ -321,7 +321,7 @@ bfa_ioc_ct_map_port(struct bfa_ioc_s *ioc)static void bfa_ioc_ct2_map_port (struct bfa_ioc_s *ioc) { -void __iomem *rb = ioc->pcidev.pci_bar_kva; +void __iomem *rb =bfa_ioc_bar0 (ioc);u32 r32; r32 =readl (rb +CT2_HOSTFN_PERSONALITY0 );
@@ -337,7 +337,7 @@ bfa_ioc_ct2_map_port(struct bfa_ioc_s *ioc)static void bfa_ioc_ct_isr_mode_set (struct bfa_ioc_s *ioc,bfa_boolean_t msix) { -void __iomem *rb = ioc->pcidev.pci_bar_kva; +void __iomem *rb =bfa_ioc_bar0 (ioc);u32 r32, mode; r32 =readl (rb +FNC_PERS_REG );
@@ -561,7 +561,7 @@ bfa_ioc_set_ct2_hwif(struct bfa_ioc_s *ioc)void bfa_ioc_ct2_poweron (struct bfa_ioc_s *ioc) { -void __iomem *rb = ioc->pcidev.pci_bar_kva; +void __iomem *rb =bfa_ioc_bar0 (ioc);u32 r32; r32 =readl (rb +HOSTFN_MSIX_VT_OFST_NUMVT );
drivers/scsi/bfa/bfa_svc.c +4 -4
@@ -3747,7 +3747,7 @@ bfa_fcport_cfg_speed(struct bfa_s *bfa, enum bfa_port_speed speed)if (bfa_ioc_get_type (&fcport->bfa->ioc) ==BFA_IOC_TYPE_FC ) {/* For CT2, 1G is not supported */ if ((speed ==BFA_PORT_SPEED_1GBPS ) && - (bfa_asic_id_ct2 (bfa->ioc.pcidev.device_id))) + (bfa_asic_id_ct2 (bfa_ioc_devid (&bfa->ioc))))return BFA_STATUS_UNSUPP_SPEED ;/* Already checked for Auto Speed and Max Speed supp */
@@ -5983,7 +5983,7 @@ bfa_fcdiag_loopback(struct bfa_s *bfa, enum bfa_port_opmode opmode,* For CT2, 1G is not supported */ if ((speed ==BFA_PORT_SPEED_1GBPS ) && - (bfa_asic_id_ct2 (bfa->ioc.pcidev.device_id))) { + (bfa_asic_id_ct2 (bfa_ioc_devid (&bfa->ioc)))) {bfa_trc (fcdiag, speed);return BFA_STATUS_UNSUPP_SPEED ; }
@@ -6644,8 +6644,8 @@ bfa_dport_enable(struct bfa_s *bfa, u32 lpcnt, u32 pat,/* * Dport is supported in CT2 or above */ -if (!(bfa_asic_id_ct2 (dport->bfa->ioc.pcidev.device_id))) { -bfa_trc (dport->bfa, dport->bfa->ioc.pcidev.device_id); +if (!(bfa_asic_id_ct2 (bfa_ioc_devid (&dport->bfa->ioc)))) { +bfa_trc (dport->bfa,bfa_ioc_devid (&dport->bfa->ioc));return BFA_STATUS_FEATURE_NOT_SUPPORTED ; }
drivers/scsi/bfa/bfad.c +3 -10
@@ -748,11 +748,6 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) goto out_release_region; } - bfad->hal_pcidev.pci_slot =PCI_SLOT (pdev->devfn); - bfad->hal_pcidev.pci_func =PCI_FUNC (pdev->devfn); - bfad->hal_pcidev.pci_bar_kva = bfad->pci_bar0_kva; - bfad->hal_pcidev.device_id = pdev->device; - bfad->hal_pcidev.ssid = pdev->subsystem_device; bfad->pci_name =pci_name (pdev); bfad->pci_attr.vendor_id = pdev->vendor;
@@ -828,8 +823,7 @@ bfad_drv_init(struct bfad_s *bfad)bfa_plog_str (&bfad->plog_buf,BFA_PL_MID_DRVR ,BFA_PL_EID_DRIVER_START ,0 ,"Driver Attach" ); -bfa_attach (&bfad->bfa, bfad, &bfad->ioc_cfg, &bfad->meminfo, - &bfad->hal_pcidev); +bfa_attach (&bfad->bfa, bfad);/* FCS INIT */ spin_lock_irqsave (&bfad->bfad_lock, flags);
@@ -1163,7 +1157,7 @@ bfad_install_msix_handler(struct bfad_s *bfad)for (i =0 ; i < bfad->nvec; i++) {sprintf (bfad->msix_tab[i].name,"bfa-%s-%s" , bfad->pci_name, - ((bfa_asic_id_cb (bfad->hal_pcidev.device_id)) ? + ((bfa_asic_id_cb (bfad->pcidev->device)) ? msix_name_cb[i] : msix_name_ct[i])); error = request_irq(bfad->msix_tab[i].msix.vector,
@@ -1484,8 +1478,7 @@ static int restart_bfa(struct bfad_s *bfad)unsigned long flags;struct pci_dev *pdev = bfad->pcidev; -bfa_attach (&bfad->bfa, bfad, &bfad->ioc_cfg, - &bfad->meminfo, &bfad->hal_pcidev); +bfa_attach (&bfad->bfa, bfad);/* Enable Interrupt and wait bfa_init completion */ if (bfad_setup_intr (bfad)) {
drivers/scsi/bfa/bfad_drv.h +0 -1
@@ -186,7 +186,6 @@ struct bfad_s {struct bfa_fcs_s bfa_fcs;struct pci_dev *pcidev;const char *pci_name; -struct bfa_pcidev_s hal_pcidev;struct bfa_ioc_pci_attr_s pci_attr;void __iomem *pci_bar0_kva;void __iomem *pci_bar2_kva;
Signature · 1 line
2.16.4
PATCH 4/4 bfa: move bfa_sm_fault() to dev_err()
In reply to Hannes ReineckeMove bfa_sm_fault() to use dev_err() instead of a raw printk(); this also allows for better type-checking and related fixes to the calls to bfa_sm_fault() in bfa_ioc.c
--- drivers/scsi/bfa/bfa_cs.h | 2 +- drivers/scsi/bfa/bfa_ioc.c | 50 +++++++++++++++++++++++----------------------- drivers/scsi/bfa/bfad.c | 14 ++++++------- 3 files changed, 33 insertions(+), 33 deletions(-)
drivers/scsi/bfa/bfa_cs.h +1 -1
@@ -108,7 +108,7 @@ __bfa_trc32(struct bfa_trc_mod_s *trcm, int fileno, int line, u32 data);#define bfa_sm_fault (__mod, __event) do { \ bfa_trc(__mod, (((u32)0xDEAD << 16) | __event)); \ - printk(KERN_ERR "Assertion failure: %s:%d: %d", \ + dev_err(&(__mod)->bfad->pcidev->dev, "Assertion failure: %s:%d: %d", \ __FILE__, __LINE__, (__event)); \ } while (0)
drivers/scsi/bfa/bfa_ioc.c +25 -25
200 lines not on this page · raw message
drivers/scsi/bfa/bfad.c +7 -7
@@ -181,7 +181,7 @@ bfad_sm_uninit(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -256,7 +256,7 @@ bfad_sm_created(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -295,7 +295,7 @@ bfad_sm_initializing(struct bfad_s *bfad, enum bfad_sm_event event)bfa_sm_set_state (bfad, bfad_sm_failed);break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -326,7 +326,7 @@ bfad_sm_failed(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -342,7 +342,7 @@ bfad_sm_operational(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -358,7 +358,7 @@ bfad_sm_fcs_exit(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event); } }
@@ -378,7 +378,7 @@ bfad_sm_stopping(struct bfad_s *bfad, enum bfad_sm_event event)break ;default : -bfa_sm_fault (bfad, event); +bfa_sm_fault (&bfad->bfa, event);break ; } }
Signature · 1 line
2.16.4