Skip to content

Commit 832e77b

Browse files
James BottomleyJames Bottomley
James Bottomley
authored and
James Bottomley
committed
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
2 parents e0fd9af + e689cf0 commit 832e77b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+10476
-1443
lines changed

‎drivers/scsi/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,6 +1353,8 @@ config SCSI_LPFC
13531353
tristate "Emulex LightPulse Fibre Channel Support"
13541354
depends on PCI && SCSI
13551355
select SCSI_FC_ATTRS
1356+
select GENERIC_CSUM
1357+
select CRC_T10DIF
13561358
help
13571359
This lpfc driver supports the Emulex LightPulse
13581360
Family of Fibre Channel PCI host adapters.

‎drivers/scsi/aic94xx/aic94xx_dev.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static void asd_set_ddb_type(struct domain_device *dev)
8484
struct asd_ha_struct *asd_ha = dev->port->ha->lldd_ha;
8585
int ddb = (int) (unsigned long) dev->lldd_dev;
8686

87-
if (dev->dev_type == SATA_PM_PORT)
87+
if (dev->dev_type == SAS_SATA_PM_PORT)
8888
asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_PM_PORT);
8989
else if (dev->tproto)
9090
asd_ddbsite_write_byte(asd_ha,ddb, DDB_TYPE, DDB_TYPE_TARGET);
@@ -116,7 +116,7 @@ void asd_set_dmamode(struct domain_device *dev)
116116
int ddb = (int) (unsigned long) dev->lldd_dev;
117117
u32 qdepth = 0;
118118

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) {
120120
if (ata_id_has_ncq(ata_dev->id))
121121
qdepth = ata_id_queue_depth(ata_dev->id);
122122
asd_ddbsite_write_dword(asd_ha, ddb, SATA_TAG_ALLOC_MASK,
@@ -140,8 +140,8 @@ static int asd_init_sata(struct domain_device *dev)
140140
int ddb = (int) (unsigned long) dev->lldd_dev;
141141

142142
asd_ddbsite_write_word(asd_ha, ddb, ATA_CMD_SCBPTR, 0xFFFF);
143-
if (dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM ||
144-
dev->dev_type == SATA_PM_PORT) {
143+
if (dev->dev_type == SAS_SATA_DEV || dev->dev_type == SAS_SATA_PM ||
144+
dev->dev_type == SAS_SATA_PM_PORT) {
145145
struct dev_to_host_fis *fis = (struct dev_to_host_fis *)
146146
dev->frame_rcvd;
147147
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)
174174
asd_ddbsite_write_byte(asd_ha, ddb, CONN_MASK, dev->port->phy_mask);
175175
if (dev->port->oob_mode != SATA_OOB_MODE) {
176176
flags |= OPEN_REQUIRED;
177-
if ((dev->dev_type == SATA_DEV) ||
177+
if ((dev->dev_type == SAS_SATA_DEV) ||
178178
(dev->tproto & SAS_PROTOCOL_STP)) {
179179
struct smp_resp *rps_resp = &dev->sata_dev.rps_resp;
180180
if (rps_resp->frame_type == SMP_RESPONSE &&
@@ -188,8 +188,8 @@ static int asd_init_target_ddb(struct domain_device *dev)
188188
} else {
189189
flags |= CONCURRENT_CONN_SUPP;
190190
if (!dev->parent &&
191-
(dev->dev_type == EDGE_DEV ||
192-
dev->dev_type == FANOUT_DEV))
191+
(dev->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
192+
dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE))
193193
asd_ddbsite_write_byte(asd_ha, ddb, MAX_CCONN,
194194
4);
195195
else
@@ -198,7 +198,7 @@ static int asd_init_target_ddb(struct domain_device *dev)
198198
asd_ddbsite_write_byte(asd_ha, ddb, NUM_CTX, 1);
199199
}
200200
}
201-
if (dev->dev_type == SATA_PM)
201+
if (dev->dev_type == SAS_SATA_PM)
202202
flags |= SATA_MULTIPORT;
203203
asd_ddbsite_write_byte(asd_ha, ddb, DDB_TARG_FLAGS, flags);
204204

@@ -211,15 +211,15 @@ static int asd_init_target_ddb(struct domain_device *dev)
211211
asd_ddbsite_write_word(asd_ha, ddb, SEND_QUEUE_TAIL, 0xFFFF);
212212
asd_ddbsite_write_word(asd_ha, ddb, SISTER_DDB, 0xFFFF);
213213

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)) {
215215
i = asd_init_sata(dev);
216216
if (i < 0) {
217217
asd_free_ddb(asd_ha, ddb);
218218
return i;
219219
}
220220
}
221221

222-
if (dev->dev_type == SAS_END_DEV) {
222+
if (dev->dev_type == SAS_END_DEVICE) {
223223
struct sas_end_device *rdev = rphy_to_end_device(dev->rphy);
224224
if (rdev->I_T_nexus_loss_timeout > 0)
225225
asd_ddbsite_write_word(asd_ha, ddb, ITNL_TIMEOUT,
@@ -328,10 +328,10 @@ int asd_dev_found(struct domain_device *dev)
328328

329329
spin_lock_irqsave(&asd_ha->hw_prof.ddb_lock, flags);
330330
switch (dev->dev_type) {
331-
case SATA_PM:
331+
case SAS_SATA_PM:
332332
res = asd_init_sata_pm_ddb(dev);
333333
break;
334-
case SATA_PM_PORT:
334+
case SAS_SATA_PM_PORT:
335335
res = asd_init_sata_pm_port_ddb(dev);
336336
break;
337337
default:

‎drivers/scsi/aic94xx/aic94xx_hwi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static void asd_init_phy_identify(struct asd_phy *phy)
7474

7575
memset(phy->identify_frame, 0, sizeof(*phy->identify_frame));
7676

77-
phy->identify_frame->dev_type = SAS_END_DEV;
77+
phy->identify_frame->dev_type = SAS_END_DEVICE;
7878
if (phy->sas_phy.role & PHY_ROLE_INITIATOR)
7979
phy->identify_frame->initiator_bits = phy->sas_phy.iproto;
8080
if (phy->sas_phy.role & PHY_ROLE_TARGET)

‎drivers/scsi/aic94xx/aic94xx_tmf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ int asd_I_T_nexus_reset(struct domain_device *dev)
184184
struct sas_phy *phy = sas_get_local_phy(dev);
185185
/* Standard mandates link reset for ATA (type 0) and
186186
* hard reset for SSP (type 1) */
187-
int reset_type = (dev->dev_type == SATA_DEV ||
187+
int reset_type = (dev->dev_type == SAS_SATA_DEV ||
188188
(dev->tproto & SAS_PROTOCOL_STP)) ? 0 : 1;
189189

190190
asd_clear_nexus_I_T(dev, NEXUS_PHASE_PRE);

‎drivers/scsi/be2iscsi/be.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2005 - 2012 Emulex
2+
* Copyright (C) 2005 - 2013 Emulex
33
* All rights reserved.
44
*
55
* This program is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)