[PATCH] pata: I do not think it means, what you think it means.

[Alan Cox]

When masking mask out the modes that are unsupported not the ones that
are supported. This makes life happier. 

Signed-off-by: Alan Cox [EMAIL PROTECTED]

diff -u --new-file --recursive --exclude-from /usr/src/exclude 
linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_hpt366.c 
linux-2.6.25-rc2-mm1/drivers/ata/pata_hpt366.c
--- linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_hpt366.c  2008-02-19 
11:01:37.0 +
+++ linux-2.6.25-rc2-mm1/drivers/ata/pata_hpt366.c  2008-02-26 
12:47:49.0 +
@@ -27,7 +27,7 @@
 #include linux/libata.h
 
 #define DRV_NAME   pata_hpt366
-#define DRV_VERSION0.6.1
+#define DRV_VERSION0.6.2
 
 struct hpt_clock {
u8  xfer_speed;
@@ -180,9 +180,9 @@
if (hpt_dma_blacklisted(adev, UDMA,  bad_ata33))
mask = ~ATA_MASK_UDMA;
if (hpt_dma_blacklisted(adev, UDMA3, bad_ata66_3))
-   mask = ~(0x07  ATA_SHIFT_UDMA);
+   mask = ~(0xF8  ATA_SHIFT_UDMA);
if (hpt_dma_blacklisted(adev, UDMA4, bad_ata66_4))
-   mask = ~(0x0F  ATA_SHIFT_UDMA);
+   mask = ~(0xF0  ATA_SHIFT_UDMA);
}
return ata_pci_default_filter(adev, mask);
 }
diff -u --new-file --recursive --exclude-from /usr/src/exclude 
linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_hpt37x.c 
linux-2.6.25-rc2-mm1/drivers/ata/pata_hpt37x.c
--- linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_hpt37x.c  2008-02-19 
11:03:00.0 +
+++ linux-2.6.25-rc2-mm1/drivers/ata/pata_hpt37x.c  2008-02-26 
11:09:11.0 +
@@ -24,7 +24,7 @@
 #include linux/libata.h
 
 #define DRV_NAME   pata_hpt37x
-#define DRV_VERSION0.6.9
+#define DRV_VERSION0.6.11
 
 struct hpt_clock {
u8  xfer_speed;
@@ -281,7 +281,7 @@
if (hpt_dma_blacklisted(adev, UDMA, bad_ata33))
mask = ~ATA_MASK_UDMA;
if (hpt_dma_blacklisted(adev, UDMA100, bad_ata100_5))
-   mask = ~(0x1F  ATA_SHIFT_UDMA);
+   mask = ~(0xE0  ATA_SHIFT_UDMA);
}
return ata_pci_default_filter(adev, mask);
 }
@@ -297,7 +297,7 @@
 {
if (adev-class == ATA_DEV_ATA) {
if (hpt_dma_blacklisted(adev, UDMA100, bad_ata100_5))
-   mask = ~ (0x1F  ATA_SHIFT_UDMA);
+   mask = ~ (0xE0  ATA_SHIFT_UDMA);
}
return ata_pci_default_filter(adev, mask);
 }
diff -u --new-file --recursive --exclude-from /usr/src/exclude 
linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_serverworks.c 
linux-2.6.25-rc2-mm1/drivers/ata/pata_serverworks.c
--- linux.vanilla-2.6.25-rc2-mm1/drivers/ata/pata_serverworks.c 2008-02-19 
11:03:00.0 +
+++ linux-2.6.25-rc2-mm1/drivers/ata/pata_serverworks.c 2008-02-26 
12:48:49.0 +
@@ -226,7 +226,7 @@
 
for (i = 0; (p = csb_bad_ata100[i]) != NULL; i++) {
if (!strcmp(p, model_num))
-   mask = ~(0x1F  ATA_SHIFT_UDMA);
+   mask = ~(0xE0  ATA_SHIFT_UDMA);
}
return ata_pci_default_filter(adev, mask);
 }
-
To unsubscribe from this list: send the line unsubscribe linux-ide in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] pata: I do not think it means, what you think it means.

[Andrew Morton]

On Tue, 26 Feb 2008 16:05:08 + Alan Cox [EMAIL PROTECTED] wrote:

 When masking mask out the modes that are unsupported not the ones that
 are supported. This makes life happier. 

do we want a happier life in 2.6.24.x too?
-
To unsubscribe from this list: send the line unsubscribe linux-ide in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html