diff options
Diffstat (limited to 'drivers/scsi/aic94xx/aic94xx_dev.c')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_dev.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_dev.c b/drivers/scsi/aic94xx/aic94xx_dev.c index 64136c56e706..33072388ea16 100644 --- a/drivers/scsi/aic94xx/aic94xx_dev.c +++ b/drivers/scsi/aic94xx/aic94xx_dev.c | |||
@@ -84,7 +84,7 @@ static void asd_set_ddb_type(struct domain_device *dev) | |||
84 | struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha; | 84 | struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha; |
85 | int ddb = (int) (unsigned long) dev->lldd_dev; | 85 | int ddb = (int) (unsigned long) dev->lldd_dev; |
86 | 86 | ||
87 | if (dev->dev_type == SATA_PM_PORT) | 87 | if (dev->dev_type == SAS_SATA_PM_PORT) |
88 | asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_PM_PORT); | 88 | asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_PM_PORT); |
89 | else if (dev->tproto) | 89 | else if (dev->tproto) |
90 | asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_TARGET); | 90 | asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_TARGET); |
@@ -116,7 +116,7 @@ void asd_set_dmamode(struct domain_device *dev) | |||
116 | int ddb = (int) (unsigned long) dev->lldd_dev; | 116 | int ddb = (int) (unsigned long) dev->lldd_dev; |
117 | u32 qdepth = 0; | 117 | u32 qdepth = 0; |
118 | 118 | ||
119 | if (dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM_PORT) { | 119 | if (dev->dev_type == SAS_SATA_DEV || dev->dev_type == SAS_SATA_PM_PORT) { |
120 | if (ata_id_has_ncq(ata_dev->id)) | 120 | if (ata_id_has_ncq(ata_dev->id)) |
121 | qdepth = ata_id_queue_depth(ata_dev->id); | 121 | qdepth = ata_id_queue_depth(ata_dev->id); |
122 | asd_ddbsite_write_dword(asd_ha, ddb, SATA_TAG_ALLOC_MASK, | 122 | asd_ddbsite_write_dword(asd_ha, ddb, SATA_TAG_ALLOC_MASK, |
@@ -140,8 +140,8 @@ static int asd_init_sata(struct domain_device *dev) | |||
140 | int ddb = (int) (unsigned long) dev->lldd_dev; | 140 | int ddb = (int) (unsigned long) dev->lldd_dev; |
141 | 141 | ||
142 | asd_ddbsite_write_word(asd_ha, ddb, ATA_CMD_SCBPTR, 0xFFFF); | 142 | asd_ddbsite_write_word(asd_ha, ddb, ATA_CMD_SCBPTR, 0xFFFF); |
143 | if (dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM || | 143 | if (dev->dev_type == SAS_SATA_DEV || dev->dev_type == SAS_SATA_PM || |
144 | dev->dev_type == SATA_PM_PORT) { | 144 | dev->dev_type == SAS_SATA_PM_PORT) { |
145 | struct dev_to_host_fis *fis = (struct dev_to_host_fis *) | 145 | struct dev_to_host_fis *fis = (struct dev_to_host_fis *) |
146 | dev->frame_rcvd; | 146 | dev->frame_rcvd; |
147 | asd_ddbsite_write_byte(asd_ha, ddb, SATA_STATUS, fis->status); | 147 | asd_ddbsite_write_byte(asd_ha, ddb, SATA_STATUS, fis->status); |
@@ -174,7 +174,7 @@ static int asd_init_target_ddb(struct domain_device *dev) | |||
174 | asd_ddbsite_write_byte(asd_ha, ddb, CONN_MASK, dev->port->phy_mask); | 174 | asd_ddbsite_write_byte(asd_ha, ddb, CONN_MASK, dev->port->phy_mask); |
175 | if (dev->port->oob_mode != SATA_OOB_MODE) { | 175 | if (dev->port->oob_mode != SATA_OOB_MODE) { |
176 | flags |= OPEN_REQUIRED; | 176 | flags |= OPEN_REQUIRED; |
177 | if ((dev->dev_type == SATA_DEV) || | 177 | if ((dev->dev_type == SAS_SATA_DEV) || |
178 | (dev->tproto & SAS_PROTOCOL_STP)) { | 178 | (dev->tproto & SAS_PROTOCOL_STP)) { |
179 | struct smp_resp *rps_resp = &dev->sata_dev.rps_resp; | 179 | struct smp_resp *rps_resp = &dev->sata_dev.rps_resp; |
180 | if (rps_resp->frame_type == SMP_RESPONSE && | 180 | if (rps_resp->frame_type == SMP_RESPONSE && |
@@ -188,8 +188,8 @@ static int asd_init_target_ddb(struct domain_device *dev) | |||
188 | } else { | 188 | } else { |
189 | flags |= CONCURRENT_CONN_SUPP; | 189 | flags |= CONCURRENT_CONN_SUPP; |
190 | if (!dev->parent && | 190 | if (!dev->parent && |
191 | (dev->dev_type == EDGE_DEV || | 191 | (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || |
192 | dev->dev_type == FANOUT_DEV)) | 192 | dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE)) |
193 | asd_ddbsite_write_byte(asd_ha, ddb, MAX_CCONN, | 193 | asd_ddbsite_write_byte(asd_ha, ddb, MAX_CCONN, |
194 | 4); | 194 | 4); |
195 | else | 195 | else |
@@ -198,7 +198,7 @@ static int asd_init_target_ddb(struct domain_device *dev) | |||
198 | asd_ddbsite_write_byte(asd_ha, ddb, NUM_CTX, 1); | 198 | asd_ddbsite_write_byte(asd_ha, ddb, NUM_CTX, 1); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | if (dev->dev_type == SATA_PM) | 201 | if (dev->dev_type == SAS_SATA_PM) |
202 | flags |= SATA_MULTIPORT; | 202 | flags |= SATA_MULTIPORT; |
203 | asd_ddbsite_write_byte(asd_ha, ddb, DDB_TARG_FLAGS, flags); | 203 | asd_ddbsite_write_byte(asd_ha, ddb, DDB_TARG_FLAGS, flags); |
204 | 204 | ||
@@ -211,7 +211,7 @@ static int asd_init_target_ddb(struct domain_device *dev) | |||
211 | asd_ddbsite_write_word(asd_ha, ddb, SEND_QUEUE_TAIL, 0xFFFF); | 211 | asd_ddbsite_write_word(asd_ha, ddb, SEND_QUEUE_TAIL, 0xFFFF); |
212 | asd_ddbsite_write_word(asd_ha, ddb, SISTER_DDB, 0xFFFF); | 212 | asd_ddbsite_write_word(asd_ha, ddb, SISTER_DDB, 0xFFFF); |
213 | 213 | ||
214 | if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { | 214 | if (dev->dev_type == SAS_SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) { |
215 | i = asd_init_sata(dev); | 215 | i = asd_init_sata(dev); |
216 | if (i < 0) { | 216 | if (i < 0) { |
217 | asd_free_ddb(asd_ha, ddb); | 217 | asd_free_ddb(asd_ha, ddb); |
@@ -219,7 +219,7 @@ static int asd_init_target_ddb(struct domain_device *dev) | |||
219 | } | 219 | } |
220 | } | 220 | } |
221 | 221 | ||
222 | if (dev->dev_type == SAS_END_DEV) { | 222 | if (dev->dev_type == SAS_END_DEVICE) { |
223 | struct sas_end_device *rdev = rphy_to_end_device(dev->rphy); | 223 | struct sas_end_device *rdev = rphy_to_end_device(dev->rphy); |
224 | if (rdev->I_T_nexus_loss_timeout > 0) | 224 | if (rdev->I_T_nexus_loss_timeout > 0) |
225 | asd_ddbsite_write_word(asd_ha, ddb, ITNL_TIMEOUT, | 225 | asd_ddbsite_write_word(asd_ha, ddb, ITNL_TIMEOUT, |
@@ -328,10 +328,10 @@ int asd_dev_found(struct domain_device *dev) | |||
328 | 328 | ||
329 | spin_lock_irqsave(&asd_ha->hw_prof.ddb_lock, flags); | 329 | spin_lock_irqsave(&asd_ha->hw_prof.ddb_lock, flags); |
330 | switch (dev->dev_type) { | 330 | switch (dev->dev_type) { |
331 | case SATA_PM: | 331 | case SAS_SATA_PM: |
332 | res = asd_init_sata_pm_ddb(dev); | 332 | res = asd_init_sata_pm_ddb(dev); |
333 | break; | 333 | break; |
334 | case SATA_PM_PORT: | 334 | case SAS_SATA_PM_PORT: |
335 | res = asd_init_sata_pm_port_ddb(dev); | 335 | res = asd_init_sata_pm_port_ddb(dev); |
336 | break; | 336 | break; |
337 | default: | 337 | default: |