From: Albert Lee <albertcc@tw.ibm.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, Doug Maxey <dwm@enoyolf.org>,
Mark Lord <mlord@pobox.com>, Tejun Heo <htejun@gmail.com>,
Linux IDE <linux-ide@vger.kernel.org>
Subject: [PATCH 3/7] libata: add freeze/thaw to old EH LLDDs
Date: Sat, 07 Jul 2007 15:05:11 +0800 [thread overview]
Message-ID: <468F3B27.5090202@tw.ibm.com> (raw)
In-Reply-To: <468F3949.5050800@tw.ibm.com>
The polling PIO code path is going to use freeze()/thaw(), regardless of old EH or new EH.
Add freeze()/thaw() to old EH LLDDs for the use of polling PIO.
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
---
diff -Nrup 02_sata_pdc_freeze/drivers/ata/pata_ixp4xx_cf.c 03_add_thaw_freeze/drivers/ata/pata_ixp4xx_cf.c
--- 02_sata_pdc_freeze/drivers/ata/pata_ixp4xx_cf.c 2007-07-07 09:58:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/pata_ixp4xx_cf.c 2007-07-07 10:39:43.000000000 +0800
@@ -131,6 +131,9 @@ static struct ata_port_operations ixp4xx
.data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
+
.irq_clear = ixp4xx_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
diff -Nrup 02_sata_pdc_freeze/drivers/ata/pata_scc.c 03_add_thaw_freeze/drivers/ata/pata_scc.c
--- 02_sata_pdc_freeze/drivers/ata/pata_scc.c 2007-07-07 10:38:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/pata_scc.c 2007-07-07 10:39:43.000000000 +0800
@@ -869,6 +869,18 @@ static void scc_bmdma_freeze (struct ata
}
/**
+ * scc_bmdma_thaw - Thaw BMDMA controller port
+ * @ap: port to thaw
+ *
+ * Note: Original code is ata_bmdma_thaw().
+ */
+
+static void scc_bmdma_thaw (struct ata_port *ap)
+{
+ scc_irq_on(ap);
+}
+
+/**
* scc_pata_prereset - prepare for reset
* @ap: ATA port to be reset
* @deadline: deadline jiffies for the operation
@@ -1015,6 +1027,7 @@ static const struct ata_port_operations
.qc_issue = ata_qc_issue_prot,
.freeze = scc_bmdma_freeze,
+ .thaw = scc_bmdma_thaw,
.error_handler = scc_error_handler,
.post_internal_cmd = scc_bmdma_stop,
diff -Nrup 02_sata_pdc_freeze/drivers/ata/pdc_adma.c 03_add_thaw_freeze/drivers/ata/pdc_adma.c
--- 02_sata_pdc_freeze/drivers/ata/pdc_adma.c 2007-07-07 09:58:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/pdc_adma.c 2007-07-07 10:39:43.000000000 +0800
@@ -171,6 +171,8 @@ static const struct ata_port_operations
.qc_issue = adma_qc_issue,
.eng_timeout = adma_eng_timeout,
.data_xfer = ata_data_xfer,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
.irq_clear = adma_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
diff -Nrup 02_sata_pdc_freeze/drivers/ata/sata_mv.c 03_add_thaw_freeze/drivers/ata/sata_mv.c
--- 02_sata_pdc_freeze/drivers/ata/sata_mv.c 2007-07-07 09:58:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/sata_mv.c 2007-07-07 10:39:43.000000000 +0800
@@ -453,6 +453,9 @@ static const struct ata_port_operations
.eng_timeout = mv_eng_timeout,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
+
.irq_clear = mv_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
@@ -482,6 +485,9 @@ static const struct ata_port_operations
.eng_timeout = mv_eng_timeout,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
+
.irq_clear = mv_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
@@ -511,6 +517,9 @@ static const struct ata_port_operations
.eng_timeout = mv_eng_timeout,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
+
.irq_clear = mv_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
diff -Nrup 02_sata_pdc_freeze/drivers/ata/sata_qstor.c 03_add_thaw_freeze/drivers/ata/sata_qstor.c
--- 02_sata_pdc_freeze/drivers/ata/sata_qstor.c 2007-07-07 09:58:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/sata_qstor.c 2007-07-07 10:39:43.000000000 +0800
@@ -157,6 +157,8 @@ static const struct ata_port_operations
.qc_issue = qs_qc_issue,
.data_xfer = ata_data_xfer,
.eng_timeout = qs_eng_timeout,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
.irq_clear = qs_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
diff -Nrup 02_sata_pdc_freeze/drivers/ata/sata_sx4.c 03_add_thaw_freeze/drivers/ata/sata_sx4.c
--- 02_sata_pdc_freeze/drivers/ata/sata_sx4.c 2007-07-07 09:58:55.000000000 +0800
+++ 03_add_thaw_freeze/drivers/ata/sata_sx4.c 2007-07-07 10:39:43.000000000 +0800
@@ -203,6 +203,8 @@ static const struct ata_port_operations
.qc_issue = pdc20621_qc_issue_prot,
.data_xfer = ata_data_xfer,
.eng_timeout = pdc_eng_timeout,
+ .freeze = ata_bmdma_freeze,
+ .thaw = ata_bmdma_thaw,
.irq_clear = pdc20621_irq_clear,
.irq_on = ata_irq_on,
.irq_ack = ata_irq_ack,
next prev parent reply other threads:[~2007-07-07 7:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-07 6:57 [PATCH 0/7] libata: irq_on/off restructuring (take #2) Albert Lee
2007-07-07 7:00 ` [PATCH 1/7] libata: remove irq_on from ata_bus_reset() and ata_std_postreset() Albert Lee
2007-07-12 20:12 ` Jeff Garzik
2007-07-07 7:02 ` [PATCH 2/7] sata_promise: pdc_freeze() semantic change Albert Lee
2007-10-02 15:28 ` Jeff Garzik
2007-07-07 7:05 ` Albert Lee [this message]
2007-07-07 7:09 ` [PATCH 4/7] libata: use freeze/thaw for polling PIO Albert Lee
2007-07-13 6:53 ` Tejun Heo
2007-07-07 7:12 ` [PATCH 5/7] libata: integrate freeze/thaw with irq_on/off Albert Lee
2007-07-13 6:51 ` Tejun Heo
2007-07-16 9:17 ` Albert Lee
2007-07-07 7:20 ` [PATCH 6/7] libata: remove nIEN handling from ata_tf_load() Albert Lee
2007-07-07 7:23 ` [PATCH 7/7] libata: remove ap->last_ctl Albert Lee
2007-07-13 6:58 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=468F3B27.5090202@tw.ibm.com \
--to=albertcc@tw.ibm.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=albertl@mail.com \
--cc=dwm@enoyolf.org \
--cc=htejun@gmail.com \
--cc=jeff@garzik.org \
--cc=linux-ide@vger.kernel.org \
--cc=mlord@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).