lkml.org 
[lkml]   [2008]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 21/21] ide: move PIO blacklist to ide-pio-blacklist.c
    Move PIO blacklist to ide-pio-blacklist.c.

    While at it:

    - fix comment

    - fix whitespace damage

    There should be no functional changes caused by this patch.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/Makefile | 3 -
    drivers/ide/ide-lib.c | 96 ----------------------------------------
    drivers/ide/ide-pio-blacklist.c | 94 +++++++++++++++++++++++++++++++++++++++
    include/linux/ide.h | 2
    4 files changed, 98 insertions(+), 97 deletions(-)

    Index: b/drivers/ide/Makefile
    ===================================================================
    --- a/drivers/ide/Makefile
    +++ b/drivers/ide/Makefile
    @@ -11,7 +11,8 @@

    EXTRA_CFLAGS += -Idrivers/ide

    -ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o
    +ide-core-y += ide.o ide-io.o ide-iops.o ide-lib.o ide-probe.o ide-taskfile.o \
    + ide-pio-blacklist.o

    # core IDE code
    ide-core-$(CONFIG_IDE_TIMINGS) += ide-timings.o
    Index: b/drivers/ide/ide-lib.c
    ===================================================================
    --- a/drivers/ide/ide-lib.c
    +++ b/drivers/ide/ide-lib.c
    @@ -75,102 +75,6 @@ static u8 ide_rate_filter(ide_drive_t *d
    return min(speed, mode);
    }

    -/*
    - * Shared data/functions for determining best PIO mode for an IDE drive.
    - * Most of this stuff originally lived in cmd640.c, and changes to the
    - * ide_pio_blacklist[] table should be made with EXTREME CAUTION to avoid
    - * breaking the fragile cmd640.c support.
    - */
    -
    -/*
    - * Black list. Some drives incorrectly report their maximal PIO mode,
    - * at least in respect to CMD640. Here we keep info on some known drives.
    - */
    -static struct ide_pio_info {
    - const char *name;
    - int pio;
    -} ide_pio_blacklist [] = {
    - { "Conner Peripherals 540MB - CFS540A", 3 },
    -
    - { "WDC AC2700", 3 },
    - { "WDC AC2540", 3 },
    - { "WDC AC2420", 3 },
    - { "WDC AC2340", 3 },
    - { "WDC AC2250", 0 },
    - { "WDC AC2200", 0 },
    - { "WDC AC21200", 4 },
    - { "WDC AC2120", 0 },
    - { "WDC AC2850", 3 },
    - { "WDC AC1270", 3 },
    - { "WDC AC1170", 1 },
    - { "WDC AC1210", 1 },
    - { "WDC AC280", 0 },
    - { "WDC AC31000", 3 },
    - { "WDC AC31200", 3 },
    -
    - { "Maxtor 7131 AT", 1 },
    - { "Maxtor 7171 AT", 1 },
    - { "Maxtor 7213 AT", 1 },
    - { "Maxtor 7245 AT", 1 },
    - { "Maxtor 7345 AT", 1 },
    - { "Maxtor 7546 AT", 3 },
    - { "Maxtor 7540 AV", 3 },
    -
    - { "SAMSUNG SHD-3121A", 1 },
    - { "SAMSUNG SHD-3122A", 1 },
    - { "SAMSUNG SHD-3172A", 1 },
    -
    - { "ST5660A", 3 },
    - { "ST3660A", 3 },
    - { "ST3630A", 3 },
    - { "ST3655A", 3 },
    - { "ST3391A", 3 },
    - { "ST3390A", 1 },
    - { "ST3600A", 1 },
    - { "ST3290A", 0 },
    - { "ST3144A", 0 },
    - { "ST3491A", 1 }, /* reports 3, should be 1 or 2 (depending on */
    - /* drive) according to Seagates FIND-ATA program */
    -
    - { "QUANTUM ELS127A", 0 },
    - { "QUANTUM ELS170A", 0 },
    - { "QUANTUM LPS240A", 0 },
    - { "QUANTUM LPS210A", 3 },
    - { "QUANTUM LPS270A", 3 },
    - { "QUANTUM LPS365A", 3 },
    - { "QUANTUM LPS540A", 3 },
    - { "QUANTUM LIGHTNING 540A", 3 },
    - { "QUANTUM LIGHTNING 730A", 3 },
    -
    - { "QUANTUM FIREBALL_540", 3 }, /* Older Quantum Fireballs don't work */
    - { "QUANTUM FIREBALL_640", 3 },
    - { "QUANTUM FIREBALL_1080", 3 },
    - { "QUANTUM FIREBALL_1280", 3 },
    - { NULL, 0 }
    -};
    -
    -/**
    - * ide_scan_pio_blacklist - check for a blacklisted drive
    - * @model: Drive model string
    - *
    - * This routine searches the ide_pio_blacklist for an entry
    - * matching the start/whole of the supplied model name.
    - *
    - * Returns -1 if no match found.
    - * Otherwise returns the recommended PIO mode from ide_pio_blacklist[].
    - */
    -
    -static int ide_scan_pio_blacklist (char *model)
    -{
    - struct ide_pio_info *p;
    -
    - for (p = ide_pio_blacklist; p->name != NULL; p++) {
    - if (strncmp(p->name, model, strlen(p->name)) == 0)
    - return p->pio;
    - }
    - return -1;
    -}
    -
    /**
    * ide_get_best_pio_mode - get PIO mode from drive
    * @drive: drive to consider
    Index: b/drivers/ide/ide-pio-blacklist.c
    ===================================================================
    --- /dev/null
    +++ b/drivers/ide/ide-pio-blacklist.c
    @@ -0,0 +1,94 @@
    +/*
    + * PIO blacklist. Some drives incorrectly report their maximal PIO mode,
    + * at least in respect to CMD640. Here we keep info on some known drives.
    + *
    + * Changes to the ide_pio_blacklist[] should be made with EXTREME CAUTION
    + * to avoid breaking the fragile cmd640.c support.
    + */
    +
    +#include <linux/string.h>
    +
    +static struct ide_pio_info {
    + const char *name;
    + int pio;
    +} ide_pio_blacklist [] = {
    + { "Conner Peripherals 540MB - CFS540A", 3 },
    +
    + { "WDC AC2700", 3 },
    + { "WDC AC2540", 3 },
    + { "WDC AC2420", 3 },
    + { "WDC AC2340", 3 },
    + { "WDC AC2250", 0 },
    + { "WDC AC2200", 0 },
    + { "WDC AC21200", 4 },
    + { "WDC AC2120", 0 },
    + { "WDC AC2850", 3 },
    + { "WDC AC1270", 3 },
    + { "WDC AC1170", 1 },
    + { "WDC AC1210", 1 },
    + { "WDC AC280", 0 },
    + { "WDC AC31000", 3 },
    + { "WDC AC31200", 3 },
    +
    + { "Maxtor 7131 AT", 1 },
    + { "Maxtor 7171 AT", 1 },
    + { "Maxtor 7213 AT", 1 },
    + { "Maxtor 7245 AT", 1 },
    + { "Maxtor 7345 AT", 1 },
    + { "Maxtor 7546 AT", 3 },
    + { "Maxtor 7540 AV", 3 },
    +
    + { "SAMSUNG SHD-3121A", 1 },
    + { "SAMSUNG SHD-3122A", 1 },
    + { "SAMSUNG SHD-3172A", 1 },
    +
    + { "ST5660A", 3 },
    + { "ST3660A", 3 },
    + { "ST3630A", 3 },
    + { "ST3655A", 3 },
    + { "ST3391A", 3 },
    + { "ST3390A", 1 },
    + { "ST3600A", 1 },
    + { "ST3290A", 0 },
    + { "ST3144A", 0 },
    + { "ST3491A", 1 }, /* reports 3, should be 1 or 2 (depending on drive)
    + according to Seagate's FIND-ATA program */
    +
    + { "QUANTUM ELS127A", 0 },
    + { "QUANTUM ELS170A", 0 },
    + { "QUANTUM LPS240A", 0 },
    + { "QUANTUM LPS210A", 3 },
    + { "QUANTUM LPS270A", 3 },
    + { "QUANTUM LPS365A", 3 },
    + { "QUANTUM LPS540A", 3 },
    + { "QUANTUM LIGHTNING 540A", 3 },
    + { "QUANTUM LIGHTNING 730A", 3 },
    +
    + { "QUANTUM FIREBALL_540", 3 }, /* Older Quantum Fireballs don't work */
    + { "QUANTUM FIREBALL_640", 3 },
    + { "QUANTUM FIREBALL_1080", 3 },
    + { "QUANTUM FIREBALL_1280", 3 },
    + { NULL, 0 }
    +};
    +
    +/**
    + * ide_scan_pio_blacklist - check for a blacklisted drive
    + * @model: Drive model string
    + *
    + * This routine searches the ide_pio_blacklist for an entry
    + * matching the start/whole of the supplied model name.
    + *
    + * Returns -1 if no match found.
    + * Otherwise returns the recommended PIO mode from ide_pio_blacklist[].
    + */
    +
    +int ide_scan_pio_blacklist(char *model)
    +{
    + struct ide_pio_info *p;
    +
    + for (p = ide_pio_blacklist; p->name != NULL; p++) {
    + if (strncmp(p->name, model, strlen(p->name)) == 0)
    + return p->pio;
    + }
    + return -1;
    +}
    Index: b/include/linux/ide.h
    ===================================================================
    --- a/include/linux/ide.h
    +++ b/include/linux/ide.h
    @@ -1290,6 +1290,8 @@ void ide_timing_merge(struct ide_timing
    struct ide_timing *, unsigned int);
    int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);

    +int ide_scan_pio_blacklist(char *);
    +
    u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);

    int ide_set_pio_mode(ide_drive_t *, u8);

    \
     
     \ /
      Last update: 2008-05-28 23:53    [W:0.029 / U:76.088 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site