Skip to contentSkip to conversation

libata: Early CFA adapters are not required to support mode setting

PATCH Applied Alan 3 participants 5 messages Feb 5, 2007 – Feb 7, 2007 libata

lore
Share & tools
lore

Alan

author
#0 lore raw

PATCH 1/1 libata: Early CFA adapters are not required to support mode setting

If we are doing a PIO setup for a CFA card and it blows up with a device error then assume it is an older CFA card which doesn't support this rather than failing the device out of existance.

Stands seperate to the quieting patch but that is obviously useful with this change.

drivers/ata/libata-core.c +4 -0
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/ata/libata-core.c linux-2.6.20-rc6-mm3/drivers/ata/libata-core.c
@@ -2404,6 +2460,10 @@
 		dev->flags |= ATA_DFLAG_PIO;
 
 	err_mask = ata_dev_set_xfermode(dev);
+	/* Old CFA may refuse this command, which is just fine */
+	if (dev->xfer_shift == ATA_SHIFT_PIO && ata_id_is_cfa(dev->id))
+        	err_mask &= ~AC_ERR_DEV;
+
 	if (err_mask) {
 		ata_dev_printk(dev, KERN_ERR, "failed to set xfermode "
 			       "(err_mask=0x%x)\n", err_mask);
#1 lore raw
Quoted 13 lines · On Mon, 5 Feb 2007 16:28:30 +0000 Alan <[email protected]> wrote:

If we are doing a PIO setup for a CFA card and it blows up with a device error then assume it is an older CFA card which doesn't support this rather than failing the device out of existance.

Stands seperate to the quieting patch but that is obviously useful with this change.

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.20-rc6-mm3/drivers/ata/libata-core.c linux-2.6.20-rc6-mm3/drivers/ata/libata-core.c

drivers/ata/libata-core.c line 2469

Quoted 10 lines
drivers/ata/libata-core.c +4 -0
@@ -2404,6 +2460,10 @@
 		dev->flags |= ATA_DFLAG_PIO;
 
 	err_mask = ata_dev_set_xfermode(dev);
+	/* Old CFA may refuse this command, which is just fine */
+	if (dev->xfer_shift == ATA_SHIFT_PIO && ata_id_is_cfa(dev->id))
+        	err_mask &= ~AC_ERR_DEV;
+
 	if (err_mask) {
 		ata_dev_printk(dev, KERN_ERR, "failed to set xfermode "
 			       "(err_mask=0x%x)\n", err_mask);

This hunk is already in libata-fix-hopefully-all-the-remaining-problems-with.patch. Should I drop libata-fix-hopefully-all-the-remaining-problems-with.patch?

If its presence can affect the validity of testing these four patches then perhaps yes..

author
#2 lore raw
Quoted 2 lines

libata-fix-hopefully-all-the-remaining-problems-with.patch. Should I drop libata-fix-hopefully-all-the-remaining-problems-with.patch?

The hopefully fix all the remaining problems patch did say not to merge it I thought. Please don't merge it yet - Jeff has asked for some improvements and its not fixing the cases under investigation so it'll confuse stuff rather than help at the moment.

Alan

#3 lore raw
Quoted 7 lines · On Mon, 5 Feb 2007 23:11:52 +0000 Alan <[email protected]> wrote:
Quoted 2 lines

libata-fix-hopefully-all-the-remaining-problems-with.patch. Should I drop

The hopefully fix all the remaining problems patch did say not to merge it I thought. Please don't merge it yet - Jeff has asked for some improvements and its not fixing the cases under investigation so it'll confuse stuff rather than help at the moment.

I wasn't planning on sending libata-fix-hopefully-all-the-remaining-problems-with.patch upstream. My concern is that its presence might invalidate (or get confused with) testing of the earlier patches.

I'll assume it's ok...

Applied
#4 lore raw
In reply to Alan
Quoted 8 lines · Alan

If we are doing a PIO setup for a CFA card and it blows up with a device error then assume it is an older CFA card which doesn't support this rather than failing the device out of existance.

Stands seperate to the quieting patch but that is obviously useful with this change.

applied