* [PATCH] ahci: separate out ahci_fill_cmd_slot()
@ 2006-01-23 8:16 Tejun Heo
2006-01-27 4:08 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Tejun Heo @ 2006-01-23 8:16 UTC (permalink / raw)
To: Jeff Garzik, linux-ide
Separate out ahci_fill_cmd_slot() from ahci_qc_prep().
ahci_fill_cmd_slot() can later be used to issue non-standard commands.
(e.g. softreset)
Signed-off-by: Tejun Heo <htejun@gmail.com>
Index: work1/drivers/scsi/ahci.c
===================================================================
--- work1.orig/drivers/scsi/ahci.c 2006-01-23 17:02:42.000000000 +0900
+++ work1/drivers/scsi/ahci.c 2006-01-23 17:04:17.000000000 +0900
@@ -498,6 +498,15 @@ static unsigned int ahci_dev_classify(st
return ata_dev_classify(&tf);
}
+static inline void ahci_fill_cmd_slot(struct ata_port *ap, u32 opts)
+{
+ struct ahci_port_priv *pp = ap->private_data;
+ pp->cmd_slot[0].opts = cpu_to_le32(opts);
+ pp->cmd_slot[0].status = 0;
+ pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
+ pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
+}
+
static void ahci_phy_reset(struct ata_port *ap)
{
void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -576,42 +585,35 @@ static void ahci_qc_prep(struct ata_queu
{
struct ata_port *ap = qc->ap;
struct ahci_port_priv *pp = ap->private_data;
+ int is_atapi = is_atapi_taskfile(&qc->tf);
u32 opts;
const u32 cmd_fis_len = 5; /* five dwords */
unsigned int n_elem;
/*
- * Fill in command slot information (currently only one slot,
- * slot 0, is currently since we don't do queueing)
- */
-
- opts = cmd_fis_len;
- if (qc->tf.flags & ATA_TFLAG_WRITE)
- opts |= AHCI_CMD_WRITE;
- if (is_atapi_taskfile(&qc->tf))
- opts |= AHCI_CMD_ATAPI;
-
- pp->cmd_slot[0].opts = cpu_to_le32(opts);
- pp->cmd_slot[0].status = 0;
- pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
- pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
-
- /*
* Fill in command table information. First, the header,
* a SATA Register - Host to Device command FIS.
*/
ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
- if (opts & AHCI_CMD_ATAPI) {
+ if (is_atapi) {
memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
}
- if (!(qc->flags & ATA_QCFLAG_DMAMAP))
- return;
+ n_elem = 0;
+ if (qc->flags & ATA_QCFLAG_DMAMAP)
+ n_elem = ahci_fill_sg(qc);
- n_elem = ahci_fill_sg(qc);
+ /*
+ * Fill in command slot information.
+ */
+ opts = cmd_fis_len | cpu_to_le32(n_elem << 16);
+ if (qc->tf.flags & ATA_TFLAG_WRITE)
+ opts |= AHCI_CMD_WRITE;
+ if (is_atapi)
+ opts |= AHCI_CMD_ATAPI;
- pp->cmd_slot[0].opts |= cpu_to_le32(n_elem << 16);
+ ahci_fill_cmd_slot(ap, opts);
}
static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ahci: separate out ahci_fill_cmd_slot()
2006-01-23 8:16 [PATCH] ahci: separate out ahci_fill_cmd_slot() Tejun Heo
@ 2006-01-27 4:08 ` Jeff Garzik
2006-02-01 17:04 ` Tejun Heo
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2006-01-27 4:08 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide
Tejun Heo wrote:
> Separate out ahci_fill_cmd_slot() from ahci_qc_prep().
> ahci_fill_cmd_slot() can later be used to issue non-standard commands.
> (e.g. softreset)
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
>
> Index: work1/drivers/scsi/ahci.c
> ===================================================================
> --- work1.orig/drivers/scsi/ahci.c 2006-01-23 17:02:42.000000000 +0900
> +++ work1/drivers/scsi/ahci.c 2006-01-23 17:04:17.000000000 +0900
> @@ -498,6 +498,15 @@ static unsigned int ahci_dev_classify(st
> return ata_dev_classify(&tf);
> }
>
> +static inline void ahci_fill_cmd_slot(struct ata_port *ap, u32 opts)
> +{
> + struct ahci_port_priv *pp = ap->private_data;
> + pp->cmd_slot[0].opts = cpu_to_le32(opts);
> + pp->cmd_slot[0].status = 0;
> + pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
> + pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
> +}
> +
> static void ahci_phy_reset(struct ata_port *ap)
> {
> void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
> @@ -576,42 +585,35 @@ static void ahci_qc_prep(struct ata_queu
> {
> struct ata_port *ap = qc->ap;
> struct ahci_port_priv *pp = ap->private_data;
> + int is_atapi = is_atapi_taskfile(&qc->tf);
> u32 opts;
> const u32 cmd_fis_len = 5; /* five dwords */
> unsigned int n_elem;
>
> /*
> - * Fill in command slot information (currently only one slot,
> - * slot 0, is currently since we don't do queueing)
> - */
> -
> - opts = cmd_fis_len;
> - if (qc->tf.flags & ATA_TFLAG_WRITE)
> - opts |= AHCI_CMD_WRITE;
> - if (is_atapi_taskfile(&qc->tf))
> - opts |= AHCI_CMD_ATAPI;
> -
> - pp->cmd_slot[0].opts = cpu_to_le32(opts);
> - pp->cmd_slot[0].status = 0;
> - pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
> - pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
> -
> - /*
> * Fill in command table information. First, the header,
> * a SATA Register - Host to Device command FIS.
> */
> ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
> - if (opts & AHCI_CMD_ATAPI) {
> + if (is_atapi) {
> memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
> memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
> }
>
> - if (!(qc->flags & ATA_QCFLAG_DMAMAP))
> - return;
> + n_elem = 0;
> + if (qc->flags & ATA_QCFLAG_DMAMAP)
> + n_elem = ahci_fill_sg(qc);
>
> - n_elem = ahci_fill_sg(qc);
> + /*
> + * Fill in command slot information.
> + */
> + opts = cmd_fis_len | cpu_to_le32(n_elem << 16);
NAK, remove the cpu_to_le32() call here, it's performed elsewhere in
your patch.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ahci: separate out ahci_fill_cmd_slot()
2006-01-27 4:08 ` Jeff Garzik
@ 2006-02-01 17:04 ` Tejun Heo
2006-02-10 8:25 ` Tejun Heo
0 siblings, 1 reply; 5+ messages in thread
From: Tejun Heo @ 2006-02-01 17:04 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide
Separate out ahci_fill_cmd_slot() from ahci_qc_prep().
ahci_fill_cmd_slot() can later be used to issue non-standard commands.
(e.g. softreset)
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
Here's the fixed version. Thanks for finding the bug.
Index: work1/drivers/scsi/ahci.c
===================================================================
--- work1.orig/drivers/scsi/ahci.c 2006-02-02 01:52:05.000000000 +0900
+++ work1/drivers/scsi/ahci.c 2006-02-02 02:00:15.000000000 +0900
@@ -506,6 +506,15 @@ static unsigned int ahci_dev_classify(st
return ata_dev_classify(&tf);
}
+static inline void ahci_fill_cmd_slot(struct ata_port *ap, u32 opts)
+{
+ struct ahci_port_priv *pp = ap->private_data;
+ pp->cmd_slot[0].opts = cpu_to_le32(opts);
+ pp->cmd_slot[0].status = 0;
+ pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
+ pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
+}
+
static void ahci_phy_reset(struct ata_port *ap)
{
void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -584,42 +593,35 @@ static void ahci_qc_prep(struct ata_queu
{
struct ata_port *ap = qc->ap;
struct ahci_port_priv *pp = ap->private_data;
+ int is_atapi = is_atapi_taskfile(&qc->tf);
u32 opts;
const u32 cmd_fis_len = 5; /* five dwords */
unsigned int n_elem;
/*
- * Fill in command slot information (currently only one slot,
- * slot 0, is currently since we don't do queueing)
- */
-
- opts = cmd_fis_len;
- if (qc->tf.flags & ATA_TFLAG_WRITE)
- opts |= AHCI_CMD_WRITE;
- if (is_atapi_taskfile(&qc->tf))
- opts |= AHCI_CMD_ATAPI;
-
- pp->cmd_slot[0].opts = cpu_to_le32(opts);
- pp->cmd_slot[0].status = 0;
- pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
- pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
-
- /*
* Fill in command table information. First, the header,
* a SATA Register - Host to Device command FIS.
*/
ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
- if (opts & AHCI_CMD_ATAPI) {
+ if (is_atapi) {
memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
}
- if (!(qc->flags & ATA_QCFLAG_DMAMAP))
- return;
+ n_elem = 0;
+ if (qc->flags & ATA_QCFLAG_DMAMAP)
+ n_elem = ahci_fill_sg(qc);
- n_elem = ahci_fill_sg(qc);
+ /*
+ * Fill in command slot information.
+ */
+ opts = cmd_fis_len | n_elem << 16;
+ if (qc->tf.flags & ATA_TFLAG_WRITE)
+ opts |= AHCI_CMD_WRITE;
+ if (is_atapi)
+ opts |= AHCI_CMD_ATAPI;
- pp->cmd_slot[0].opts |= cpu_to_le32(n_elem << 16);
+ ahci_fill_cmd_slot(ap, opts);
}
static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ahci: separate out ahci_fill_cmd_slot()
2006-02-01 17:04 ` Tejun Heo
@ 2006-02-10 8:25 ` Tejun Heo
2006-02-10 12:05 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: Tejun Heo @ 2006-02-10 8:25 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide
Separate out ahci_fill_cmd_slot() from ahci_qc_prep().
ahci_fill_cmd_slot() can later be used to issue non-standard commands.
(e.g. softreset)
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
Forgot to drop the inline. Sorry.
ahci-separate-ahci_fill_cmd_slot
Index: work1/drivers/scsi/ahci.c
===================================================================
--- work1.orig/drivers/scsi/ahci.c 2006-02-10 17:23:14.000000000 +0900
+++ work1/drivers/scsi/ahci.c 2006-02-10 17:24:00.000000000 +0900
@@ -507,6 +507,15 @@ static unsigned int ahci_dev_classify(st
return ata_dev_classify(&tf);
}
+static void ahci_fill_cmd_slot(struct ata_port *ap, u32 opts)
+{
+ struct ahci_port_priv *pp = ap->private_data;
+ pp->cmd_slot[0].opts = cpu_to_le32(opts);
+ pp->cmd_slot[0].status = 0;
+ pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
+ pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
+}
+
static void ahci_phy_reset(struct ata_port *ap)
{
void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -585,42 +594,35 @@ static void ahci_qc_prep(struct ata_queu
{
struct ata_port *ap = qc->ap;
struct ahci_port_priv *pp = ap->private_data;
+ int is_atapi = is_atapi_taskfile(&qc->tf);
u32 opts;
const u32 cmd_fis_len = 5; /* five dwords */
unsigned int n_elem;
/*
- * Fill in command slot information (currently only one slot,
- * slot 0, is currently since we don't do queueing)
- */
-
- opts = cmd_fis_len;
- if (qc->tf.flags & ATA_TFLAG_WRITE)
- opts |= AHCI_CMD_WRITE;
- if (is_atapi_taskfile(&qc->tf))
- opts |= AHCI_CMD_ATAPI;
-
- pp->cmd_slot[0].opts = cpu_to_le32(opts);
- pp->cmd_slot[0].status = 0;
- pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
- pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
-
- /*
* Fill in command table information. First, the header,
* a SATA Register - Host to Device command FIS.
*/
ata_tf_to_fis(&qc->tf, pp->cmd_tbl, 0);
- if (opts & AHCI_CMD_ATAPI) {
+ if (is_atapi) {
memset(pp->cmd_tbl + AHCI_CMD_TBL_CDB, 0, 32);
memcpy(pp->cmd_tbl + AHCI_CMD_TBL_CDB, qc->cdb, ap->cdb_len);
}
- if (!(qc->flags & ATA_QCFLAG_DMAMAP))
- return;
+ n_elem = 0;
+ if (qc->flags & ATA_QCFLAG_DMAMAP)
+ n_elem = ahci_fill_sg(qc);
- n_elem = ahci_fill_sg(qc);
+ /*
+ * Fill in command slot information.
+ */
+ opts = cmd_fis_len | n_elem << 16;
+ if (qc->tf.flags & ATA_TFLAG_WRITE)
+ opts |= AHCI_CMD_WRITE;
+ if (is_atapi)
+ opts |= AHCI_CMD_ATAPI;
- pp->cmd_slot[0].opts |= cpu_to_le32(n_elem << 16);
+ ahci_fill_cmd_slot(ap, opts);
}
static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ahci: separate out ahci_fill_cmd_slot()
2006-02-10 8:25 ` Tejun Heo
@ 2006-02-10 12:05 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2006-02-10 12:05 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide
Tejun Heo wrote:
> Separate out ahci_fill_cmd_slot() from ahci_qc_prep().
> ahci_fill_cmd_slot() can later be used to issue non-standard commands.
> (e.g. softreset)
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
applied, with comment:
> +static void ahci_fill_cmd_slot(struct ata_port *ap, u32 opts)
> +{
> + struct ahci_port_priv *pp = ap->private_data;
> + pp->cmd_slot[0].opts = cpu_to_le32(opts);
> + pp->cmd_slot[0].status = 0;
> + pp->cmd_slot[0].tbl_addr = cpu_to_le32(pp->cmd_tbl_dma & 0xffffffff);
> + pp->cmd_slot[0].tbl_addr_hi = cpu_to_le32((pp->cmd_tbl_dma >> 16) >> 16);
> +}
Probably should just pass 'pp' directly to ahci_fill_cmd_slot() as an
argument, rather than 'ap'.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-02-10 12:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-23 8:16 [PATCH] ahci: separate out ahci_fill_cmd_slot() Tejun Heo
2006-01-27 4:08 ` Jeff Garzik
2006-02-01 17:04 ` Tejun Heo
2006-02-10 8:25 ` Tejun Heo
2006-02-10 12:05 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).