lkml.org 
[lkml]   [2006]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 3/4 resend] sbp2: add ability to override hardwired blacklist
    In case the blacklist with workarounds for device bugs yields a false
    positive, the module load parameter can now also be used as an override
    instead of an addition to the blacklist.

    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    ---
    First posted on 2006-04-14.
    This patch is already in -mm.

    Index: linux-2.6.17-rc4/drivers/ieee1394/sbp2.h
    ===================================================================
    --- linux-2.6.17-rc4.orig/drivers/ieee1394/sbp2.h 2006-05-15 21:51:13.000000000 +0200
    +++ linux-2.6.17-rc4/drivers/ieee1394/sbp2.h 2006-05-15 21:52:18.000000000 +0200
    @@ -239,6 +239,7 @@ struct sbp2_status_block {
    #define SBP2_WORKAROUND_INQUIRY_36 0x2
    #define SBP2_WORKAROUND_MODE_SENSE_8 0x4
    #define SBP2_WORKAROUND_FIX_CAPACITY 0x8
    +#define SBP2_WORKAROUND_OVERRIDE 0x100

    /* This is the two dma types we use for cmd_dma below */
    enum cmd_dma_types {
    Index: linux-2.6.17-rc4/drivers/ieee1394/sbp2.c
    ===================================================================
    --- linux-2.6.17-rc4.orig/drivers/ieee1394/sbp2.c 2006-05-15 21:51:13.000000000 +0200
    +++ linux-2.6.17-rc4/drivers/ieee1394/sbp2.c 2006-05-15 21:52:18.000000000 +0200
    @@ -156,6 +156,11 @@ MODULE_PARM_DESC(exclusive_login, "Exclu
    * Tell sd_mod to correct the last sector number reported by read_capacity.
    * Avoids access beyond actual disk limits on devices with an off-by-one bug.
    * Don't use this with devices which don't have this bug.
    + *
    + * - override internal blacklist
    + * Instead of adding to the built-in blacklist, use only the workarounds
    + * specified in the module load parameter.
    + * Useful if a blacklist entry interfered with a non-broken device.
    */
    static int sbp2_default_workarounds;
    module_param_named(workarounds, sbp2_default_workarounds, int, 0644);
    @@ -164,6 +169,7 @@ MODULE_PARM_DESC(workarounds, "Work arou
    ", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36)
    ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8)
    ", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY)
    + ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
    ", or a combination)");

    /* legacy parameter */
    @@ -1587,17 +1593,18 @@ static void sbp2_parse_unit_directory(st
    workarounds |= SBP2_WORKAROUND_INQUIRY_36;
    }

    - for (i = 0; i < ARRAY_SIZE(sbp2_workarounds_table); i++) {
    - if (sbp2_workarounds_table[i].firmware_revision &&
    - sbp2_workarounds_table[i].firmware_revision !=
    - (firmware_revision & 0xffff00))
    - continue;
    - if (sbp2_workarounds_table[i].model_id &&
    - sbp2_workarounds_table[i].model_id != ud->model_id)
    - continue;
    - workarounds |= sbp2_workarounds_table[i].workarounds;
    - break;
    - }
    + if (!(workarounds & SBP2_WORKAROUND_OVERRIDE))
    + for (i = 0; i < ARRAY_SIZE(sbp2_workarounds_table); i++) {
    + if (sbp2_workarounds_table[i].firmware_revision &&
    + sbp2_workarounds_table[i].firmware_revision !=
    + (firmware_revision & 0xffff00))
    + continue;
    + if (sbp2_workarounds_table[i].model_id &&
    + sbp2_workarounds_table[i].model_id != ud->model_id)
    + continue;
    + workarounds |= sbp2_workarounds_table[i].workarounds;
    + break;
    + }

    if (workarounds)
    SBP2_INFO("Workarounds for node " NODE_BUS_FMT ": 0x%x "

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-05-15 22:13    [W:0.022 / U:33.616 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site