* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-06-02 7:45 zhao, forrest
2006-06-02 8:15 ` Hannes Reinecke
0 siblings, 1 reply; 8+ messages in thread
From: zhao, forrest @ 2006-06-02 7:45 UTC (permalink / raw)
To: jeff, hare, axboe, htejun, jeremy, lkml; +Cc: linux-ide
Add the definition of ahci_port_suspend(), which will be used to suspend a
port.
Signed-off-by: Forrest Zhao <forrest.zhao@intel.com>
---
drivers/scsi/ahci.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
753c1cc8b4138938187e773a05255478a737bbe9
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 12eed7e..1d9c158 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -216,6 +216,7 @@ static int ahci_port_start(struct ata_po
static void ahci_port_stop(struct ata_port *ap);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
static void ahci_qc_prep(struct ata_queued_cmd *qc);
static u8 ahci_check_status(struct ata_port *ap);
@@ -434,7 +435,6 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
@@ -460,6 +460,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 4/6] The definition of ahci_port_suspend()
2006-06-02 7:45 [PATCH 4/6] The definition of ahci_port_suspend() zhao, forrest
@ 2006-06-02 8:15 ` Hannes Reinecke
2006-06-02 9:16 ` Jens Axboe
0 siblings, 1 reply; 8+ messages in thread
From: Hannes Reinecke @ 2006-06-02 8:15 UTC (permalink / raw)
To: zhao, forrest; +Cc: jeff, axboe, htejun, jeremy, lkml, linux-ide
zhao, forrest wrote:
> Add the definition of ahci_port_suspend(), which will be used to suspend a
> port.
>
>
> Signed-off-by: Forrest Zhao <forrest.zhao@intel.com>
>
Signed-off-by: Hannes Reinecke <hare@suse.de>
--
Dr. Hannes Reinecke hare@suse.de
SuSE Linux Products GmbH S390 & zSeries
Maxfeldstraße 5 +49 911 74053 688
90409 Nürnberg http://www.suse.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/6] The definition of ahci_port_suspend()
2006-06-02 8:15 ` Hannes Reinecke
@ 2006-06-02 9:16 ` Jens Axboe
0 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2006-06-02 9:16 UTC (permalink / raw)
To: Hannes Reinecke; +Cc: zhao, forrest, jeff, htejun, jeremy, lkml, linux-ide
On Fri, Jun 02 2006, Hannes Reinecke wrote:
> zhao, forrest wrote:
> > Add the definition of ahci_port_suspend(), which will be used to suspend a
> > port.
> >
> >
> > Signed-off-by: Forrest Zhao <forrest.zhao@intel.com>
> >
> Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-06-06 10:17 zhao, forrest
0 siblings, 0 replies; 8+ messages in thread
From: zhao, forrest @ 2006-06-06 10:17 UTC (permalink / raw)
To: jeff, hare, axboe, htejun, jeremy, lkml; +Cc: linux-ide
Add the definition of ahci_port_suspend(), which will be used to suspend a
port.
Signed-off-by: Forrest Zhao <forrest.zhaot@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
---
drivers/scsi/ahci.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
a702c05813a2b7ec16ae1314b54ca772e26fb2fb
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f6086d6..acf3538 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -215,6 +215,7 @@ static int ahci_port_start(struct ata_po
static void ahci_port_stop(struct ata_port *ap);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
static void ahci_qc_prep(struct ata_queued_cmd *qc);
static u8 ahci_check_status(struct ata_port *ap);
@@ -433,7 +434,6 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
@@ -459,6 +459,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-06-29 8:19 zhao, forrest
0 siblings, 0 replies; 8+ messages in thread
From: zhao, forrest @ 2006-06-29 8:19 UTC (permalink / raw)
To: jgarzik, htejun, hare, axboe; +Cc: linux-ide
Add the definition of ahci_port_suspend(), which will be used to suspend a
port.
Signed-off-by: Forrest Zhao <forrest.zhaot@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
---
drivers/scsi/ahci.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
cc19430967817d0354c92a7b1d1a1cef87cc449f
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 6edc7c8..fc2c879 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -223,6 +223,7 @@ static void ahci_error_handler(struct at
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_remove_one (struct pci_dev *pdev);
static struct scsi_host_template ahci_sht = {
@@ -459,7 +460,6 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
@@ -485,6 +485,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-07-10 3:35 zhao, forrest
0 siblings, 0 replies; 8+ messages in thread
From: zhao, forrest @ 2006-07-10 3:35 UTC (permalink / raw)
To: jgarzik, htejun, hare, axboe; +Cc: linux-ide
Add the definition of ahci_port_suspend(), which will be used to suspend
a port.
Signed-off-by: Forrest Zhao <forrest.zhaot@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
---
drivers/scsi/ahci.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
cc19430967817d0354c92a7b1d1a1cef87cc449f
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 6edc7c8..fc2c879 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -223,6 +223,7 @@ static void ahci_error_handler(struct at
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_remove_one (struct pci_dev *pdev);
static struct scsi_host_template ahci_sht = {
@@ -459,7 +460,6 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
@@ -485,6 +485,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-07-11 6:39 zhao, forrest
0 siblings, 0 replies; 8+ messages in thread
From: zhao, forrest @ 2006-07-11 6:39 UTC (permalink / raw)
To: jgarzik, htejun, hare, axboe; +Cc: linux-ide
Add the definition of ahci_port_suspend(), which will be used to suspend
a port.
Signed-off-by: Forrest Zhao <forrest.zhaot@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
---
drivers/scsi/ahci.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
cc19430967817d0354c92a7b1d1a1cef87cc449f
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 6edc7c8..fc2c879 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -223,6 +223,7 @@ static void ahci_error_handler(struct at
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_remove_one (struct pci_dev *pdev);
static struct scsi_host_template ahci_sht = {
@@ -459,7 +460,6 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
@@ -485,6 +485,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] The definition of ahci_port_suspend()
@ 2006-07-13 5:39 zhao, forrest
0 siblings, 0 replies; 8+ messages in thread
From: zhao, forrest @ 2006-07-13 5:39 UTC (permalink / raw)
To: jgarzik, htejun, hare, axboe; +Cc: linux-ide
1 Add the definition of ahci_port_suspend(), which will be used to
suspend a port.
2 Use ahci_port_suspend() in ahci_port_stop().
Signed-off-by: Forrest Zhao <forrest.zhao@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
---
drivers/scsi/ahci.c | 48 ++++++++++++++++++++++++++++++++++
+-------------
1 files changed, 35 insertions(+), 13 deletions(-)
1c970ab5651cfd20ee1ce69d54bcda1a39af9e42
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f4386c5..50d0183 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -223,6 +223,7 @@ static void ahci_error_handler(struct at
static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);
static int ahci_port_standby(void __iomem *port_mmio, u32 cap);
static int ahci_port_spinup(void __iomem *port_mmio, u32 cap);
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state);
static void ahci_remove_one (struct pci_dev *pdev);
static struct scsi_host_template ahci_sht = {
@@ -459,24 +460,12 @@ static int ahci_port_start(struct ata_po
return 0;
}
-
static void ahci_port_stop(struct ata_port *ap)
{
struct device *dev = ap->host_set->dev;
struct ahci_port_priv *pp = ap->private_data;
- void __iomem *mmio = ap->host_set->mmio_base;
- void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
- u32 tmp;
- tmp = readl(port_mmio + PORT_CMD);
- tmp &= ~(PORT_CMD_START | PORT_CMD_FIS_RX);
- writel(tmp, port_mmio + PORT_CMD);
- readl(port_mmio + PORT_CMD); /* flush */
-
- /* spec says 500 msecs for each PORT_CMD_{START,FIS_RX} bit, so
- * this is slightly incorrect.
- */
- msleep(500);
+ ahci_port_suspend(ap, PMSG_SUSPEND);
ap->private_data = NULL;
dma_free_coherent(dev, AHCI_PORT_PRIV_DMA_SZ,
@@ -485,6 +474,39 @@ static void ahci_port_stop(struct ata_po
kfree(pp);
}
+static int ahci_port_suspend(struct ata_port *ap, pm_message_t state)
+{
+ void __iomem *mmio = ap->host_set->mmio_base;
+ void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);
+ struct ahci_host_priv *hpriv = ap->host_set->private_data;
+ int rc;
+
+ /*
+ * Disable DMA
+ */
+ rc = ahci_stop_engine(port_mmio);
+ if (rc) {
+ ata_port_printk(ap, KERN_WARNING, "DMA engine busy\n");
+ return rc;
+ }
+
+ /*
+ * Disable FIS reception
+ */
+ rc = ahci_stop_fis_rx(port_mmio);
+ if (rc)
+ ata_port_printk(ap, KERN_WARNING, "FIS RX still running"
+ " (%d)\n", rc);
+
+ /*
+ * Put device into slumber mode
+ */
+ if (!rc && state.event != PM_EVENT_FREEZE)
+ ahci_port_standby(port_mmio, hpriv->cap);
+
+ return rc;
+}
+
static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
{
unsigned int sc_reg;
--
1.2.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2006-07-13 5:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-02 7:45 [PATCH 4/6] The definition of ahci_port_suspend() zhao, forrest
2006-06-02 8:15 ` Hannes Reinecke
2006-06-02 9:16 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2006-06-06 10:17 zhao, forrest
2006-06-29 8:19 zhao, forrest
2006-07-10 3:35 zhao, forrest
2006-07-11 6:39 zhao, forrest
2006-07-13 5:39 zhao, forrest
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).