lkml.org 
[lkml]   [2008]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 42/76] pata_hpt*, pata_serverworks: fix UDMA masking
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Alan Cox <alan@lxorguk.ukuu.org.uk>

    [upstream commit: 6ddd6861]

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

    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/ata/pata_hpt366.c | 6 +++---
    drivers/ata/pata_hpt37x.c | 6 +++---
    drivers/ata/pata_serverworks.c | 2 +-
    3 files changed, 7 insertions(+), 7 deletions(-)

    --- a/drivers/ata/pata_hpt366.c
    +++ b/drivers/ata/pata_hpt366.c
    @@ -27,7 +27,7 @@
    #include <linux/libata.h>

    #define DRV_NAME "pata_hpt366"
    -#define DRV_VERSION "0.6.1"
    +#define DRV_VERSION "0.6.2"

    struct hpt_clock {
    u8 xfer_speed;
    @@ -180,9 +180,9 @@ static unsigned long hpt366_filter(struc
    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);
    }
    --- a/drivers/ata/pata_hpt37x.c
    +++ b/drivers/ata/pata_hpt37x.c
    @@ -24,7 +24,7 @@
    #include <linux/libata.h>

    #define DRV_NAME "pata_hpt37x"
    -#define DRV_VERSION "0.6.9"
    +#define DRV_VERSION "0.6.11"

    struct hpt_clock {
    u8 xfer_speed;
    @@ -281,7 +281,7 @@ static unsigned long hpt370_filter(struc
    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 @@ static unsigned long hpt370a_filter(stru
    {
    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);
    }
    --- a/drivers/ata/pata_serverworks.c
    +++ b/drivers/ata/pata_serverworks.c
    @@ -226,7 +226,7 @@ static unsigned long serverworks_csb_fil

    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);
    }
    --


    \
     
     \ /
      Last update: 2008-03-21 23:57    [W:2.778 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site