Skip to contentSkip to conversation

pata_isapnp: Don't use invalid I/O ports

PATCH Applied Ondrej Zary 3 participants 9 messages Sep 12, 2013 – Sep 23, 2013 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pata_isapnp: Don't use invalid I/O ports

The test for 2nd I/O port validity is broken (reversed):
On devices with no control port, the driver attempts to use invalid port 0, resulting in logs full of bad_io_access errors.
On devices with control port, the driver does not use it.

---
 drivers/ata/pata_isapnp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ata/pata_isapnp.c +1 -1
index 4bceb88..b33d1f9 100644
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
 
 	ap->ioaddr.cmd_addr = cmd_addr;
 
-	if (pnp_port_valid(idev, 1) == 0) {
+	if (pnp_port_valid(idev, 1)) {
 		ctl_addr = devm_ioport_map(&idev->dev,
 					   pnp_port_start(idev, 1), 1);
 		ap->ioaddr.altstatus_addr = ctl_addr;
Signature · 1 line
Ondrej Zary
#1 lore raw
Quoted 17 lines · On Thursday 12 September 2013 23:01:29 Ondrej Zary wrote:

The test for 2nd I/O port validity is broken (reversed):
On devices with no control port, the driver attempts to use invalid port 0, resulting in logs full of bad_io_access errors.
On devices with control port, the driver does not use it.

---
 drivers/ata/pata_isapnp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ata/pata_isapnp.c +0 -0
index 4bceb88..b33d1f9 100644
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const

struct pnp_device_id *dev

drivers/ata/pata_isapnp.c static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev · line 84

Quoted 7 lines
drivers/ata/pata_isapnp.c +1 -1
 	ap->ioaddr.cmd_addr = cmd_addr;
 
-	if (pnp_port_valid(idev, 1) == 0) {
+	if (pnp_port_valid(idev, 1)) {
 		ctl_addr = devm_ioport_map(&idev->dev,
 					   pnp_port_start(idev, 1), 1);
 		ap->ioaddr.altstatus_addr = ctl_addr;

With this patch, the ATA port works fine if there is a device connected to it. However, it takes ages to boot if there are no devices connected. Looks like the driver retries IDENTIFY command for both slave and master drives in a hope that the devices are there.

log:

[    7.692344] pata_isapnp 01:01.02: [io  0x01e8-0x01ef]
[    7.692474] pata_isapnp 01:01.02: [io  0x0168-0x016f]
[    7.692644] pata_isapnp 01:01.02: [irq 10]
[    7.695012] pata_isapnp 01:01.02: activated
[    7.751153] scsi2 : pata_isapnp
[    7.751781] ata3: PATA max PIO0 cmd 0x168 ctl 0x0 irq 10
[   12.751446] ata3.01: qc timeout (cmd 0xec)
[   12.751571] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   22.752270] ata3.01: qc timeout (cmd 0xec)
[   22.752396] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   52.754737] ata3.01: qc timeout (cmd 0xec)
[   52.754861] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   57.755149] ata3.00: qc timeout (cmd 0xec)
[   57.755275] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5)
[   67.755974] ata3.00: qc timeout (cmd 0xec)
[   67.756099] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5)
Signature · 1 line
Ondrej Zary
#2 lore raw
Quoted 33 lines · On Friday 13 September 2013 20:54:37 Ondrej Zary wrote:
Quoted 17 lines · On Thursday 12 September 2013 23:01:29 Ondrej Zary wrote:

The test for 2nd I/O port validity is broken (reversed):
On devices with no control port, the driver attempts to use invalid port 0, resulting in logs full of bad_io_access errors.
On devices with control port, the driver does not use it.

---
 drivers/ata/pata_isapnp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ata/pata_isapnp.c +0 -0
index 4bceb88..b33d1f9 100644
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const

struct pnp_device_id *dev

drivers/ata/pata_isapnp.c

Quoted 7 lines
drivers/ata/pata_isapnp.c +1 -1
 	ap->ioaddr.cmd_addr = cmd_addr;
 
