Commit 8b9cc17a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "This is a set of minor fixes and clean ups in the core and various
  drivers.

  The only core change in behaviour is the I/O retry for spinup notify,
  but that shouldn't impact anything other than the failing case"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (23 commits)
  scsi: virtio_scsi: Add validation for residual bytes from response
  scsi: ipr: System crashes when seeing type 20 error
  scsi: core: Retry I/O for Notify (Enable Spinup) Required error
  scsi: mpi3mr: Fix warnings reported by smatch
  scsi: qedf: Add check to synchronize abort and flush
  scsi: MAINTAINERS: Add mpi3mr driver maintainers
  scsi: libfc: Fix array index out of bound exception
  scsi: mvsas: Use DEVICE_ATTR_RO()/RW() macro
  scsi: megaraid_mbox: Use DEVICE_ATTR_ADMIN_RO() macro
  scsi: qedf: Use DEVICE_ATTR_RO() macro
  scsi: qedi: Use DEVICE_ATTR_RO() macro
  scsi: message: mptfc: Switch from pci_ to dma_ API
  scsi: be2iscsi: Fix some missing space in some messages
  scsi: be2iscsi: Fix an error handling path in beiscsi_dev_probe()
  scsi: ufs: Fix build warning without CONFIG_PM
  scsi: bnx2fc: Remove meaningless bnx2fc_abts_cleanup() return value assignment
  scsi: qla2xxx: Add heartbeat check
  scsi: virtio_scsi: Do not overwrite SCSI status
  scsi: libsas: Add LUN number check in .slave_alloc callback
  scsi: core: Inline scsi_mq_alloc_queue()
  ...
parents b1412bd7 5f638e5a

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -3781,6 +3781,17 @@ S: Supported 
F:	Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt

F:	drivers/gpio/gpio-bcm-kona.c









BROADCOM MPI3 STORAGE CONTROLLER DRIVER









M:	Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>









M:	Kashyap Desai <kashyap.desai@broadcom.com>









M:	Sumit Saxena <sumit.saxena@broadcom.com>









M:	Sreekanth Reddy <sreekanth.reddy@broadcom.com>









L:	mpi3mr-linuxdrv.pdl@broadcom.com









L:	linux-scsi@vger.kernel.org









S:	Supported









W:	https://www.broadcom.com/support/storage









F:	drivers/scsi/mpi3mr/

















BROADCOM NETXTREME-E ROCE DRIVER









M:	Selvin Xavier <selvin.xavier@broadcom.com>









M:	Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
































drivers/message/fusion/mptfc.c



+18
−17






























Original line number
Diff line number
Diff line







@@ -331,8 +331,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,







			break;



















		data_sz = hdr.PageLength * 4;









		ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz,









		    					&page0_dma);









		ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,









						  &page0_dma, GFP_KERNEL);









		rc = -ENOMEM;









		if (!ppage0_alloc)









			break;








@@ -367,8 +367,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,







			*p_p0 = *ppage0_alloc;	/* save data */









			*p_pp0++ = p_p0++;	/* save addr */









		}









		pci_free_consistent(ioc->pcidev, data_sz,









		    			(u8 *) ppage0_alloc, page0_dma);









		dma_free_coherent(&ioc->pcidev->dev, data_sz,









				  ppage0_alloc, page0_dma);









		if (rc != 0)









			break;


















@@ -763,7 +763,8 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)

















	data_sz = hdr.PageLength * 4;









	rc = -ENOMEM;









	ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma);









	ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,









					  &page0_dma, GFP_KERNEL);









	if (ppage0_alloc) {



















 try_again:








@@ -817,7 +818,8 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)







			mptfc_display_port_link_speed(ioc, portnum, pp0dest);









		}



















		pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);









		dma_free_coherent(&ioc->pcidev->dev, data_sz, ppage0_alloc,









				  page0_dma);









	}



















	return rc;








@@ -904,9 +906,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)







		if (data_sz < sizeof(FCPortPage1_t))









			data_sz = sizeof(FCPortPage1_t);



















		page1_alloc = pci_alloc_consistent(ioc->pcidev,









						data_sz,









						&page1_dma);









		page1_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,









						 &page1_dma, GFP_KERNEL);









		if (!page1_alloc)









			return -ENOMEM;









	}








