Make ide_rate_filter() also respect PIO/SWDMA/MWDMA mode masks. While at it,
make the udma_filter() method calls take precedence over using the mode masks.
Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
---
Alas, the previous version of the patch wasn't even worth signing it off --
the code had to be much trickier. The patch against the current Linus' tree and
unfortunately I was able to only compile test it since that tree gives MODPOST
warning and dies early on bootup. I'm hoping to give it more tesring when/if
I have time... :-)
drivers/ide/ide-dma.c | 7 +++---
drivers/ide/ide-lib.c | 57 ++++++++++++++++++++++++++++++--------------------
2 files changed, 39 insertions(+), 25 deletions(-)
Index: linux-2.6/drivers/ide/ide-dma.c
===================================================================
--- linux-2.6.orig/drivers/ide/ide-dma.c
+++ linux-2.6/drivers/ide/ide-dma.c
@@ -664,10 +664,11 @@ static unsigned int ide_get_mode_mask(id
if ((id->field_valid & 4) == 0)
break;
- mask = id->dma_ultra & hwif->ultra_mask;
-
if (hwif->udma_filter)
- mask &= hwif->udma_filter(drive);
+ mask = hwif->udma_filter(drive);
+ else
+ mask = hwif->ultra_mask;
+ mask &= id->dma_ultra;
if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
mask &= 0x07;
Index: linux-2.6/drivers/ide/ide-lib.c
===================================================================
--- linux-2.6.orig/drivers/ide/ide-lib.c
+++ linux-2.6/drivers/ide/ide-lib.c
@@ -75,38 +75,51 @@ EXPORT_SYMBOL(ide_xfer_verbose);
*
* Given the available transfer modes this function returns
* the best available speed at or below the speed requested.
- *
- * FIXME: filter also PIO/SWDMA/MWDMA modes
*/
u8 ide_rate_filter(ide_drive_t *drive, u8 speed)
{
-#ifdef CONFIG_BLK_DEV_IDEDMA
ide_hwif_t *hwif = drive->hwif;
- u8 mask = hwif->ultra_mask, mode = XFER_MW_DMA_2;
+ u8 mask, base = speed & 0xf8, bit = 1 << (speed & 0x07);
- if (hwif->udma_filter)
- mask = hwif->udma_filter(drive);
+ switch (base) {
+#ifdef CONFIG_BLK_DEV_IDEDMA
+ case XFER_UDMA_0:
+ mask = hwif->udma_filter ? hwif->udma_filter(drive) :
+ hwif->ultra_mask;
- /*
- * TODO: speed > XFER_UDMA_2 extra check is needed to avoid false
- * cable warning from eighty_ninty_three(), moving ide_rate_filter()
- * calls from ->speedproc to core code will make this hack go away
- */
- if (speed > XFER_UDMA_2) {
- if ((mask & 0x78) && (eighty_ninty_three(drive) == 0))
+ /*
+ * TODO: if speed > XFER_UDMA_2, an extra check is needed to
+ * avoid a false cable warning from eighty_ninty_three() --
+ * moving ide_rate_filter() calls from ->speedproc to core
+ * code will make this hack go away...
+ */
+ if (speed > XFER_UDMA_2 && (mask & 0x78) &&
+ eighty_ninty_three(drive) == 0)
mask &= 0x07;
- }
-
- if (mask)
- mode = fls(mask) - 1 + XFER_UDMA_0;
-// printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);
-
- return min(speed, mode);
-#else /* !CONFIG_BLK_DEV_IDEDMA */
- return min(speed, (u8)XFER_PIO_4);
+ if (mask & bit)
+ break;
+ base = XFER_MW_DMA_0;
+ /* Fall thru */
+ case XFER_MW_DMA_0:
+ if (hwif->mwdma_mask & bit)
+ break;
+ base = XFER_SW_DMA_0;
+ /* Fall thru */
+ case XFER_SW_DMA_0:
+ if (hwif->swdma_mask & bit)
+ break;
+ base = XFER_PIO_0;
+ /* Fall thru */
#endif /* CONFIG_BLK_DEV_IDEDMA */
+ case XFER_PIO_0:
+ if (hwif->pio_mask & bit)
+ break;
+ default:
+ BUG();
+ }
+ return base | bit;
}
EXPORT_SYMBOL(ide_rate_filter);
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