-	if (pnp_port_valid(idev, 1) == 0) {
+	if (pnp_port_valid(idev, 1)) {
 		ctl_addr = devm_ioport_map(&idev->dev,
 					   pnp_port_start(idev, 1), 1);
 		ap->ioaddr.altstatus_addr = ctl_addr;

With this patch, the ATA port works fine if there is a device connected to it. However, it takes ages to boot if there are no devices connected. Looks like the driver retries IDENTIFY command for both slave and master drives in a hope that the devices are there.

log:

Quoted 16 lines
[    7.692344] pata_isapnp 01:01.02: [io  0x01e8-0x01ef]
[    7.692474] pata_isapnp 01:01.02: [io  0x0168-0x016f]
[    7.692644] pata_isapnp 01:01.02: [irq 10]
[    7.695012] pata_isapnp 01:01.02: activated
[    7.751153] scsi2 : pata_isapnp
[    7.751781] ata3: PATA max PIO0 cmd 0x168 ctl 0x0 irq 10
[   12.751446] ata3.01: qc timeout (cmd 0xec)
[   12.751571] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   22.752270] ata3.01: qc timeout (cmd 0xec)
[   22.752396] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   52.754737] ata3.01: qc timeout (cmd 0xec)
[   52.754861] ata3.01: failed to IDENTIFY (I/O error, err_mask=0x5)
[   57.755149] ata3.00: qc timeout (cmd 0xec)
[   57.755275] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5)
[   67.755974] ata3.00: qc timeout (cmd 0xec)
[   67.756099] ata3.00: failed to IDENTIFY (I/O error, err_mask=0x5)

This is caused by skipping ata_sff_softreset() when ap->ioaddr.ctl_addr is unset so ata_devchk() is never called. This patch seems to fix the problem. Is it OK or can it cause more problems?

drivers/ata/libata-sff.c +9 -11
@@ -2008,13 +2008,15 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
 
 	DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
 
-	/* software reset.  causes dev0 to be selected */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	ap->last_ctl = ap->ctl;
+	if (ap->ioaddr.ctl_addr) {
+		/* software reset.  causes dev0 to be selected */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		ap->last_ctl = ap->ctl;
+	}
 
 	/* wait the port to become ready */
 	return ata_sff_wait_after_reset(&ap->link, devmask, deadline);
@@ -2215,10 +2217,6 @@ void ata_sff_error_handler(struct ata_port *ap)
 
 	spin_unlock_irqrestore(ap->lock, flags);
 
-	/* ignore ata_sff_softreset if ctl isn't accessible */
-	if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr)
-		softreset = NULL;
-
 	/* ignore built-in hardresets if SCR access is not available */
 	if ((hardreset == sata_std_hardreset ||
 	     hardreset == sata_sff_hardreset) && !sata_scr_valid(&ap->link))
Signature · 1 line
Ondrej Zary
#3 lore raw

Hello, Ondrej.

Quoted 30 lines · Ondrej Zary

This is caused by skipping ata_sff_softreset() when ap->ioaddr.ctl_addr is unset so ata_devchk() is never called. This patch seems to fix the problem. Is it OK or can it cause more problems?

drivers/ata/libata-sff.c +9 -7
@@ -2008,13 +2008,15 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask,
 
 	DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
 
-	/* software reset.  causes dev0 to be selected */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	ap->last_ctl = ap->ctl;
+	if (ap->ioaddr.ctl_addr) {
+		/* software reset.  causes dev0 to be selected */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		ap->last_ctl = ap->ctl;
+	}
 
 	/* wait the port to become ready */
 	return ata_sff_wait_after_reset(&ap->link, devmask, deadline);

drivers/ata/libata-sff.c void ata_sff_error_handler(struct ata_port *ap) · line 2222

Quoted 10 lines
drivers/ata/libata-sff.c +0 -4
@@ -2215,10 +2217,6 @@ void ata_sff_error_handler(struct ata_port *ap)
 
 	spin_unlock_irqrestore(ap->lock, flags);
 
-	/* ignore ata_sff_softreset if ctl isn't accessible */
-	if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr)
-		softreset = NULL;
-
 	/* ignore built-in hardresets if SCR access is not available */
 	if ((hardreset == sata_std_hardreset ||
 	     hardreset == sata_sff_hardreset) && !sata_scr_valid(&ap->link))

Hmm... I'm unsure what to do with these patches. It's a mostly dead driver, so I don't wanna mess with it too much unless it's an obvious fix. What hardware are you playing with?

Thanks.

Signature · 1 line
tejun
#4 lore raw
Quoted 37 lines · On Sunday 22 September 2013 18:49:42 Tejun Heo wrote:

Hello, Ondrej.

Quoted 34 lines · Ondrej Zary

