redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

isci: remove usage of sci_sas_address in scic_sds_remote_device

Browse source 
The sas address can be retrieved from the domain device and then
converted to the always little-endian format in the remote node context.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2011-04-26 09:41:52 -07:00
parent 00d680ef84
commit a3d568f0df
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/scsi/isci/remote_device.c
View file

@ -1501,8 +1501,6 @@ static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci
sci_dev->rnc.remote_node_index = remote_node_index;
scic_sds_port_get_attached_sas_address(sci_port, &sci_dev->device_address);
if (dev->dev_type == SAS_END_DEV)
sci_dev->has_ready_substate_machine = false;
else if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {
@ -1553,7 +1551,6 @@ static enum sci_status scic_remote_device_ea_construct(struct scic_sds_port *sci
enum sci_status status;
scic_remote_device_construct(sci_port, sci_dev);
memcpy(&sci_dev->device_address, dev->sas_addr, SAS_ADDR_SIZE);
status = scic_sds_controller_allocate_remote_node_context(
scic, sci_dev, &sci_dev->rnc.remote_node_index);

5
drivers/scsi/isci/remote_device.h
View file

@ -99,11 +99,6 @@ struct scic_sds_remote_device {
*/
enum sas_linkrate connection_rate;
/**
* This field contains the device SAS address.
*/
struct sci_sas_address device_address;
/**
* This filed is assinged the value of true if the device is directly
* attached to the port.

8
drivers/scsi/isci/remote_node_context.c
View file

@ -110,6 +110,7 @@ static void scic_sds_remote_node_context_construct_buffer(
struct domain_device *dev = sci_dev_to_domain(sci_dev);
union scu_remote_node_context *rnc;
struct scic_sds_controller *scic;
__le64 sas_addr;
scic = scic_sds_remote_device_get_controller(sci_dev);
@ -124,9 +125,10 @@ static void scic_sds_remote_node_context_construct_buffer(
rnc->ssp.logical_port_index =
scic_sds_remote_device_get_port_index(sci_dev);
/* address is always big endian, destination is always little */
rnc->ssp.remote_sas_address_hi = swab32(sci_dev->device_address.high);
rnc->ssp.remote_sas_address_lo = swab32(sci_dev->device_address.low);
/* sas address is __be64, context ram format is __le64 */
sas_addr = cpu_to_le64(SAS_ADDR(dev->sas_addr));
rnc->ssp.remote_sas_address_hi = upper_32_bits(sas_addr);
rnc->ssp.remote_sas_address_lo = lower_32_bits(sas_addr);
rnc->ssp.nexus_loss_timer_enable = true;
rnc->ssp.check_bit = false;