Commit e2f0cdf7 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Update hba_port's sas_address & phy_mask 

Update hba_port's sas_address & phy_mask fields whenever a direct expander
or sas/sata target devices are added or removed.

When any direct attached device is discovered then driver:

 - Gets the hba_port object corresponding to device's PhysicalPort
   number;

 - Updates the hba_port's sas_address field with device's SAS
   Address;

 - Updates the hba_port's phy_mask filed with device's narrow/wide
   port Phy number bits;

 - If a sas/sata end device (not only direct-attached devices) is added
   then corresponding sas_device object's port variable is assigned with
   hba_port object's address whose port_id matches the device's
   PhysicalPort number.

 - If an expander device is added then corresponding sas_expander object's
   port variable is assigned with hba_port object's address whose port_id
   matches the expander device's PhysicalPort number.

When any direct attached device is detached then driver will delete the
hba_port object corresponding to device's PhysicalPort number.

Whenever any HBA phy's link (of direct attached device's port) comes up
then update the phy_mask field of corresponding hba_port object.

Link: https://lore.kernel.org/r/20201027130847.9962-5-sreekanth.reddy@broadcom.com


Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 78ca7003

drivers/scsi/mpt3sas/mpt3sas_base.h

+4 −3
Original line number Diff line number Diff line
@@ -1792,16 +1792,17 @@ extern struct scsi_transport_template *mpt3sas_transport_template; 
u8 mpt3sas_transport_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,

	u32 reply);

struct _sas_port *mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc,

	u16 handle, u64 sas_address);

	u16 handle, u64 sas_address, struct hba_port *port);

void mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address,

	u64 sas_address_parent);

	u64 sas_address_parent, struct hba_port *port);

int mpt3sas_transport_add_host_phy(struct MPT3SAS_ADAPTER *ioc, struct _sas_phy

	*mpt3sas_phy, Mpi2SasPhyPage0_t phy_pg0, struct device *parent_dev);

int mpt3sas_transport_add_expander_phy(struct MPT3SAS_ADAPTER *ioc,

	struct _sas_phy *mpt3sas_phy, Mpi2ExpanderPage1_t expander_pg1,

	struct device *parent_dev);

void mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc,

	u64 sas_address, u16 handle, u8 phy_number, u8 link_rate);

	u64 sas_address, u16 handle, u8 phy_number, u8 link_rate,

	struct hba_port *port);

extern struct sas_function_template mpt3sas_transport_functions;

extern struct scsi_transport_template *mpt3sas_transport_template;