This is caused by skipping ata_sff_softreset() when ap->ioaddr.ctl_addr is unset so ata_devchk() is never called. This patch seems to fix the problem. Is it OK or can it cause more problems?

drivers/ata/libata-sff.c +9 -7
@@ -2008,13 +2008,15 @@ static int ata_bus_softreset(struct ata_port *ap,
 unsigned int devmask,
 
 	DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
 
-	/* software reset.  causes dev0 to be selected */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
-	udelay(20);	/* FIXME: flush */
-	iowrite8(ap->ctl, ioaddr->ctl_addr);
-	ap->last_ctl = ap->ctl;
+	if (ap->ioaddr.ctl_addr) {
+		/* software reset.  causes dev0 to be selected */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
+		udelay(20);	/* FIXME: flush */
+		iowrite8(ap->ctl, ioaddr->ctl_addr);
+		ap->last_ctl = ap->ctl;
+	}
 
 	/* wait the port to become ready */
drivers/ata/libata-sff.c +0 -0
 	return ata_sff_wait_after_reset(&ap->link, devmask, deadline);
@@ -2215,10 +2217,6 @@ void ata_sff_error_handler(struct ata_port *ap)
 
 	spin_unlock_irqrestore(ap->lock, flags);
 
Quoted 11 lines

drivers/ata/libata-sff.c void ata_sff_error_handler(struct ata_port *ap) · line 2222

Quoted 7 lines
drivers/ata/libata-sff.c +0 -4
-	/* ignore ata_sff_softreset if ctl isn't accessible */
-	if (softreset == ata_sff_softreset && !ap->ioaddr.ctl_addr)
-		softreset = NULL;
-
 	/* ignore built-in hardresets if SCR access is not available */
 	if ((hardreset == sata_std_hardreset ||
 	     hardreset == sata_sff_hardreset) && !sata_scr_valid(&ap->link))

Hmm... I'm unsure what to do with these patches. It's a mostly dead driver, so I don't wanna mess with it too much unless it's an obvious fix. What hardware are you playing with?

IMHO, the first patch (invalid I/O ports) is an obvious fix. That bug causes problems with ES968 sound cards.

The second patch is not-so-obvious. Only few ATA controllers don't have control register, but they're all broken now. I'm not sure if the patch is 100% correct but it seems to work fine and it does not affect most controllers.

Signature · 1 line
Ondrej Zary
Applied
#5 lore raw
In reply to Ondrej Zary
Quoted 6 lines · Ondrej Zary

The test for 2nd I/O port validity is broken (reversed):
On devices with no control port, the driver attempts to use invalid port 0, resulting in logs full of bad_io_access errors.
On devices with control port, the driver does not use it.

Applied to libata/for-3.13.

Thanks.

Signature · 1 line
tejun
#6 lore raw

Hello.

Quoted 8 lines · Tejun Heo
Quoted 6 lines

The test for 2nd I/O port validity is broken (reversed):
On devices with no control port, the driver attempts to use invalid port 0, resulting in logs full of bad_io_access errors.
On devices with control port, the driver does not use it.

Applied to libata/for-3.13.

Why only 3.13? Isn't it a simple fix?

Quoted 1 line

Thanks.

WBR, Sergei

#7 lore raw
Quoted 3 lines · Sergei Shtylyov
Quoted 1 line

Applied to libata/for-3.13.

Why only 3.13? Isn't it a simple fix?

Hmmm, maybe, the driver is such low impact, I don't think it matters either way; otherwise, it should be marked -stable too. It's a driver which shouldn't be enabled by default by distros and I didn't think it'd be worthwhile to create any traffic for it. That said, if there's a reason this matters, I'd be happy to add -stable and push it through ASAP.

Thanks.

Signature · 1 line
tejun
#8 lore raw
Quoted 5 lines · On Monday 23 September 2013 15:00:42 Tejun Heo wrote:
Quoted 3 lines · Sergei Shtylyov
Quoted 1 line

Applied to libata/for-3.13.

Why only 3.13? Isn't it a simple fix?

Quoted 8 lines

Hmmm, maybe, the driver is such low impact, I don't think it matters either way; otherwise, it should be marked -stable too. It's a driver which shouldn't be enabled by default by distros and I didn't think it'd be worthwhile to create any traffic for it. That said, if there's a reason this matters, I'd be happy to add -stable and push it through ASAP.

Thanks.

At least Debian ships pata_isapnp.ko. Some distros probably stopped building the driver because it was broken.

Signature · 1 line
Ondrej Zary