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

Commit 24f09b59 authored by nagalakshmi.nandigama@lsi.com's avatar nagalakshmi.nandigama@lsi.com Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Fix failure message displayed during diag reset 



The fix is to inhibit the warning message in _scsih_get_sas_address
when the MPI2_IOCSTATUS_CONFIG_INVALID_PAGE ioc status is returned.

Signed-off-by: default avatarNagalakshmi Nandigama <nagalakshmi.nandigama@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 0167ac67

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+16 −13
Original line number Diff line number Diff line
@@ -388,33 +388,36 @@ _scsih_get_sas_address(struct MPT2SAS_ADAPTER *ioc, u16 handle, 
	Mpi2SasDevicePage0_t sas_device_pg0;

	Mpi2ConfigReply_t mpi_reply;

	u32 ioc_status;

	*sas_address = 0;



	if (handle <= ioc->sas_hba.num_phys) {

		*sas_address = ioc->sas_hba.sas_address;

		return 0;

	} else

		*sas_address = 0;

	}



	if ((mpt2sas_config_get_sas_device_pg0(ioc, &mpi_reply, &sas_device_pg0,

	    MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle))) {

		printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",

		    ioc->name, __FILE__, __LINE__, __func__);

		return -ENXIO;

	}



	ioc_status = le16_to_cpu(mpi_reply.IOCStatus) &

	    MPI2_IOCSTATUS_MASK;

	if (ioc_status != MPI2_IOCSTATUS_SUCCESS) {

		printk(MPT2SAS_ERR_FMT "handle(0x%04x), ioc_status(0x%04x)"

		    "\nfailure at %s:%d/%s()!\n", ioc->name, handle, ioc_status,

		printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n", ioc->name,

		__FILE__, __LINE__, __func__);

		return -EIO;

		return -ENXIO;

	}



	ioc_status = le16_to_cpu(mpi_reply.IOCStatus) & MPI2_IOCSTATUS_MASK;

	if (ioc_status == MPI2_IOCSTATUS_SUCCESS) {

		*sas_address = le64_to_cpu(sas_device_pg0.SASAddress);

		return 0;

	}



	/* we hit this becuase the given parent handle doesn't exist */

	if (ioc_status == MPI2_IOCSTATUS_CONFIG_INVALID_PAGE)

		return -ENXIO;

	/* else error case */

	printk(MPT2SAS_ERR_FMT "handle(0x%04x), ioc_status(0x%04x), "

	    "failure at %s:%d/%s()!\n", ioc->name, handle, ioc_status,

	     __FILE__, __LINE__, __func__);

	return -EIO;

}



/**

 * _scsih_determine_boot_device - determine boot device.

 * @ioc: per adapter object