Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cadf9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "A set of 8 obvious fixes.

  Three (2 qla2xxx and the cxlflash oopses) are regressions, two from
  4.17 and one from the merge window. The hpsa change is user visible,
  but it fixes an error users have complained about"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: cxlflash: fix assignment of the backend operations
  scsi: qedi: Send driver state to MFW
  scsi: qedf: Send the driver state to MFW
  scsi: hpsa: correct enclosure sas address
  scsi: sd_zbc: Fix variable type and bogus comment
  scsi: qla2xxx: Fix NULL pointer dereference for fcport search
  scsi: qla2xxx: Fix kernel crash due to late workqueue allocation
  scsi: qla2xxx: Fix inconsistent DMA mem alloc/free
parents 47736af3 943e59fe

drivers/scsi/cxlflash/main.h

+2 −2
Original line number Diff line number Diff line
@@ -107,12 +107,12 @@ cxlflash_assign_ops(struct dev_dependent_vals *ddv) 
{

	const struct cxlflash_backend_ops *ops = NULL;



#ifdef CONFIG_OCXL

#ifdef CONFIG_OCXL_BASE

	if (ddv->flags & CXLFLASH_OCXL_DEV)

		ops = &cxlflash_ocxl_ops;

#endif



#ifdef CONFIG_CXL

#ifdef CONFIG_CXL_BASE

	if (!(ddv->flags & CXLFLASH_OCXL_DEV))

		ops = &cxlflash_cxl_ops;

#endif

drivers/scsi/hpsa.c

+21 −4
Original line number Diff line number Diff line
@@ -3440,11 +3440,11 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h, 
	struct ext_report_lun_entry *rle = &rlep->LUN[rle_index];

	u16 bmic_device_index = 0;



	bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);



	encl_dev->sas_address =

	encl_dev->eli =

		hpsa_get_enclosure_logical_identifier(h, scsi3addr);



	bmic_device_index = GET_BMIC_DRIVE_NUMBER(&rle->lunid[0]);



	if (encl_dev->target == -1 || encl_dev->lun == -1) {

		rc = IO_OK;

		goto out;
@@ -9697,7 +9697,24 @@ hpsa_sas_get_linkerrors(struct sas_phy *phy) 
static int

hpsa_sas_get_enclosure_identifier(struct sas_rphy *rphy, u64 *identifier)

{

	*identifier = rphy->identify.sas_address;

	struct Scsi_Host *shost = phy_to_shost(rphy);

	struct ctlr_info *h;

	struct hpsa_scsi_dev_t *sd;



	if (!shost)

		return -ENXIO;



	h = shost_to_hba(shost);



	if (!h)

		return -ENXIO;



	sd = hpsa_find_device_by_sas_rphy(h, rphy);

	if (!sd)

		return -ENXIO;



	*identifier = sd->eli;



	return 0;

}

drivers/scsi/hpsa.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct hpsa_scsi_dev_t { 
#define RAID_CTLR_LUNID "\0\0\0\0\0\0\0\0"

	unsigned char device_id[16];    /* from inquiry pg. 0x83 */

	u64 sas_address;

	u64 eli;			/* from report diags. */

	unsigned char vendor[8];        /* bytes 8-15 of inquiry data */

	unsigned char model[16];        /* bytes 16-31 of inquiry data */

	unsigned char rev;		/* byte 2 of inquiry data */

drivers/scsi/qedf/qedf_main.c

+12 −0
Original line number Diff line number Diff line
@@ -3295,6 +3295,11 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) 


	init_completion(&qedf->flogi_compl);



	status = qed_ops->common->update_drv_state(qedf->cdev, true);

	if (status)

		QEDF_ERR(&(qedf->dbg_ctx),

			"Failed to send drv state to MFW.\n");



	memset(&link_params, 0, sizeof(struct qed_link_params));

	link_params.link_up = true;

	status = qed_ops->common->set_link(qedf->cdev, &link_params);
@@ -3343,6 +3348,7 @@ static int qedf_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
static void __qedf_remove(struct pci_dev *pdev, int mode)

{

	struct qedf_ctx *qedf;

	int rc;



	if (!pdev) {

		QEDF_ERR(NULL, "pdev is NULL.\n");
@@ -3437,6 +3443,12 @@ static void __qedf_remove(struct pci_dev *pdev, int mode) 
		qed_ops->common->set_power_state(qedf->cdev, PCI_D0);

		pci_set_drvdata(pdev, NULL);

	}



	rc = qed_ops->common->update_drv_state(qedf->cdev, false);

	if (rc)

		QEDF_ERR(&(qedf->dbg_ctx),

			"Failed to send drv state to MFW.\n");



	qed_ops->common->slowpath_stop(qedf->cdev);

	qed_ops->common->remove(qedf->cdev);

drivers/scsi/qedi/qedi_main.c

+11 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,7 @@ static int qedi_setup_boot_info(struct qedi_ctx *qedi) 
static void __qedi_remove(struct pci_dev *pdev, int mode)

{

	struct qedi_ctx *qedi = pci_get_drvdata(pdev);

	int rval;



	if (qedi->tmf_thread) {

		flush_workqueue(qedi->tmf_thread);
@@ -2302,6 +2303,10 @@ static void __qedi_remove(struct pci_dev *pdev, int mode) 
	if (mode == QEDI_MODE_NORMAL)

		qedi_free_iscsi_pf_param(qedi);



	rval = qedi_ops->common->update_drv_state(qedi->cdev, false);

	if (rval)

		QEDI_ERR(&qedi->dbg_ctx, "Failed to send drv state to MFW\n");



	if (!test_bit(QEDI_IN_OFFLINE, &qedi->flags)) {

		qedi_ops->common->slowpath_stop(qedi->cdev);

		qedi_ops->common->remove(qedi->cdev);
@@ -2576,6 +2581,12 @@ static int __qedi_probe(struct pci_dev *pdev, int mode) 
		if (qedi_setup_boot_info(qedi))

			QEDI_ERR(&qedi->dbg_ctx,

				 "No iSCSI boot target configured\n");



		rc = qedi_ops->common->update_drv_state(qedi->cdev, true);

		if (rc)

			QEDI_ERR(&qedi->dbg_ctx,

				 "Failed to send drv state to MFW\n");



	}



	return 0;