@@ -916,7 +917,7 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)







		data_sz = ioc->fc_data.fc_port_page1[portnum].pg_sz;









		if (hdr.PageLength * 4 > data_sz) {









			ioc->fc_data.fc_port_page1[portnum].data = NULL;









			pci_free_consistent(ioc->pcidev, data_sz, (u8 *)









			dma_free_coherent(&ioc->pcidev->dev, data_sz,









					  page1_alloc, page1_dma);









			goto start_over;









		}








@@ -932,8 +933,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)







	}









	else {









		ioc->fc_data.fc_port_page1[portnum].data = NULL;









		pci_free_consistent(ioc->pcidev, data_sz, (u8 *)









			page1_alloc, page1_dma);









		dma_free_coherent(&ioc->pcidev->dev, data_sz, page1_alloc,









				  page1_dma);









	}



















	return rc;








@@ -1514,9 +1515,9 @@ static void mptfc_remove(struct pci_dev *pdev)

















	for (ii=0; ii<ioc->facts.NumberOfPorts; ii++) {









		if (ioc->fc_data.fc_port_page1[ii].data) {









			pci_free_consistent(ioc->pcidev,









			dma_free_coherent(&ioc->pcidev->dev,









					  ioc->fc_data.fc_port_page1[ii].pg_sz,









				(u8 *) ioc->fc_data.fc_port_page1[ii].data,









					  ioc->fc_data.fc_port_page1[ii].data,









					  ioc->fc_data.fc_port_page1[ii].dma);









			ioc->fc_data.fc_port_page1[ii].data = NULL;









		}
































drivers/scsi/aic7xxx/aic7xxx_core.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -493,7 +493,7 @@ ahc_inq(struct ahc_softc *ahc, u_int port)







	return ((ahc_inb(ahc, port))









	      | (ahc_inb(ahc, port+1) << 8)









	      | (ahc_inb(ahc, port+2) << 16)









	      | (ahc_inb(ahc, port+3) << 24)









	      | (((uint64_t)ahc_inb(ahc, port+3)) << 24)









	      | (((uint64_t)ahc_inb(ahc, port+4)) << 32)









	      | (((uint64_t)ahc_inb(ahc, port+5)) << 40)









	      | (((uint64_t)ahc_inb(ahc, port+6)) << 48)
































drivers/scsi/aic94xx/aic94xx_init.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -53,6 +53,7 @@ static struct scsi_host_template aic94xx_sht = {







	.max_sectors		= SCSI_DEFAULT_MAX_SECTORS,









	.eh_device_reset_handler	= sas_eh_device_reset_handler,









	.eh_target_reset_handler	= sas_eh_target_reset_handler,









	.slave_alloc		= sas_slave_alloc,









	.target_destroy		= sas_target_destroy,









	.ioctl			= sas_ioctl,









#ifdef CONFIG_COMPAT
































drivers/scsi/be2iscsi/be_main.c



+39
−64






























Original line number
Diff line number
Diff line







@@ -143,8 +143,7 @@ DEVICE_ATTR(beiscsi_##_name, S_IRUGO | S_IWUSR,\







	      beiscsi_##_name##_disp, beiscsi_##_name##_store)



















/*









 * When new log level added update the









 * the MAX allowed value for log_enable









 * When new log level added update MAX allowed value for log_enable









 */









BEISCSI_RW_ATTR(log_enable, 0x00,









		0xFF, 0x00, "Enable logging Bit Mask\n"








@@ -825,9 +824,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)







					  &phwi_context->be_eq[i]);









			if (ret) {









				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









					    "BM_%d : beiscsi_init_irqs-Failed to"









					    "register msix for i = %d\n",









					    i);









					    "BM_%d : %s-Failed to register msix for i = %d\n",









					    __func__, i);









				kfree(phba->msi_name[i]);









				goto free_msix_irqs;









			}








@@ -842,8 +840,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)







				  phba->msi_name[i], &phwi_context->be_eq[i]);









		if (ret) {









			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









				    "BM_%d : beiscsi_init_irqs-"









				    "Failed to register beiscsi_msix_mcc\n");









				    "BM_%d : %s-Failed to register beiscsi_msix_mcc\n",









				    __func__);









			kfree(phba->msi_name[i]);









			goto free_msix_irqs;









		}








