ata: pata_parport: fix EXP Computer CD-865 with MC-1285B EPP cable
v4 cover ata: pata_parport: fix EXP Computer CD-865 with MC-1285B EPP cable
Two bugfixes, one workaround and IDE command set registers support for fit3 driver. All needed for EXP Computer CD-865 drive with MC-1285B EPP cable to work.
---
Changes in v4:
- coding style fixes in patch 3
drivers/ata/pata_parport/fit3.c | 14 +----- drivers/ata/pata_parport/pata_parport.c | 78 ++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 14 deletions(-)
--
Ondrej Zary
PATCH v4 1/4 ata: pata_parport: fix pata_parport_devchk
There's a 'x' missing in 0x55 in pata_parport_devchk(), causing the detection to always fail. Fix it.
--- drivers/ata/pata_parport/pata_parport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/pata_parport/pata_parport.c +1 -1
@@ -64,7 +64,7 @@ static bool pata_parport_devchk(struct ata_port *ap, unsigned int device) pi->proto->write_regr (pi,0 ,ATA_REG_NSECT ,0xaa ); pi->proto->write_regr (pi,0 ,ATA_REG_LBAL ,0x55 ); - pi->proto->write_regr (pi,0 ,ATA_REG_NSECT ,055 ); + pi->proto->write_regr (pi,0 ,ATA_REG_NSECT ,0x55 ); pi->proto->write_regr (pi,0 ,ATA_REG_LBAL ,0xaa ); nsect = pi->proto->read_regr (pi,0 ,ATA_REG_NSECT );
Signature · 1 line
Ondrej Zary
PATCH v4 2/4 ata: pata_parport: implement set_devctl
In reply to Ondrej ZaryAdd missing ops->sff_set_devctl implementation.
--- drivers/ata/pata_parport/pata_parport.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/ata/pata_parport/pata_parport.c +8 -0
@@ -51,6 +51,13 @@ static void pata_parport_dev_select(struct ata_port *ap, unsigned int device)ata_sff_pause (ap); } +static void pata_parport_set_devctl (struct ata_port *ap,u8 ctl) +{ +struct pi_adapter *pi = ap->host->private_data; + + pi->proto->write_regr (pi,1 ,6 , ctl); +} +static bool pata_parport_devchk (struct ata_port *ap,unsigned int device) {struct pi_adapter *pi = ap->host->private_data;
@@ -252,6 +259,7 @@ static struct ata_port_operations pata_parport_port_ops = { .hardreset = NULL, .sff_dev_select = pata_parport_dev_select, + .sff_set_devctl = pata_parport_set_devctl, .sff_check_status = pata_parport_check_status, .sff_check_altstatus = pata_parport_check_altstatus, .sff_tf_load = pata_parport_tf_load,
Signature · 1 line
Ondrej Zary
PATCH v4 3/4 ata: pata_parport: add custom version of wait_after_reset
In reply to Ondrej ZarySome parallel adapters (e.g. EXP Computer MC-1285B EPP Cable) return bogus values when there's no master device present. This can cause reset to fail, preventing the lone slave device (such as EXP Computer CD-865) from working.
Add custom version of wait_after_reset that ignores master failure when a slave device is present. The custom version is also needed because the generic ata_sff_wait_after_reset uses direct port I/O for slave device detection.
--- drivers/ata/pata_parport/pata_parport.c | 68 ++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-)
drivers/ata/pata_parport/pata_parport.c +67 -1
@@ -80,6 +80,72 @@ static bool pata_parport_devchk(struct ata_port *ap, unsigned int device)return (nsect ==0x55 ) && (lbal ==0xaa ); } +static int pata_parport_wait_after_reset (struct ata_link *link, +unsigned int devmask, +unsigned long deadline) +{ +struct ata_port *ap = link->ap; +struct pi_adapter *pi = ap->host->private_data; +unsigned int dev0 = devmask & (1 <<0 ); +unsigned int dev1 = devmask & (1 <<1 ); +int rc, ret =0 ; + +ata_msleep (ap,ATA_WAIT_AFTER_RESET ); + +/* always check readiness of the master device */ + rc =ata_sff_wait_ready (link, deadline); +if (rc) { +/* +* some adapters return bogus values if master device is not +* present, so don't abort now if a slave device is present +*/ +if (!dev1) +return rc; + ret = -ENODEV ; + } + +/* +* if device 1 was found in ata_devchk, wait for register +* access briefly, then wait for BSY to clear. +*/ +if (dev1) { +int i; + +pata_parport_dev_select (ap,1 ); + +/* +* Wait for register access. Some ATAPI devices fail +* to set nsect/lbal after reset, so don't waste too +* much time on it. We're gonna wait for !BSY anyway. +*/ +for (i =0 ; i <2 ; i++) { +u8 nsect, lbal; + + nsect = pi->proto->read_regr (pi,0 ,ATA_REG_NSECT ); + lbal = pi->proto->read_regr (pi,0 ,ATA_REG_LBAL ); +if (nsect ==1 && lbal ==1 ) +break ; +/* give drive a breather */ +ata_msleep (ap,50 ); + } + + rc =ata_sff_wait_ready (link, deadline); +if (rc) { +if (rc != -ENODEV ) +return rc; + ret = rc; + } + } + +pata_parport_dev_select (ap,0 ); +if (dev1) +pata_parport_dev_select (ap,1 ); +if (dev0) +pata_parport_dev_select (ap,0 ); + +return ret; +} +static int pata_parport_bus_softreset (struct ata_port *ap,unsigned int devmask,unsigned long deadline) {
@@ -94,7 +160,7 @@ static int pata_parport_bus_softreset(struct ata_port *ap, unsigned int devmask, ap->last_ctl = ap->ctl;/* wait the port to become ready */ -return ata_sff_wait_after_reset (&ap->link, devmask, deadline); +return pata_parport_wait_after_reset (&ap->link, devmask, deadline); } static int pata_parport_softreset(struct ata_link *link, unsigned int *classes,
Signature · 1 line
Ondrej Zary
PATCH v4 4/4 ata: pata_parport: fit3: implement IDE command set registers
In reply to Ondrej Zaryfit3 protocol driver does not support accessing IDE control registers (device control/altstatus). The DOS driver does not use these registers either (as observed from DOSEMU trace). But the HW seems to be capable of accessing these registers - I simply tried bit 3 and it works!
The control register is required to properly reset ATAPI devices or they will be detected only once (after a power cycle).
Tested with EXP Computer CD-865 with MC-1285B EPP cable and TransDisk 3000.
--- drivers/ata/pata_parport/fit3.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/ata/pata_parport/fit3.c +2 -12
@@ -9,11 +9,6 @@* * The TD-2000 and certain older devices use a different protocol. * Try the fit2 protocol module with them. -* -* NB: The FIT adapters do not appear to support the control -* registers. So, we map ALT_STATUS to STATUS and NO-OP writes -* to the device control register - this means that IDE reset -* will not work on these devices. */ #include <linux/module.h>
@@ -37,8 +32,7 @@static void fit3_write_regr (struct pi_adapter *pi,int cont,int regr,int val) { -if (cont ==1 ) -return ; + regr += cont <<3 ;switch (pi->mode) {case 0 :
@@ -59,11 +53,7 @@ static int fit3_read_regr(struct pi_adapter *pi, int cont, int regr) {int a, b; -if (cont) { -if (regr !=6 ) -return 0xff ; - regr =7 ; - } + regr += cont <<3 ;switch (pi->mode) {case 0 :
Signature · 1 line
Ondrej Zary
Quoted 5 lines · Ondrej Zary
Two bugfixes, one workaround and IDE command set registers support for fit3 driver. All needed for EXP Computer CD-865 drive with MC-1285B EPP cable to work.
Quoted 8 lines
Signed-off-by Ondrej Zary <[email protected]>---
Changes in v4:
- coding style fixes in patch 3drivers/ata/pata_parport/fit3.c | 14 +----- drivers/ata/pata_parport/pata_parport.c | 78 ++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 14 deletions(-)
Applied to for-6.6-fixes. Thanks !
Signature · 2 lines
Damien Le Moal Western Digital Research