* [PATCH] ata_piix: convert pata to new reset mechanism
@ 2006-02-12 6:06 Tejun Heo
2006-02-12 6:08 ` [PATCH] ata_piix: convert sata " Tejun Heo
2006-02-12 18:59 ` [PATCH] ata_piix: convert pata " Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Tejun Heo @ 2006-02-12 6:06 UTC (permalink / raw)
To: Jeff Garzik, linux-ide
[PATCH] ata_piix: convert pata to new reset mechanism
Convert ata_piix pata ->phy_reset to new reset mechanism.
Signed-off-by: Tejun Heo <htejun@gmail.com>
--
Jeff, this patch assumes that all-probe_reset-to-return-UNKNOWN[1] is
applied.
[1] http://article.gmane.org/gmane.linux.ide/7967
ata_piix.c | 44 ++++++++++++++++++++++++++++----------------
1 file changed, 28 insertions(+), 16 deletions(-)
Index: work1/drivers/scsi/ata_piix.c
===================================================================
--- work1.orig/drivers/scsi/ata_piix.c 2006-02-12 14:26:03.000000000 +0900
+++ work1/drivers/scsi/ata_piix.c 2006-02-12 14:35:06.000000000 +0900
@@ -131,7 +131,7 @@ enum {
static int piix_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent);
-static void piix_pata_phy_reset(struct ata_port *ap);
+static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);
static void piix_sata_phy_reset(struct ata_port *ap);
static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
@@ -208,7 +208,7 @@ static const struct ata_port_operations
.exec_command = ata_exec_command,
.dev_select = ata_std_dev_select,
- .phy_reset = piix_pata_phy_reset,
+ .probe_reset = piix_pata_probe_reset,
.bmdma_setup = ata_bmdma_setup,
.bmdma_start = ata_bmdma_start,
@@ -259,8 +259,7 @@ static struct ata_port_info piix_port_in
/* ich5_pata */
{
.sht = &piix_sht,
- .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
- PIIX_FLAG_CHECKINTR,
+ .host_flags = ATA_FLAG_SLAVE_POSS | PIIX_FLAG_CHECKINTR,
.pio_mask = 0x1f, /* pio0-4 */
#if 0
.mwdma_mask = 0x06, /* mwdma1-2 */
@@ -285,7 +284,7 @@ static struct ata_port_info piix_port_in
/* piix4_pata */
{
.sht = &piix_sht,
- .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
+ .host_flags = ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f, /* pio0-4 */
#if 0
.mwdma_mask = 0x06, /* mwdma1-2 */
@@ -367,30 +366,43 @@ cbl40:
}
/**
- * piix_pata_phy_reset - Probe specified port on PATA host controller
- * @ap: Port to probe
+ * piix_pata_postreset - Postreset stuff on PATA host controller
+ * @ap: Target port
+ * @classes: Classes of attached devices
*
- * Probe PATA phy.
+ * Postreset processing including cable detection.
*
* LOCKING:
* None (inherited from caller).
*/
+static void piix_pata_postreset(struct ata_port *ap, unsigned int *classes)
+{
+ piix_pata_cbl_detect(ap);
+ ata_std_postreset(ap, classes);
+}
-static void piix_pata_phy_reset(struct ata_port *ap)
+/**
+ * piix_pata_probe_reset - Perform reset on PATA port and classify
+ * @ap: Port to reset
+ * @classes: Resulting classes of attached devices
+ *
+ * Reset PATA phy and classify attached devices.
+ *
+ * LOCKING:
+ * None (inherited from caller).
+ */
+static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes)
{
struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->hard_port_no])) {
- ata_port_disable(ap);
printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
- return;
+ return 0;
}
- piix_pata_cbl_detect(ap);
-
- ata_port_probe(ap);
-
- ata_bus_reset(ap);
+ return ata_drive_probe_reset(ap, ata_std_probeinit,
+ ata_std_softreset, NULL,
+ piix_pata_postreset, classes);
}
/**
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ata_piix: convert sata to new reset mechanism
2006-02-12 6:06 [PATCH] ata_piix: convert pata to new reset mechanism Tejun Heo
@ 2006-02-12 6:08 ` Tejun Heo
2006-02-12 19:02 ` Jeff Garzik
2006-02-12 18:59 ` [PATCH] ata_piix: convert pata " Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Tejun Heo @ 2006-02-12 6:08 UTC (permalink / raw)
To: Jeff Garzik, linux-ide
[PATCH] ata_piix: convert sata to new reset mechanism
Convert ata_piix sata ->phy_reset to new reset mechanism.
Signed-off-by: Tejun Heo <htejun@gmail.com>
---
ata_piix.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
Index: work1/drivers/scsi/ata_piix.c
===================================================================
--- work1.orig/drivers/scsi/ata_piix.c 2006-02-12 14:35:06.000000000 +0900
+++ work1/drivers/scsi/ata_piix.c 2006-02-12 14:35:44.000000000 +0900
@@ -132,7 +132,7 @@ static int piix_init_one (struct pci_dev
const struct pci_device_id *ent);
static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);
-static void piix_sata_phy_reset(struct ata_port *ap);
+static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes);
static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
@@ -236,7 +236,7 @@ static const struct ata_port_operations
.exec_command = ata_exec_command,
.dev_select = ata_std_dev_select,
- .phy_reset = piix_sata_phy_reset,
+ .probe_reset = piix_sata_probe_reset,
.bmdma_setup = ata_bmdma_setup,
.bmdma_start = ata_bmdma_start,
@@ -273,8 +273,8 @@ static struct ata_port_info piix_port_in
/* ich5_sata */
{
.sht = &piix_sht,
- .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST |
- PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR,
+ .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED |
+ PIIX_FLAG_CHECKINTR,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
.udma_mask = 0x7f, /* udma0-6 */
@@ -298,8 +298,7 @@ static struct ata_port_info piix_port_in
/* ich6_sata */
{
.sht = &piix_sht,
- .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST |
- PIIX_FLAG_COMBINED_ICH6 |
+ .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS,
.pio_mask = 0x1f, /* pio0-4 */
.mwdma_mask = 0x07, /* mwdma0-2 */
@@ -310,8 +309,7 @@ static struct ata_port_info piix_port_in
/* ich6_sata_ahci */
{
.sht = &piix_sht,
- .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST |
- PIIX_FLAG_COMBINED_ICH6 |
+ .host_flags = ATA_FLAG_SATA | PIIX_FLAG_COMBINED_ICH6 |
PIIX_FLAG_CHECKINTR | ATA_FLAG_SLAVE_POSS |
PIIX_FLAG_AHCI,
.pio_mask = 0x1f, /* pio0-4 */
@@ -453,28 +451,25 @@ static int piix_sata_probe (struct ata_p
}
/**
- * piix_sata_phy_reset - Probe specified port on SATA host controller
- * @ap: Port to probe
+ * piix_sata_probe_reset - Perform reset on SATA port and classify
+ * @ap: Port to reset
+ * @classes: Resulting classes of attached devices
*
- * Probe SATA phy.
+ * Reset SATA phy and classify attached devices.
*
* LOCKING:
* None (inherited from caller).
*/
-
-static void piix_sata_phy_reset(struct ata_port *ap)
+static int piix_sata_probe_reset(struct ata_port *ap, unsigned int *classes)
{
if (!piix_sata_probe(ap)) {
- ata_port_disable(ap);
printk(KERN_INFO "ata%u: SATA port has no device.\n", ap->id);
- return;
+ return 0;
}
- ap->cbl = ATA_CBL_SATA;
-
- ata_port_probe(ap);
-
- ata_bus_reset(ap);
+ return ata_drive_probe_reset(ap, ata_std_probeinit,
+ ata_std_softreset, NULL,
+ ata_std_postreset, classes);
}
/**
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ata_piix: convert pata to new reset mechanism
2006-02-12 6:06 [PATCH] ata_piix: convert pata to new reset mechanism Tejun Heo
2006-02-12 6:08 ` [PATCH] ata_piix: convert sata " Tejun Heo
@ 2006-02-12 18:59 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2006-02-12 18:59 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide
Tejun Heo wrote:
> [PATCH] ata_piix: convert pata to new reset mechanism
>
> Convert ata_piix pata ->phy_reset to new reset mechanism.
>
> Signed-off-by: Tejun Heo <htejun@gmail.com>
> --
>
> Jeff, this patch assumes that all-probe_reset-to-return-UNKNOWN[1] is
> applied.
>
> [1] http://article.gmane.org/gmane.linux.ide/7967
>
>
> ata_piix.c | 44 ++++++++++++++++++++++++++++----------------
> 1 file changed, 28 insertions(+), 16 deletions(-)
>
> Index: work1/drivers/scsi/ata_piix.c
> ===================================================================
> --- work1.orig/drivers/scsi/ata_piix.c 2006-02-12 14:26:03.000000000 +0900
> +++ work1/drivers/scsi/ata_piix.c 2006-02-12 14:35:06.000000000 +0900
> @@ -131,7 +131,7 @@ enum {
> static int piix_init_one (struct pci_dev *pdev,
> const struct pci_device_id *ent);
>
> -static void piix_pata_phy_reset(struct ata_port *ap);
> +static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes);
> static void piix_sata_phy_reset(struct ata_port *ap);
> static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev);
> static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev);
> @@ -208,7 +208,7 @@ static const struct ata_port_operations
> .exec_command = ata_exec_command,
> .dev_select = ata_std_dev_select,
>
> - .phy_reset = piix_pata_phy_reset,
> + .probe_reset = piix_pata_probe_reset,
>
> .bmdma_setup = ata_bmdma_setup,
> .bmdma_start = ata_bmdma_start,
> @@ -259,8 +259,7 @@ static struct ata_port_info piix_port_in
> /* ich5_pata */
> {
> .sht = &piix_sht,
> - .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST |
> - PIIX_FLAG_CHECKINTR,
> + .host_flags = ATA_FLAG_SLAVE_POSS | PIIX_FLAG_CHECKINTR,
> .pio_mask = 0x1f, /* pio0-4 */
> #if 0
> .mwdma_mask = 0x06, /* mwdma1-2 */
> @@ -285,7 +284,7 @@ static struct ata_port_info piix_port_in
> /* piix4_pata */
> {
> .sht = &piix_sht,
> - .host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
> + .host_flags = ATA_FLAG_SLAVE_POSS,
> .pio_mask = 0x1f, /* pio0-4 */
> #if 0
> .mwdma_mask = 0x06, /* mwdma1-2 */
> @@ -367,30 +366,43 @@ cbl40:
> }
>
> /**
> - * piix_pata_phy_reset - Probe specified port on PATA host controller
> - * @ap: Port to probe
> + * piix_pata_postreset - Postreset stuff on PATA host controller
> + * @ap: Target port
> + * @classes: Classes of attached devices
> *
> - * Probe PATA phy.
> + * Postreset processing including cable detection.
> *
> * LOCKING:
> * None (inherited from caller).
> */
> +static void piix_pata_postreset(struct ata_port *ap, unsigned int *classes)
> +{
> + piix_pata_cbl_detect(ap);
> + ata_std_postreset(ap, classes);
> +}
>
> -static void piix_pata_phy_reset(struct ata_port *ap)
> +/**
> + * piix_pata_probe_reset - Perform reset on PATA port and classify
> + * @ap: Port to reset
> + * @classes: Resulting classes of attached devices
> + *
> + * Reset PATA phy and classify attached devices.
> + *
> + * LOCKING:
> + * None (inherited from caller).
> + */
> +static int piix_pata_probe_reset(struct ata_port *ap, unsigned int *classes)
> {
> struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);
>
> if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->hard_port_no])) {
> - ata_port_disable(ap);
> printk(KERN_INFO "ata%u: port disabled. ignoring.\n", ap->id);
> - return;
> + return 0;
> }
>
> - piix_pata_cbl_detect(ap);
> -
> - ata_port_probe(ap);
> -
> - ata_bus_reset(ap);
> + return ata_drive_probe_reset(ap, ata_std_probeinit,
> + ata_std_softreset, NULL,
> + piix_pata_postreset, classes);
NAK, changes order of operations. Cable detect moves from being one of
the very first things to one of the very last things.
Jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-02-12 19:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-12 6:06 [PATCH] ata_piix: convert pata to new reset mechanism Tejun Heo
2006-02-12 6:08 ` [PATCH] ata_piix: convert sata " Tejun Heo
2006-02-12 19:02 ` Jeff Garzik
2006-02-12 18:59 ` [PATCH] ata_piix: convert pata " 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).