@@ -853,8 +851,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba)







				  "beiscsi", phba);









		if (ret) {









			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









				    "BM_%d : beiscsi_init_irqs-"









				    "Failed to register irq\\n");









				    "BM_%d : %s-Failed to register irq\n",









				    __func__);









			return ret;









		}









	}








@@ -1374,7 +1372,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,







		beiscsi_log(phba, KERN_ERR,









			    BEISCSI_LOG_CONFIG | BEISCSI_LOG_IO,









			    "BM_%d :\t\t No HWH_TYPE_LOGIN Expected in"









			    " hwi_complete_cmd- Solicited path\n");









			    " %s- Solicited path\n", __func__);









		break;



















	case HWH_TYPE_NOP:








@@ -1384,8 +1382,8 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,







	default:









		beiscsi_log(phba, KERN_WARNING,









			    BEISCSI_LOG_CONFIG | BEISCSI_LOG_IO,









			    "BM_%d : In hwi_complete_cmd, unknown type = %d"









			    "wrb_index 0x%x CID 0x%x\n", type,









			    "BM_%d : In %s, unknown type = %d "









			    "wrb_index 0x%x CID 0x%x\n", __func__, type,









			    csol_cqe.wrb_index,









			    csol_cqe.cid);









		break;








@@ -2010,8 +2008,7 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget)







		default:









			beiscsi_log(phba, KERN_ERR,









				    BEISCSI_LOG_IO | BEISCSI_LOG_CONFIG,









				    "BM_%d : Invalid CQE Event Received Code : %d"









				    "CID 0x%x...\n",









				    "BM_%d : Invalid CQE Event Received Code : %d CID 0x%x...\n",









				    code, cid);









			break;









		}








@@ -3001,7 +2998,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,







	void *eq_vaddress;









	dma_addr_t paddr;



















	num_eq_pages = PAGES_REQUIRED(phba->params.num_eq_entries * \









	num_eq_pages = PAGES_REQUIRED(phba->params.num_eq_entries *









				      sizeof(struct be_eq_entry));



















	if (phba->pcidev->msix_enabled)








@@ -3034,8 +3031,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,







					    BEISCSI_EQ_DELAY_DEF);









		if (ret) {









			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









				    "BM_%d : beiscsi_cmd_eq_create"









				    "Failed for EQ\n");









				    "BM_%d : beiscsi_cmd_eq_create Failed for EQ\n");









			goto create_eq_error;









		}


















@@ -3068,7 +3064,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,







	int ret = -ENOMEM;









	dma_addr_t paddr;



















	num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries * \









	num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries *









				      sizeof(struct sol_cqe));



















	for (i = 0; i < phba->num_cpus; i++) {








@@ -3090,8 +3086,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,







				    sizeof(struct sol_cqe), cq_vaddress);









		if (ret) {









			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









				    "BM_%d : be_fill_queue Failed "









				    "for ISCSI CQ\n");









				    "BM_%d : be_fill_queue Failed for ISCSI CQ\n");









			goto create_cq_error;









		}


















@@ -3100,8 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,







					    false, 0);









		if (ret) {









			beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









				    "BM_%d : beiscsi_cmd_eq_create"









				    "Failed for ISCSI CQ\n");









				    "BM_%d : beiscsi_cmd_eq_create Failed for ISCSI CQ\n");









			goto create_cq_error;









		}









		beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,








@@ -3226,8 +3220,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba,







		    phwi_context->be_def_dataq[ulp_num].id);



















	beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,









		    "BM_%d : DEFAULT PDU DATA RING CREATED"









		    "on ULP : %d\n", ulp_num);









		    "BM_%d : DEFAULT PDU DATA RING CREATED on ULP : %d\n",









		    ulp_num);









	return 0;









}


















