Commit 408445e9 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "mpt3sas: Few Enhancements and minor fixes" 



Ranjan Kumar <ranjan.kumar@broadcom.com> says:

Few Enhancements and minor fixes of mpt3sas driver.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 3bd70aec 7e5a4389

drivers/scsi/mpt3sas/mpt3sas_base.c

+7 −1
Original line number Diff line number Diff line
@@ -1420,7 +1420,13 @@ _base_display_reply_info(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, 


	if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE) {

		loginfo = le32_to_cpu(mpi_reply->IOCLogInfo);

		if (ioc->logging_level & MPT_DEBUG_REPLY)

			_base_sas_log_info(ioc, loginfo);

		else {

			if (!((ioc_status & MPI2_IOCSTATUS_MASK) &

			MPI2_IOCSTATUS_CONFIG_INVALID_PAGE))

				_base_sas_log_info(ioc, loginfo);

		}

	}



	if (ioc_status || loginfo) {

drivers/scsi/mpt3sas/mpt3sas_base.h

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
#define MPT3SAS_DRIVER_NAME		"mpt3sas"

#define MPT3SAS_AUTHOR "Avago Technologies <MPT-FusionLinux.pdl@avagotech.com>"

#define MPT3SAS_DESCRIPTION	"LSI MPT Fusion SAS 3.0 Device Driver"

#define MPT3SAS_DRIVER_VERSION		"52.100.00.00"

#define MPT3SAS_MAJOR_VERSION		52

#define MPT3SAS_DRIVER_VERSION		"54.100.00.00"

#define MPT3SAS_MAJOR_VERSION		54

#define MPT3SAS_MINOR_VERSION		100

#define MPT3SAS_BUILD_VERSION		00

#define MPT3SAS_RELEASE_VERSION		00

drivers/scsi/mpt3sas/mpt3sas_transport.c

+6 −5
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ _transport_convert_phy_link_rate(u8 link_rate) 
	case MPI25_SAS_NEG_LINK_RATE_12_0:

		rc = SAS_LINK_RATE_12_0_GBPS;

		break;

	case MPI26_SAS_NEG_LINK_RATE_22_5:

		rc = SAS_LINK_RATE_22_5_GBPS;

		break;

	case MPI2_SAS_NEG_LINK_RATE_PHY_DISABLED:

		rc = SAS_PHY_DISABLED;

		break;
@@ -987,10 +990,8 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, 
	list_for_each_entry_safe(mpt3sas_phy, next_phy,

	    &mpt3sas_port->phy_list, port_siblings) {

		if ((ioc->logging_level & MPT_DEBUG_TRANSPORT))

			dev_printk(KERN_INFO, &mpt3sas_port->port->dev,

			    "remove: sas_addr(0x%016llx), phy(%d)\n",

			    (unsigned long long)

			    mpt3sas_port->remote_identify.sas_address,

			ioc_info(ioc, "remove: sas_addr(0x%016llx), phy(%d)\n",

				(unsigned long long) mpt3sas_port->remote_identify.sas_address,

					mpt3sas_phy->phy_id);

		mpt3sas_phy->phy_belongs_to_port = 0;

		if (!ioc->remove_host)