The patch titled
ieee1394: sbp2: workaround for write protect bit of Initio firmware
has been added to the -mm tree. Its filename is
ieee1394-sbp2-workaround-for-write-protect-bit-of.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ieee1394: sbp2: workaround for write protect bit of Initio firmware
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Yet another mode pages related bug of Initio firmwares was seen. INIC-1530
with a firmware by Initio responded with garbage to MODE SENSE (10). Some
HDDs were therefore incorrectly marked as write protected:
http://bugzilla.kernel.org/show_bug.cgi?id=6947
Sbp2 now tells scsi_lib to use MODE SENSE (6) for the one known defective
model. The workaround could be expanded to other or perhaps even all model
IDs of Initio firmwares if necessary. At least it worked OK with an INIC-2430
with different model ID and without the MS(10) bug.
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/sbp2.c | 18 +++++++++++++++---
drivers/ieee1394/sbp2.h | 3 ++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff -puN drivers/ieee1394/sbp2.c~ieee1394-sbp2-workaround-for-write-protect-bit-of drivers/ieee1394/sbp2.c
--- a/drivers/ieee1394/sbp2.c~ieee1394-sbp2-workaround-for-write-protect-bit-of
+++ a/drivers/ieee1394/sbp2.c
@@ -168,8 +168,9 @@ module_param_named(workarounds, sbp2_def
MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0"
", 128kB max transfer = " __stringify(SBP2_WORKAROUND_128K_MAX_TRANS)
", 36 byte inquiry = " __stringify(SBP2_WORKAROUND_INQUIRY_36)
- ", skip mode page 8 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_8)
+ ", skip mode page 08 = " __stringify(SBP2_WORKAROUND_SKIP_PAGE_08)
", fix capacity = " __stringify(SBP2_WORKAROUND_FIX_CAPACITY)
+ ", use mode sense 6 = " __stringify(SBP2_WORKAROUND_MODE_SENSE_6)
", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE)
", or a combination)");
@@ -301,6 +302,10 @@ static struct hpsb_protocol_driver sbp2_
* The firmware_revision field, masked with 0xffff00, is the best indicator
* for the type of bridge chip of a device. It yields a few false positives
* but this did not break correctly behaving devices so far.
+ *
+ * The order of table entries is from special to general, like for example
+ * the Initio entries. This order is necessary because once an entry matches,
+ * the rest of the table is skipped.
*/
static const struct {
u32 firmware_revision;
@@ -311,7 +316,12 @@ static const struct {
.firmware_revision = 0x002800,
.model_id = 0x001010,
.workarounds = SBP2_WORKAROUND_INQUIRY_36 |
- SBP2_WORKAROUND_MODE_SENSE_8,
+ SBP2_WORKAROUND_SKIP_PAGE_08,
+ },
+ /* Initio INIC-1530 with a firmware apparently from Initio */ {
+ .firmware_revision = 0x000200,
+ .model_id = 0x000540,
+ .workarounds = SBP2_WORKAROUND_MODE_SENSE_6,
},
/* Initio bridges, actually only needed for some older ones */ {
.firmware_revision = 0x000200,
@@ -2467,10 +2477,12 @@ static int sbp2scsi_slave_configure(stru
sdev->use_10_for_ms = 1;
if (sdev->type == TYPE_DISK &&
- scsi_id->workarounds & SBP2_WORKAROUND_MODE_SENSE_8)
+ scsi_id->workarounds & SBP2_WORKAROUND_SKIP_PAGE_08)
sdev->skip_ms_page_8 = 1;
if (scsi_id->workarounds & SBP2_WORKAROUND_FIX_CAPACITY)
sdev->fix_capacity = 1;
+ if (scsi_id->workarounds & SBP2_WORKAROUND_MODE_SENSE_6)
+ sdev->use_10_for_ms = 0;
if (scsi_id->ne->guid_vendor_id == 0x0010b9 && /* Maxtor's OUI */
(sdev->type == TYPE_DISK || sdev->type == TYPE_RBC))
sdev->allow_restart = 1;
diff -puN drivers/ieee1394/sbp2.h~ieee1394-sbp2-workaround-for-write-protect-bit-of drivers/ieee1394/sbp2.h
--- a/drivers/ieee1394/sbp2.h~ieee1394-sbp2-workaround-for-write-protect-bit-of
+++ a/drivers/ieee1394/sbp2.h
@@ -239,8 +239,9 @@ struct sbp2_status_block {
/* Flags for detected oddities and brokeness */
#define SBP2_WORKAROUND_128K_MAX_TRANS 0x1
#define SBP2_WORKAROUND_INQUIRY_36 0x2
-#define SBP2_WORKAROUND_MODE_SENSE_8 0x4
+#define SBP2_WORKAROUND_SKIP_PAGE_08 0x4
#define SBP2_WORKAROUND_FIX_CAPACITY 0x8
+#define SBP2_WORKAROUND_MODE_SENSE_6 0x10
#define SBP2_WORKAROUND_OVERRIDE 0x100
/* This is the two dma types we use for cmd_dma below */
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
ieee1394-remove-include-asm-semaphoreh.patch
ieee1394-sbp2-safer-last_orb-and.patch
ieee1394-sbp2-discard-return-value-of.patch
ieee1394-sbp2-optimize-dma-direction-of.patch
ieee1394-sbp2-safer-initialization-of.patch
ieee1394-sbp2-more-checks-of-status.patch
ieee1394-sbp2-convert.patch
ieee1394-safer-definition-of-empty-macros.patch
ieee1394-sbp2-workaround-for-write-protect-bit-of.patch
ieee1394-sbp2-enable-auto-spin-up-for-all-sbp-2-devices.patch
initialize-ieee1394-early-when-built-in.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
