Skip to contentSkip to conversation

pata_atiixp: Simplex clear

PATCH In review Alan Cox 2 participants 3 messages Mar 26, 2008 – Mar 27, 2008 libata

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 pata_atiixp: Simplex clear

Some of the other quirks changes seem to have left some users with the simplex bits mis-set by the time the driver loads. Clear simplex mode before we probe the controller therefore

Signed-off-by Alan Cox <[email protected]>
drivers/ata/pata_atiixp.c +5 -2
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc5-mm1/drivers/ata/pata_atiixp.c linux-2.6.25-rc5-mm1/drivers/ata/pata_atiixp.c
@@ -22,7 +22,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_atiixp"
-#define DRV_VERSION "0.4.6"
+#define DRV_VERSION "0.4.7"
 
 enum {
 	ATIIXP_IDE_PIO_TIMING	= 0x40,

@@ -282,6 +282,9 @@
 		.port_ops = &atiixp_port_ops
 	};
 	const struct ata_port_info *ppi[] = { &info, NULL };
+	/* Some of the quirk reconfiguration messes up the simplex
+	   flag, so clear it again */
+	ata_pci_clear_simplex(dev);
 	return ata_pci_init_one(dev, ppi);
 }
 

@@ -318,7 +321,7 @@
 }
 
 MODULE_AUTHOR("Alan Cox");
-MODULE_DESCRIPTION("low-level driver for ATI IXP200/300/400");
+MODULE_DESCRIPTION("low-level driver for ATI IXP series");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, atiixp);
 MODULE_VERSION(DRV_VERSION);
#1 lore raw
Quoted 4 lines · On Wed, 26 Mar 2008 11:35:03 +0000 Alan Cox <[email protected]> wrote:

Some of the other quirks changes seem to have left some users with the simplex bits mis-set by the time the driver loads. Clear simplex mode before we probe the controller therefore

Changelog whine: I am unable to work out from the above whether this patch is appropriate to 2.6.24.x and/or 2.6.25. It _looks_ like this change will unbreak some people's stuff, but that's a mad guess.

Quoted 14 lines

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc5-mm1/drivers/ata/pata_atiixp.c linux-2.6.25-rc5-mm1/drivers/ata/pata_atiixp.c

drivers/ata/pata_atiixp.c +1 -1
@@ -22,7 +22,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_atiixp"
-#define DRV_VERSION "0.4.6"
+#define DRV_VERSION "0.4.7"
 
 enum {
 	ATIIXP_IDE_PIO_TIMING	= 0x40,

drivers/ata/pata_atiixp.c line 289

Quoted 8 lines
drivers/ata/pata_atiixp.c +3 -0
@@ -282,6 +282,9 @@
 		.port_ops = &atiixp_port_ops
 	};
 	const struct ata_port_info *ppi[] = { &info, NULL };
+	/* Some of the quirk reconfiguration messes up the simplex
+	   flag, so clear it again */
+	ata_pci_clear_simplex(dev);
 	return ata_pci_init_one(dev, ppi);
 }

Patch whine: I got a reject here (libata-all changes) and when fixing it I was pretty confident that the above hunk was in atiixp_init_one(), but sometimes these things go wrong. Please change your scripts to use `diff -p'. It helps.

author
#2 lore raw
Quoted 3 lines

Changelog whine: I am unable to work out from the above whether this patch is appropriate to 2.6.24.x and/or 2.6.25. It _looks_ like this change will unbreak some people's stuff, but that's a mad guess.

I don't yet know. I'm hoping it'll get some feedback to be sure.

Alan