/* trigger data externs */

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+62 −19
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ _scsih_sas_device_add(struct MPT3SAS_ADAPTER *ioc, 
	}



	if (!mpt3sas_transport_port_add(ioc, sas_device->handle,

	     sas_device->sas_address_parent)) {

	     sas_device->sas_address_parent, sas_device->port)) {

		_scsih_sas_device_remove(ioc, sas_device);

	} else if (!sas_device->starget) {

		/*
@@ -919,7 +919,8 @@ _scsih_sas_device_add(struct MPT3SAS_ADAPTER *ioc, 
		if (!ioc->is_driver_loading) {

			mpt3sas_transport_port_remove(ioc,

			    sas_device->sas_address,

			    sas_device->sas_address_parent);

			    sas_device->sas_address_parent,

			    sas_device->port);

			_scsih_sas_device_remove(ioc, sas_device);

		}

	} else
@@ -1768,6 +1769,7 @@ scsih_target_alloc(struct scsi_target *starget) 
		if (pcie_device) {

			sas_target_priv_data->handle = pcie_device->handle;

			sas_target_priv_data->sas_address = pcie_device->wwid;

			sas_target_priv_data->port = NULL;

			sas_target_priv_data->pcie_dev = pcie_device;

			pcie_device->starget = starget;

			pcie_device->id = starget->id;
@@ -1791,6 +1793,7 @@ scsih_target_alloc(struct scsi_target *starget) 
	if (sas_device) {

		sas_target_priv_data->handle = sas_device->handle;

		sas_target_priv_data->sas_address = sas_device->sas_address;

		sas_target_priv_data->port = sas_device->port;

		sas_target_priv_data->sas_dev = sas_device;

		sas_device->starget = starget;

		sas_device->id = starget->id;
@@ -5804,7 +5807,8 @@ _scsih_sas_host_refresh(struct MPT3SAS_ADAPTER *ioc) 
			link_rate = MPI2_SAS_NEG_LINK_RATE_1_5;

		ioc->sas_hba.phy[i].port = mpt3sas_get_port_by_id(ioc, port_id);

		mpt3sas_transport_update_links(ioc, ioc->sas_hba.sas_address,

		    attached_handle, i, link_rate);

		    attached_handle, i, link_rate,

		    ioc->sas_hba.phy[i].port);

	}

 out:

	kfree(sas_iounit_pg0);
@@ -5994,6 +5998,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 
	int i;

	unsigned long flags;

	struct _sas_port *mpt3sas_port = NULL;

	u8 port_id;



	int rc = 0;
@@ -6026,6 +6031,8 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 
			__FILE__, __LINE__, __func__);

		return -1;

	}



	port_id = expander_pg0.PhysicalPort;

	if (sas_address_parent != ioc->sas_hba.sas_address) {

		spin_lock_irqsave(&ioc->sas_node_lock, flags);

		sas_expander = mpt3sas_scsih_expander_find_by_sas_address(ioc,
@@ -6059,6 +6066,13 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 
	sas_expander->num_phys = expander_pg0.NumPhys;

	sas_expander->sas_address_parent = sas_address_parent;

	sas_expander->sas_address = sas_address;

	sas_expander->port = mpt3sas_get_port_by_id(ioc, port_id);

	if (!sas_expander->port) {

		ioc_err(ioc, "failure at %s:%d/%s()!\n",

		    __FILE__, __LINE__, __func__);

		rc = -1;

		goto out_fail;

	}



	ioc_info(ioc, "expander_add: handle(0x%04x), parent(0x%04x), sas_addr(0x%016llx), phys(%d)\n",

		 handle, parent_handle,
@@ -6077,7 +6091,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 


	INIT_LIST_HEAD(&sas_expander->sas_port_list);

	mpt3sas_port = mpt3sas_transport_port_add(ioc, handle,

	    sas_address_parent);

	    sas_address_parent, sas_expander->port);

	if (!mpt3sas_port) {

		ioc_err(ioc, "failure at %s:%d/%s()!\n",

			__FILE__, __LINE__, __func__);
@@ -6096,6 +6110,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 
		}

		sas_expander->phy[i].handle = handle;

		sas_expander->phy[i].phy_id = i;

		sas_expander->phy[i].port = mpt3sas_get_port_by_id(ioc, port_id);



		if ((mpt3sas_transport_add_expander_phy(ioc,

		    &sas_expander->phy[i], expander_pg1,
@@ -6123,7 +6138,7 @@ _scsih_expander_add(struct MPT3SAS_ADAPTER *ioc, u16 handle) 


	if (mpt3sas_port)

		mpt3sas_transport_port_remove(ioc, sas_expander->sas_address,

		    sas_address_parent);

		    sas_address_parent, sas_expander->port);

	kfree(sas_expander);

	return rc;

}
@@ -6388,6 +6403,7 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phy_num, 
	u32 ioc_status;

	u64 sas_address;

	u32 device_info;

	u8 port_id;



	if ((mpt3sas_config_get_sas_device_pg0(ioc, &mpi_reply, &sas_device_pg0,

	    MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle))) {
@@ -6424,6 +6440,7 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phy_num, 
	    sas_device_pg0.AccessStatus))

		return -1;



	port_id = sas_device_pg0.PhysicalPort;

	sas_device = mpt3sas_get_sdev_by_addr(ioc,

					sas_address);

	if (sas_device) {
@@ -6466,6 +6483,12 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phy_num, 
	sas_device->phy = sas_device_pg0.PhyNum;

	sas_device->fast_path = (le16_to_cpu(sas_device_pg0.Flags) &

	    MPI25_SAS_DEVICE0_FLAGS_FAST_PATH_CAPABLE) ? 1 : 0;

	sas_device->port = mpt3sas_get_port_by_id(ioc, port_id);

	if (!sas_device->port) {

		ioc_err(ioc, "failure at %s:%d/%s()!\n",

		    __FILE__, __LINE__, __func__);

		goto out;

	}



	if (le16_to_cpu(sas_device_pg0.Flags)

		& MPI2_SAS_DEVICE0_FLAGS_ENCL_LEVEL_VALID) {
@@ -6499,6 +6522,7 @@ _scsih_add_device(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phy_num, 
	else

		_scsih_sas_device_add(ioc, sas_device);



out:

	sas_device_put(sas_device);

	return 0;

}
@@ -6539,7 +6563,8 @@ _scsih_remove_device(struct MPT3SAS_ADAPTER *ioc, 
	if (!ioc->hide_drives)

		mpt3sas_transport_port_remove(ioc,

		    sas_device->sas_address,

		    sas_device->sas_address_parent);

		    sas_device->sas_address_parent,

		    sas_device->port);



	ioc_info(ioc, "removing handle(0x%04x), sas_addr(0x%016llx)\n",

		 sas_device->handle, (u64)sas_device->sas_address);
@@ -6650,6 +6675,7 @@ _scsih_sas_topology_change_event(struct MPT3SAS_ADAPTER *ioc, 
	u64 sas_address;

	unsigned long flags;

	u8 link_rate, prev_link_rate;

	struct hba_port *port;

	Mpi2EventDataSasTopologyChangeList_t *event_data =

		(Mpi2EventDataSasTopologyChangeList_t *)

		fw_event->event_data;
@@ -6671,6 +6697,7 @@ _scsih_sas_topology_change_event(struct MPT3SAS_ADAPTER *ioc, 
	}



	parent_handle = le16_to_cpu(event_data->ExpanderDevHandle);

	port = mpt3sas_get_port_by_id(ioc, event_data->PhysicalPort);



	/* handle expander add */

	if (event_data->ExpStatus == MPI2_EVENT_SAS_TOPO_ES_ADDED)
@@ -6683,6 +6710,7 @@ _scsih_sas_topology_change_event(struct MPT3SAS_ADAPTER *ioc, 
	if (sas_expander) {

		sas_address = sas_expander->sas_address;

		max_phys = sas_expander->num_phys;

		port = sas_expander->port;

	} else if (parent_handle < ioc->sas_hba.num_phys) {

		sas_address = ioc->sas_hba.sas_address;

		max_phys = ioc->sas_hba.num_phys;
@@ -6725,7 +6753,7 @@ _scsih_sas_topology_change_event(struct MPT3SAS_ADAPTER *ioc, 
				break;



			mpt3sas_transport_update_links(ioc, sas_address,

			    handle, phy_number, link_rate);

			    handle, phy_number, link_rate, port);



			if (link_rate < MPI2_SAS_NEG_LINK_RATE_1_5)

				break;
@@ -6744,7 +6772,7 @@ _scsih_sas_topology_change_event(struct MPT3SAS_ADAPTER *ioc, 
				break;



			mpt3sas_transport_update_links(ioc, sas_address,

			    handle, phy_number, link_rate);

			    handle, phy_number, link_rate, port);



			_scsih_add_device(ioc, handle, phy_number, 0);
@@ -8300,7 +8328,8 @@ _scsih_sas_pd_add(struct MPT3SAS_ADAPTER *ioc, 
	parent_handle = le16_to_cpu(sas_device_pg0.ParentDevHandle);

	if (!_scsih_get_sas_address(ioc, parent_handle, &sas_address))

		mpt3sas_transport_update_links(ioc, sas_address, handle,

		    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);

		    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5,

		    mpt3sas_get_port_by_id(ioc, sas_device_pg0.PhysicalPort));



	_scsih_ir_fastpath(ioc, handle, element->PhysDiskNum);

	_scsih_add_device(ioc, handle, 0, 1);
@@ -8606,7 +8635,9 @@ _scsih_sas_ir_physical_disk_event(struct MPT3SAS_ADAPTER *ioc, 
		parent_handle = le16_to_cpu(sas_device_pg0.ParentDevHandle);

		if (!_scsih_get_sas_address(ioc, parent_handle, &sas_address))

			mpt3sas_transport_update_links(ioc, sas_address, handle,

			    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);

			    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5,

			    mpt3sas_get_port_by_id(ioc,

			    sas_device_pg0.PhysicalPort));



		_scsih_add_device(ioc, handle, 0, 1);
@@ -9345,7 +9376,8 @@ _scsih_refresh_expander_links(struct MPT3SAS_ADAPTER *ioc, 


		mpt3sas_transport_update_links(ioc, sas_expander->sas_address,

		    le16_to_cpu(expander_pg1.AttachedDevHandle), i,

		    expander_pg1.NegotiatedLinkRate >> 4);

		    expander_pg1.NegotiatedLinkRate >> 4,

		    sas_expander->port);

	}

}
@@ -9364,7 +9396,7 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
	Mpi2RaidPhysDiskPage0_t pd_pg0;

	Mpi2EventIrConfigElement_t element;

	Mpi2ConfigReply_t mpi_reply;

	u8 phys_disk_num;

	u8 phys_disk_num, port_id;

	u16 ioc_status;

	u16 handle, parent_handle;

	u64 sas_address;
@@ -9454,9 +9486,11 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
			ioc_info(ioc, "\tBEFORE adding phys disk: handle (0x%04x), sas_addr(0x%016llx)\n",

				 handle,

				 (u64)le64_to_cpu(sas_device_pg0.SASAddress));

			port_id = sas_device_pg0.PhysicalPort;

			mpt3sas_transport_update_links(ioc, sas_address,

			    handle, sas_device_pg0.PhyNum,

			    MPI2_SAS_NEG_LINK_RATE_1_5);

			    MPI2_SAS_NEG_LINK_RATE_1_5,

			    mpt3sas_get_port_by_id(ioc, port_id));

			set_bit(handle, ioc->pd_handles);

			retry_count = 0;

			/* This will retry adding the end device.
@@ -9542,6 +9576,7 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
		if (!(_scsih_is_end_device(

		    le32_to_cpu(sas_device_pg0.DeviceInfo))))

			continue;

		port_id = sas_device_pg0.PhysicalPort;

		sas_device = mpt3sas_get_sdev_by_addr(ioc,

		    le64_to_cpu(sas_device_pg0.SASAddress));

		if (sas_device) {
@@ -9554,7 +9589,8 @@ _scsih_scan_for_devices_after_reset(struct MPT3SAS_ADAPTER *ioc) 
				 handle,

				 (u64)le64_to_cpu(sas_device_pg0.SASAddress));

			mpt3sas_transport_update_links(ioc, sas_address, handle,

			    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);

			    sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5,

			    mpt3sas_get_port_by_id(ioc, port_id));

			retry_count = 0;

			/* This will retry adding the end device.

			 * _scsih_add_device() will decide on retries and
@@ -9997,7 +10033,7 @@ _scsih_expander_node_remove(struct MPT3SAS_ADAPTER *ioc, 
	}



	mpt3sas_transport_port_remove(ioc, sas_expander->sas_address,

	    sas_expander->sas_address_parent);

	    sas_expander->sas_address_parent, sas_expander->port);



	ioc_info(ioc, "expander_remove: handle(0x%04x), sas_addr(0x%016llx)\n",

		 sas_expander->handle, (unsigned long long)
@@ -10341,6 +10377,7 @@ _scsih_probe_boot_devices(struct MPT3SAS_ADAPTER *ioc) 
	unsigned long flags;

	int rc;

	int tid;

	struct hba_port *port;



	 /* no Bios, return immediately */

	if (!ioc->bios_pg3.BiosVersion)
