git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: rename ATA_PROT_ATAPI_* to ATAPI_PROT_*
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
libsas
/
sas_ata.c
diff --git
a/drivers/scsi/libsas/sas_ata.c
b/drivers/scsi/libsas/sas_ata.c
index
ced2de3
..
f78d060
100644
(file)
--- a/
drivers/scsi/libsas/sas_ata.c
+++ b/
drivers/scsi/libsas/sas_ata.c
@@
-176,7
+176,7
@@
static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
ata_tf_to_fis(&qc->tf, 1, 0, (u8*)&task->ata_task.fis);
task->uldd_task = qc;
ata_tf_to_fis(&qc->tf, 1, 0, (u8*)&task->ata_task.fis);
task->uldd_task = qc;
- if (
is_atapi_taskfile(&qc->tf
)) {
+ if (
ata_is_atapi(qc->tf.protocol
)) {
memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
task->total_xfer_len = qc->nbytes + qc->pad_len;
task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
task->total_xfer_len = qc->nbytes + qc->pad_len;
task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
@@
-200,7
+200,7
@@
static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
case ATA_PROT_NCQ:
task->ata_task.use_ncq = 1;
/* fall through */
case ATA_PROT_NCQ:
task->ata_task.use_ncq = 1;
/* fall through */
- case ATA
_PROT_ATAPI
_DMA:
+ case ATA
PI_PROT
_DMA:
case ATA_PROT_DMA:
task->ata_task.dma_xfer = 1;
break;
case ATA_PROT_DMA:
task->ata_task.dma_xfer = 1;
break;
@@
-249,17
+249,17
@@
static void sas_ata_phy_reset(struct ata_port *ap)
switch (dev->sata_dev.command_set) {
case ATA_COMMAND_SET:
SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
switch (dev->sata_dev.command_set) {
case ATA_COMMAND_SET:
SAS_DPRINTK("%s: Found ATA device.\n", __FUNCTION__);
- ap->device[0].class = ATA_DEV_ATA;
+ ap->
link.
device[0].class = ATA_DEV_ATA;
break;
case ATAPI_COMMAND_SET:
SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
break;
case ATAPI_COMMAND_SET:
SAS_DPRINTK("%s: Found ATAPI device.\n", __FUNCTION__);
- ap->device[0].class = ATA_DEV_ATAPI;
+ ap->
link.
device[0].class = ATA_DEV_ATAPI;
break;
default:
SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
__FUNCTION__,
dev->sata_dev.command_set);
break;
default:
SAS_DPRINTK("%s: Unknown SATA command set: %d.\n",
__FUNCTION__,
dev->sata_dev.command_set);
- ap->device[0].class = ATA_DEV_UNKNOWN;
+ ap->
link.
device[0].class = ATA_DEV_UNKNOWN;
break;
}
break;
}
@@
-317,7
+317,7
@@
static int sas_ata_scr_write(struct ata_port *ap, unsigned int sc_reg_in,
dev->sata_dev.serror = val;
break;
case SCR_ACTIVE:
dev->sata_dev.serror = val;
break;
case SCR_ACTIVE:
- dev->sata_dev.ap->sactive = val;
+ dev->sata_dev.ap->
link.
sactive = val;
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
@@
-342,7
+342,7
@@
static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
*val = dev->sata_dev.serror;
return 0;
case SCR_ACTIVE:
*val = dev->sata_dev.serror;
return 0;
case SCR_ACTIVE:
- *val = dev->sata_dev.ap->sactive;
+ *val = dev->sata_dev.ap->
link.
sactive;
return 0;
default:
return -EINVAL;
return 0;
default:
return -EINVAL;
@@
-350,7
+350,6
@@
static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in,
}
static struct ata_port_operations sas_sata_ops = {
}
static struct ata_port_operations sas_sata_ops = {
- .port_disable = ata_port_disable,
.check_status = sas_ata_check_status,
.check_altstatus = sas_ata_check_status,
.dev_select = ata_noop_dev_select,
.check_status = sas_ata_check_status,
.check_altstatus = sas_ata_check_status,
.dev_select = ata_noop_dev_select,
@@
-382,7
+381,7
@@
int sas_ata_init_host_and_port(struct domain_device *found_dev,
struct ata_port *ap;
ata_host_init(&found_dev->sata_dev.ata_host,
struct ata_port *ap;
ata_host_init(&found_dev->sata_dev.ata_host,
-
&ha->pcidev
->dev,
+
ha
->dev,
sata_port_info.flags,
&sas_sata_ops);
ap = ata_sas_port_alloc(&found_dev->sata_dev.ata_host,
sata_port_info.flags,
&sas_sata_ops);
ap = ata_sas_port_alloc(&found_dev->sata_dev.ata_host,
@@
-448,10
+447,10
@@
static void sas_disc_task_done(struct sas_task *task)
* @task: the task to be executed
* @buffer: pointer to buffer to do I/O
* @size: size of @buffer
* @task: the task to be executed
* @buffer: pointer to buffer to do I/O
* @size: size of @buffer
- * @
pci_dma_dir: PCI_DMA_...
+ * @
dma_dir: DMA direction. DMA_xxx
*/
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
*/
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
-
int pci_
dma_dir)
+
enum dma_data_direction
dma_dir)
{
int res = 0;
struct scatterlist *scatter = NULL;
{
int res = 0;
struct scatterlist *scatter = NULL;
@@
-461,7
+460,7
@@
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
struct sas_internal *i =
to_sas_internal(task->dev->port->ha->core.shost->transportt);
struct sas_internal *i =
to_sas_internal(task->dev->port->ha->core.shost->transportt);
- if (
pci_dma_dir != PCI_
DMA_NONE) {
+ if (
dma_dir !=
DMA_NONE) {
scatter = kzalloc(sizeof(*scatter), GFP_KERNEL);
if (!scatter)
goto out;
scatter = kzalloc(sizeof(*scatter), GFP_KERNEL);
if (!scatter)
goto out;
@@
-474,11
+473,11
@@
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
task->scatter = scatter;
task->num_scatter = num_scatter;
task->total_xfer_len = size;
task->scatter = scatter;
task->num_scatter = num_scatter;
task->total_xfer_len = size;
- task->data_dir =
pci_
dma_dir;
+ task->data_dir = dma_dir;
task->task_done = sas_disc_task_done;
task->task_done = sas_disc_task_done;
- if (
pci_dma_dir != PCI_
DMA_NONE &&
+ if (
dma_dir !=
DMA_NONE &&
sas_protocol_ata(task->task_proto)) {
sas_protocol_ata(task->task_proto)) {
- task->num_scatter =
pci_map_sg(task->dev->port->ha->pci
dev,
+ task->num_scatter =
dma_map_sg(task->dev->port->ha->
dev,
task->scatter,
task->num_scatter,
task->data_dir);
task->scatter,
task->num_scatter,
task->data_dir);
@@
-565,9
+564,9
@@
static int sas_execute_task(struct sas_task *task, void *buffer, int size,
}
}
ex_err:
}
}
ex_err:
- if (
pci_dma_dir != PCI_
DMA_NONE) {
+ if (
dma_dir !=
DMA_NONE) {
if (sas_protocol_ata(task->task_proto))
if (sas_protocol_ata(task->task_proto))
-
pci_unmap_sg(task->dev->port->ha->pci
dev,
+
dma_unmap_sg(task->dev->port->ha->
dev,
task->scatter, task->num_scatter,
task->data_dir);
kfree(scatter);
task->scatter, task->num_scatter,
task->data_dir);
kfree(scatter);
@@
-628,11
+627,11
@@
static void sas_get_ata_command_set(struct domain_device *dev)
* @features: the features register
* @buffer: pointer to buffer to do I/O
* @size: size of @buffer
* @features: the features register
* @buffer: pointer to buffer to do I/O
* @size: size of @buffer
- * @
pci_dma_dir: PCI_DMA_...
+ * @
dma_dir: DMA direction. DMA_xxx
*/
static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
u8 features, void *buffer, int size,
*/
static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
u8 features, void *buffer, int size,
-
int pci_
dma_dir)
+
enum dma_data_direction
dma_dir)
{
int res = 0;
struct sas_task *task;
{
int res = 0;
struct sas_task *task;
@@
-652,7
+651,7
@@
static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
task->ata_task.fis.device = d2h_fis->device;
task->ata_task.retry_count = 1;
task->ata_task.fis.device = d2h_fis->device;
task->ata_task.retry_count = 1;
- res = sas_execute_task(task, buffer, size,
pci_
dma_dir);
+ res = sas_execute_task(task, buffer, size, dma_dir);
sas_free_task(task);
out:
sas_free_task(task);
out:
@@
-707,7
+706,7
@@
static int sas_discover_sata_dev(struct domain_device *dev)
}
res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
}
res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
-
PCI_DMA_FROM
DEVICE);
+
DMA_FROM_
DEVICE);
if (res)
goto out_err;
if (res)
goto out_err;
@@
-720,13
+719,13
@@
static int sas_discover_sata_dev(struct domain_device *dev)
goto cont1;
res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES,
ATA_FEATURE_PUP_STBY_SPIN_UP,
goto cont1;
res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES,
ATA_FEATURE_PUP_STBY_SPIN_UP,
- NULL, 0,
PCI_
DMA_NONE);
+ NULL, 0, DMA_NONE);
if (res)
goto cont1;
schedule_timeout_interruptible(5*HZ); /* More time? */
res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
if (res)
goto cont1;
schedule_timeout_interruptible(5*HZ); /* More time? */
res = sas_issue_ata_cmd(dev, command, 0, identify_x, 512,
-
PCI_DMA_FROM
DEVICE);
+
DMA_FROM_
DEVICE);
if (res)
goto out_err;
}
if (res)
goto out_err;
}