diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-07 13:10:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-12 09:31:05 -0800 |
| commit | dbb7f60d1d25cecb6b6fed3d7129d64cd5decdb1 (patch) | |
| tree | 6dc4af305bd02f29b80cb1bd5aef79f9aaa8453f | |
| parent | 3b944f23368ab7fa794aea4f7fd3eb8dacbf48c4 (diff) | |
| download | linux-stable-dbb7f60d1d25cecb6b6fed3d7129d64cd5decdb1.tar.gz linux-stable-dbb7f60d1d25cecb6b6fed3d7129d64cd5decdb1.tar.bz2 linux-stable-dbb7f60d1d25cecb6b6fed3d7129d64cd5decdb1.zip | |
firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
Commit c8c4707cf7ca8ff7dcc1653447e48cb3de0bf114 upstream.
According to https://bugs.launchpad.net/bugs/294391
- 3rd generation iPods need the "fix capacity" workaround after all
(apparently they crash after the last sector was accessed),
- 2nd generation iPods need the "128 kB maximum request size"
workaround.
Alas both iPod generations feature the same model ID in the config ROM,
hence we can only define a shared quirks list entry for them. Luckily
the fix capacity workaround did not show a negative effect in Jarod's
tests with 2nd gen. iPod.
A side note: Apple computers in target mode (or at least an x86 Mac
mini) don't have firmware_version and model_id, hence none of the iPod
quirks list entries is active for them.
Tested-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/firewire/fw-sbp2.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 133842664af0..716370cc1109 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c @@ -350,15 +350,17 @@ static const struct { .model = ~0, .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS, }, - /* - * There are iPods (2nd gen, 3rd gen) with model_id == 0, but - * these iPods do not feature the read_capacity bug according - * to one report. Read_capacity behaviour as well as model_id - * could change due to Apple-supplied firmware updates though. + * iPod 2nd generation: needs 128k max transfer size workaround + * iPod 3rd generation: needs fix capacity workaround */ - - /* iPod 4th generation. */ { + { + .firmware_revision = 0x0a2700, + .model = 0x000000, + .workarounds = SBP2_WORKAROUND_128K_MAX_TRANS | + SBP2_WORKAROUND_FIX_CAPACITY, + }, + /* iPod 4th generation */ { .firmware_revision = 0x0a2700, .model = 0x000021, .workarounds = SBP2_WORKAROUND_FIX_CAPACITY, |