@@ -3374,14 +3368,13 @@ beiscsi_create_wrb_rings(struct beiscsi_hba *phba,







		} else {









			idx++;









			wrb_vaddr = mem_descr->mem_array[idx].virtual_address;









			pa_addr_lo = mem_descr->mem_array[idx].\









			pa_addr_lo = mem_descr->mem_array[idx].









					bus_address.u.a64.address;









			num_wrb_rings = mem_descr->mem_array[idx].size /









					(phba->params.wrbs_per_cxn *









					sizeof(struct iscsi_wrb));









			pwrb_arr[num].virtual_address = wrb_vaddr;









			pwrb_arr[num].bus_address.u.a64.address\









						= pa_addr_lo;









			pwrb_arr[num].bus_address.u.a64.address = pa_addr_lo;









			pwrb_arr[num].size = phba->params.wrbs_per_cxn *









						 sizeof(struct iscsi_wrb);









			wrb_vaddr += pwrb_arr[num].size;








@@ -3995,13 +3988,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)







					       GFP_KERNEL);



















			if (!ptr_cid_info) {









				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









					    "BM_%d : Failed to allocate memory"









					    "for ULP_CID_INFO for ULP : %d\n",









					    ulp_num);









				ret = -ENOMEM;









				goto free_memory;



















			}



















			/* Allocate memory for CID array */








@@ -4010,10 +3998,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)







					sizeof(*ptr_cid_info->cid_array),









					GFP_KERNEL);









			if (!ptr_cid_info->cid_array) {









				beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









					    "BM_%d : Failed to allocate memory"









					    "for CID_ARRAY for ULP : %d\n",









					    ulp_num);









				kfree(ptr_cid_info);









				ptr_cid_info = NULL;









				ret = -ENOMEM;








@@ -4031,9 +4015,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)







				 sizeof(struct iscsi_endpoint *),









				 GFP_KERNEL);









	if (!phba->ep_array) {









		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









			    "BM_%d : Failed to allocate memory in "









			    "hba_setup_cid_tbls\n");









		ret = -ENOMEM;



















		goto free_memory;








@@ -4043,10 +4024,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)







				   sizeof(struct beiscsi_conn *),









				   GFP_KERNEL);









	if (!phba->conn_table) {









		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,









			    "BM_%d : Failed to allocate memory in"









			    "hba_setup_cid_tbls\n");



















		kfree(phba->ep_array);









		phba->ep_array = NULL;









		ret = -ENOMEM;








@@ -4428,8 +4405,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)







						    BEISCSI_LOG_CONFIG,









						    "BM_%d : Alloc of MGMT_SGL_ICD Failed "









						    "for the CID : %d\n",









						    beiscsi_conn->









						    beiscsi_conn_cid);









						    beiscsi_conn->beiscsi_conn_cid);









					goto free_hndls;









				}


















@@ -4446,8 +4422,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)







						    BEISCSI_LOG_CONFIG,









						    "BM_%d : Alloc of WRB_HANDLE Failed "









						    "for the CID : %d\n",









						    beiscsi_conn->









						    beiscsi_conn_cid);









						    beiscsi_conn->beiscsi_conn_cid);









					goto free_mgmt_hndls;









				}









				beiscsi_conn->plogin_wrb_handle =








@@ -4467,8 +4442,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)







					    BEISCSI_LOG_CONFIG,









					    "BM_%d : Alloc of MGMT_SGL_ICD Failed "









					    "for the CID : %d\n",









					    beiscsi_conn->









					    beiscsi_conn_cid);









					    beiscsi_conn->beiscsi_conn_cid);









				goto free_hndls;









			}









			io_task->pwrb_handle =








@@ -5743,6 +5717,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,







	pci_disable_msix(phba->pcidev);









	pci_dev_put(phba->pcidev);









	iscsi_host_free(phba->shost);









	pci_disable_pcie_error_reporting(pcidev);









	pci_set_drvdata(pcidev, NULL);









disable_pci:









	pci_release_regions(pcidev);