The patch titled
sbp2: add ability to override hardwired blacklist
has been added to the -mm tree. Its filename is
sbp2-add-ability-to-override-hardwired-blacklist.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/sbp2.c | 29 ++++++++++++++++++-----------
drivers/ieee1394/sbp2.h | 1 +
2 files changed, 19 insertions(+), 11 deletions(-)
diff -puN drivers/ieee1394/sbp2.c~sbp2-add-ability-to-override-hardwired-blacklist drivers/ieee1394/sbp2.c
--- devel/drivers/ieee1394/sbp2.c~sbp2-add-ability-to-override-hardwired-blacklist 2006-04-14 21:53:11.000000000 -0700
+++ devel-akpm/drivers/ieee1394/sbp2.c 2006-04-14 21:53:11.000000000 -0700
@@ -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 */
@@ -1588,17 +1594,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 "
diff -puN drivers/ieee1394/sbp2.h~sbp2-add-ability-to-override-hardwired-blacklist drivers/ieee1394/sbp2.h
--- devel/drivers/ieee1394/sbp2.h~sbp2-add-ability-to-override-hardwired-blacklist 2006-04-14 21:53:11.000000000 -0700
+++ devel-akpm/drivers/ieee1394/sbp2.h 2006-04-14 21:53:11.000000000 -0700
@@ -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 {
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
ieee1394-speed-up-of-dma_region_sync_for_cpu.patch
drivers-ieee1394-ohci1394c-function-calls-without-effect.patch
sbp2-consolidate-workarounds.patch
sbp2-add-read_capacity-workaround-for-ipod.patch
sbp2-make-tsb42aa9-workaround-specific-to-momobay-cx-1.patch
sbp2-add-ability-to-override-hardwired-blacklist.patch
dlm-device-interface-check-allocation.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