@@ -10382,19 +10419,24 @@ _scsih_probe_boot_devices(struct MPT3SAS_ADAPTER *ioc) 
		handle = sas_device->handle;

		sas_address_parent = sas_device->sas_address_parent;

		sas_address = sas_device->sas_address;

		port = sas_device->port;

		list_move_tail(&sas_device->list, &ioc->sas_device_list);

		spin_unlock_irqrestore(&ioc->sas_device_lock, flags);



		if (ioc->hide_drives)

			return;



		if (!port)

			return;



		if (!mpt3sas_transport_port_add(ioc, handle,

		    sas_address_parent)) {

		    sas_address_parent, port)) {

			_scsih_sas_device_remove(ioc, sas_device);

		} else if (!sas_device->starget) {

			if (!ioc->is_driver_loading) {

				mpt3sas_transport_port_remove(ioc,

				    sas_address,

				    sas_address_parent);

				    sas_address_parent, port);

				_scsih_sas_device_remove(ioc, sas_device);

			}

		}
@@ -10482,7 +10524,7 @@ _scsih_probe_sas(struct MPT3SAS_ADAPTER *ioc) 


	while ((sas_device = get_next_sas_device(ioc))) {

		if (!mpt3sas_transport_port_add(ioc, sas_device->handle,

		    sas_device->sas_address_parent)) {

		    sas_device->sas_address_parent, sas_device->port)) {

			_scsih_sas_device_remove(ioc, sas_device);

			sas_device_put(sas_device);

			continue;
@@ -10496,7 +10538,8 @@ _scsih_probe_sas(struct MPT3SAS_ADAPTER *ioc) 
			if (!ioc->is_driver_loading) {

				mpt3sas_transport_port_remove(ioc,

				    sas_device->sas_address,

				    sas_device->sas_address_parent);

				    sas_device->sas_address_parent,

				    sas_device->port);

				_scsih_sas_device_remove(ioc, sas_device);

				sas_device_put(sas_device);

				continue;

drivers/scsi/mpt3sas/mpt3sas_transport.c

+60 −5
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ _transport_sanity_check(struct MPT3SAS_ADAPTER *ioc, struct _sas_node *sas_node, 
 * @ioc: per adapter object

 * @handle: handle of attached device

 * @sas_address: sas address of parent expander or sas host

 * @port: hba port entry

 * Context: This function will acquire ioc->sas_node_lock.

 *

 * Adding new port object to the sas_node->sas_port_list.
@@ -602,7 +603,7 @@ _transport_sanity_check(struct MPT3SAS_ADAPTER *ioc, struct _sas_node *sas_node, 
 */

struct _sas_port *

mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle,

	u64 sas_address)

	u64 sas_address, struct hba_port *hba_port)

{

	struct _sas_phy *mpt3sas_phy, *next;

	struct _sas_port *mpt3sas_port;
@@ -613,6 +614,12 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
	int i;

	struct sas_port *port;



	if (!hba_port) {

		ioc_err(ioc, "failure at %s:%d/%s()!\n",

		    __FILE__, __LINE__, __func__);

		return NULL;

	}



	mpt3sas_port = kzalloc(sizeof(struct _sas_port),

	    GFP_KERNEL);

	if (!mpt3sas_port) {
@@ -646,6 +653,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
		goto out_fail;

	}



	mpt3sas_port->hba_port = hba_port;

	_transport_sanity_check(ioc, sas_node,

	    mpt3sas_port->remote_identify.sas_address);
@@ -653,8 +661,12 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
		if (sas_node->phy[i].remote_identify.sas_address !=

		    mpt3sas_port->remote_identify.sas_address)

			continue;

		if (sas_node->phy[i].port != hba_port)

			continue;

		list_add_tail(&sas_node->phy[i].port_siblings,

		    &mpt3sas_port->phy_list);

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

			hba_port->phy_mask |= (1 << i);

		mpt3sas_port->num_phys++;

	}
@@ -686,14 +698,21 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
			    mpt3sas_phy->phy_id);

		sas_port_add_phy(port, mpt3sas_phy->phy);

		mpt3sas_phy->phy_belongs_to_port = 1;

		mpt3sas_phy->port = hba_port;

	}



	mpt3sas_port->port = port;

	if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE)

	if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE) {

		rphy = sas_end_device_alloc(port);

	else

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

			hba_port->sas_address = sas_device->sas_address;

	} else {

		rphy = sas_expander_alloc(port,

		    mpt3sas_port->remote_identify.device_type);

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

			hba_port->sas_address =

			    mpt3sas_port->remote_identify.sas_address;

	}



	rphy->identify = mpt3sas_port->remote_identify;
@@ -751,6 +770,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
 * @ioc: per adapter object

 * @sas_address: sas address of attached device

 * @sas_address_parent: sas address of parent expander or sas host

 * @port: hba port entry

 * Context: This function will acquire ioc->sas_node_lock.

 *

 * Removing object and freeing associated memory from the
@@ -758,7 +778,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, 
 */

void

mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address,

	u64 sas_address_parent)

	u64 sas_address_parent, struct hba_port *port)

{

	int i;

	unsigned long flags;
@@ -766,6 +786,10 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, 
	struct _sas_node *sas_node;

	u8 found = 0;

	struct _sas_phy *mpt3sas_phy, *next_phy;

	struct hba_port *hba_port_next, *hba_port = NULL;



	if (!port)

		return;



	spin_lock_irqsave(&ioc->sas_node_lock, flags);

	sas_node = _transport_sas_node_find_by_sas_address(ioc,
@@ -778,6 +802,8 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, 
	    port_list) {

		if (mpt3sas_port->remote_identify.sas_address != sas_address)

			continue;

		if (mpt3sas_port->hba_port != port)

			continue;

		found = 1;

		list_del(&mpt3sas_port->port_list);

		goto out;
@@ -788,6 +814,21 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, 
		return;

	}



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

		list_for_each_entry_safe(hba_port, hba_port_next,

		    &ioc->port_table_list, list) {

			if (hba_port != port)

				continue;

			if (hba_port->sas_address != sas_address)

				continue;

			ioc_info(ioc,

			    "remove hba_port entry: %p port: %d from hba_port list\n",

			    hba_port, hba_port->port_id);

			list_del(&hba_port->list);

			kfree(hba_port);

		}

	}



	for (i = 0; i < sas_node->num_phys; i++) {

		if (sas_node->phy[i].remote_identify.sas_address == sas_address)

			memset(&sas_node->phy[i].remote_identify, 0 ,
@@ -961,14 +1002,19 @@ mpt3sas_transport_add_expander_phy(struct MPT3SAS_ADAPTER *ioc, struct _sas_phy 
 * @handle: attached device handle

 * @phy_number: phy number

 * @link_rate: new link rate

 * @port: hba port entry

 *

 * Return nothing.

 */

void

mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc,

	u64 sas_address, u16 handle, u8 phy_number, u8 link_rate)

	u64 sas_address, u16 handle, u8 phy_number, u8 link_rate,

	struct hba_port *port)

{

	unsigned long flags;

	struct _sas_node *sas_node;

	struct _sas_phy *mpt3sas_phy;

	struct hba_port *hba_port = NULL;



	if (ioc->shost_recovery || ioc->pci_error_recovery)

		return;
@@ -988,6 +1034,15 @@ mpt3sas_transport_update_links(struct MPT3SAS_ADAPTER *ioc, 
		    &mpt3sas_phy->remote_identify);

		_transport_add_phy_to_an_existing_port(ioc, sas_node,

		    mpt3sas_phy, mpt3sas_phy->remote_identify.sas_address);

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

			list_for_each_entry(hba_port,

			    &ioc->port_table_list, list) {

				if (hba_port->sas_address == sas_address &&

				    hba_port == port)

					hba_port->phy_mask |=

					    (1 << mpt3sas_phy->phy_id);

			}

		}

	} else

		memset(&mpt3sas_phy->remote_identify, 0 , sizeof(struct

		    sas_identify));