From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org,
Greg KH <greg@kroah.com>
Cc: Justin Forbes <jmforbes@linuxtx.org>,
Zwane Mwaikambo <zwane@arm.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Randy Dunlap <rdunlap@xenotime.net>,
Dave Jones <davej@redhat.com>,
Chuck Wolber <chuckw@quantumlinux.com>,
Chris Wedgwood <reviews@ml.cw.f00f.org>,
Michael Krufky <mkrufky@linuxtv.org>,
Chuck Ebbert <cebbert@redhat.com>,
Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk,
USB Storage list <usb-storage@lists.one-eyed-alien.net>,
Alan Stern <stern@rowland.harvard.edu>
Subject: [patch 17/46] usb-storage: set CAPACITY_HEURISTICS flag for bad vendors
Date: Thu, 22 Jan 2009 17:12:02 -0800 [thread overview]
Message-ID: <20090123011202.GR19756@kroah.com> (raw)
In-Reply-To: <20090123011110.GA19756@kroah.com>
[-- Attachment #1: usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch --]
[-- Type: text/plain, Size: 8024 bytes --]
2.6.28-stable review patch. If anyone has any objections, please let us know.
------------------
From: Alan Stern <stern@rowland.harvard.edu>
commit a81a81a25d3ecdab777abca87c5ddf484056103d upstream.
This patch (as1194b) makes usb-storage set the CAPACITY_HEURISTICS flag
for all devices made by Nokia, Nikon, or Motorola. These companies
seem to include the READ CAPACITY bug in all of their devices.
Since cell phones and digital cameras rely on flash storage, which
always has an even number of sectors, setting CAPACITY_HEURISTICS
shouldn't cause any problems. Not even if the companies wise up and
start making devices without the bug.
A large number of unusual_devs entries are now unnecessary, so the
patch removes them.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/storage/scsiglue.c | 23 +++++
drivers/usb/storage/unusual_devs.h | 162 -------------------------------------
2 files changed, 23 insertions(+), 162 deletions(-)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -59,6 +59,13 @@
#include "transport.h"
#include "protocol.h"
+/* Vendor IDs for companies that seem to include the READ CAPACITY bug
+ * in all their devices
+ */
+#define VENDOR_ID_NOKIA 0x0421
+#define VENDOR_ID_NIKON 0x04b0
+#define VENDOR_ID_MOTOROLA 0x22b8
+
/***********************************************************************
* Host functions
***********************************************************************/
@@ -134,6 +141,22 @@ static int slave_configure(struct scsi_d
* settings can't be overridden via the scsi devinfo mechanism. */
if (sdev->type == TYPE_DISK) {
+ /* Some vendors seem to put the READ CAPACITY bug into
+ * all their devices -- primarily makers of cell phones
+ * and digital cameras. Since these devices always use
+ * flash media and can be expected to have an even number
+ * of sectors, we will always enable the CAPACITY_HEURISTICS
+ * flag unless told otherwise. */
+ switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) {
+ case VENDOR_ID_NOKIA:
+ case VENDOR_ID_NIKON:
+ case VENDOR_ID_MOTOROLA:
+ if (!(us->fflags & (US_FL_FIX_CAPACITY |
+ US_FL_CAPACITY_OK)))
+ us->fflags |= US_FL_CAPACITY_HEURISTICS;
+ break;
+ }
+
/* Disk-type devices use MODE SENSE(6) if the protocol
* (SubClass) is Transparent SCSI, otherwise they use
* MODE SENSE(10). */
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -167,34 +167,6 @@ UNUSUAL_DEV( 0x0421, 0x0019, 0x0592, 0x
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ),
-/* Reported by Filip Joelsson <filip@blueturtle.nu> */
-UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x0600,
- "Nokia",
- "Nokia 3110c",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Reported by Ozan Sener <themgzzy@gmail.com> */
-UNUSUAL_DEV( 0x0421, 0x0060, 0x0551, 0x0551,
- "Nokia",
- "3500c",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Reported by CSECSY Laszlo <boobaa@frugalware.org> */
-UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601,
- "Nokia",
- "Nokia 3109c",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Patch for Nokia 5310 capacity */
-UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0701,
- "Nokia",
- "5310",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
/* Reported by Mario Rettig <mariorettig@web.de> */
UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100,
"Nokia",
@@ -260,42 +232,6 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_MAX_SECTORS_64 ),
-/* Reported by Cedric Godin <cedric@belbone.be> */
-UNUSUAL_DEV( 0x0421, 0x04b9, 0x0500, 0x0551,
- "Nokia",
- "5300",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Reported by Paulo Fessel <pfessel@gmail.com> */
-UNUSUAL_DEV( 0x0421, 0x04bd, 0x0000, 0x9999,
- "Nokia",
- "5200",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Reported by Richard Nauber <RichardNauber@web.de> */
-UNUSUAL_DEV( 0x0421, 0x04fa, 0x0550, 0x0660,
- "Nokia",
- "6300",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Patch for Nokia 5310 capacity */
-UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591,
- "Nokia",
- "5310",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
-/* Submitted by Ricky Wong Yung Fei <evilbladewarrior@gmail.com> */
-/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */
-UNUSUAL_DEV( 0x0421, 0x00f5, 0x0000, 0x0470,
- "Nokia",
- "7610 Supernova",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
-
/* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210,
"SMSC",
@@ -410,83 +346,6 @@ UNUSUAL_DEV( 0x04b0, 0x0301, 0x0010, 0x
US_SC_DEVICE, US_PR_DEVICE,NULL,
US_FL_NOT_LOCKABLE ),
-/* Reported by Stefan de Konink <skinkie@xs4all.nl> */
-UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x0200,
- "NIKON",
- "NIKON DSC D100",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Tobias Kunze Briseno <t-linux@fictive.com> */
-UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200,
- "NIKON",
- "NIKON DSC D2H",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */
-UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100,
- "NIKON",
- "NIKON DSC D50",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Andreas Bockhold <andreas@bockionline.de> */
-UNUSUAL_DEV( 0x04b0, 0x0405, 0x0100, 0x0100,
- "NIKON",
- "NIKON DSC D70",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Jamie Kitson <jamie@staberinde.fsnet.co.uk> */
-UNUSUAL_DEV( 0x04b0, 0x040d, 0x0100, 0x0100,
- "NIKON",
- "NIKON DSC D70s",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Graber and Mike Pagano <mpagano-kernel@mpagano.com> */
-UNUSUAL_DEV( 0x04b0, 0x040f, 0x0100, 0x0200,
- "NIKON",
- "NIKON DSC D200",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Emil Larsson <emil@swip.net> */
-UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0111,
- "NIKON",
- "NIKON DSC D80",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Ortwin Glueck <odi@odi.ch> */
-UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0111,
- "NIKON",
- "NIKON DSC D40",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Paul Check <paul@openstreet.com> */
-UNUSUAL_DEV( 0x04b0, 0x0415, 0x0100, 0x0100,
- "NIKON",
- "NIKON DSC D2Xs",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by Shan Destromp (shansan@gmail.com) */
-UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x0100,
- "NIKON",
- "NIKON DSC D40X",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/* Reported by paul ready <lxtwin@homecall.co.uk> */
-UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200,
- "NIKON",
- "NIKON DSC D300",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
/* Reported by Doug Maxey (dwm@austin.ibm.com) */
UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110,
"IBM",
@@ -2121,27 +1980,6 @@ UNUSUAL_DEV( 0x22b8, 0x3010, 0x0001, 0x
US_FL_FIX_CAPACITY | US_FL_IGNORE_RESIDUE ),
/*
- * Patch by Pete Zaitcev <zaitcev@redhat.com>
- * Report by Mark Patton. Red Hat bz#208928.
- * Added support for rev 0x0002 (Motorola ROKR W5)
- * by Javier Smaldone <javier@smaldone.com.ar>
- */
-UNUSUAL_DEV( 0x22b8, 0x4810, 0x0001, 0x0002,
- "Motorola",
- "RAZR V3i/ROKR W5",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/*
- * Patch by Jost Diederichs <jost@qdusa.com>
- */
-UNUSUAL_DEV(0x22b8, 0x6410, 0x0001, 0x9999,
- "Motorola Inc.",
- "Motorola Phone (RAZRV3xx)",
- US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY),
-
-/*
* Patch by Constantin Baranov <const@tltsu.ru>
* Report by Andreas Koenecke.
* Motorola ROKR Z6.
next prev parent reply other threads:[~2009-01-23 1:21 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090123010651.683741823@mini.kroah.org>
2009-01-23 1:11 ` [patch 00/46] 2.6.28-stable review Greg KH
2009-01-23 1:11 ` [patch 01/46] PCI: keep ASPM link state consistent throughout PCIe hierarchy Greg KH
2009-01-23 1:11 ` [patch 02/46] security: introduce missing kfree Greg KH
2009-01-23 1:11 ` [patch 03/46] rt2x00: add USB ID for the Linksys WUSB200 Greg KH
2009-01-23 1:11 ` [patch 04/46] p54usb: Add USB ID for Thomson Speedtouch 121g Greg KH
2009-01-23 1:11 ` [patch 05/46] lib/idr.c: use kmem_cache_zalloc() for the idr_layer cache Greg KH
2009-01-23 1:11 ` [patch 06/46] sgi-xp: eliminate false detection of no heartbeat Greg KH
2009-01-23 1:11 ` [patch 07/46] sched: fix update_min_vruntime Greg KH
2009-01-23 1:11 ` [patch 08/46] IA64: Turn on CONFIG_HAVE_UNSTABLE_CLOCK Greg KH
2009-01-23 1:11 ` [patch 09/46] sound: virtuoso: do not overwrite EEPROM on Xonar D2/D2X Greg KH
2009-01-23 1:11 ` [patch 10/46] ALSA: hda - Add quirk for another HP dv5 Greg KH
2009-01-23 1:11 ` [patch 11/46] ALSA: hda - Fix HP dv5 mic input Greg KH
2009-01-23 1:11 ` [patch 12/46] ALSA: hda - Add automatic model setting for Samsung Q45 Greg KH
2009-01-23 1:11 ` [patch 13/46] ALSA: hda - Dont reset HP pinctl in patch_sigmatel.c Greg KH
2009-01-23 1:11 ` [patch 14/46] ALSA: hda - make laptop-eapd model back for AD1986A Greg KH
2009-01-23 1:11 ` [patch 15/46] drivers/net/irda/irda-usb.c: fix buffer overflow Greg KH
2009-01-23 1:12 ` [patch 16/46] usb-storage: add last-sector hacks Greg KH
2009-01-23 1:12 ` Greg KH [this message]
2009-01-23 1:12 ` [patch 18/46] pkt_sched: sch_htb: Fix deadlock in hrtimers triggered by HTB Greg KH
2009-01-23 1:12 ` [patch 19/46] ipv6: Fix fib6_dump_table walker leak Greg KH
2009-01-23 1:12 ` [patch 20/46] sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream ID Greg KH
2009-01-23 1:12 ` [patch 21/46] pkt_sched: cls_u32: Fix locking in u32_change() Greg KH
2009-01-23 1:12 ` [patch 22/46] r6040: fix wrong logic in mdio code Greg KH
2009-01-23 1:12 ` [patch 23/46] r6040: save and restore MIER correctly in the interrupt routine Greg KH
2009-01-23 1:12 ` [patch 24/46] r6040: bump release number to 0.19 Greg KH
2009-01-23 1:31 ` Jesper Juhl
2009-01-23 2:04 ` [stable] " Greg KH
2009-01-23 7:53 ` Willy Tarreau
2009-01-23 7:49 ` David Miller
2009-01-23 1:12 ` [patch 25/46] tcp: dont mask EOF and socket errors on nonblocking splice receive Greg KH
2009-01-23 1:12 ` [patch 26/46] USB: re-enable interface after driver unbinds Greg KH
2009-01-23 1:12 ` [patch 27/46] p54usb: fix traffic stalls / packet drop Greg KH
2009-01-23 1:12 ` [patch 28/46] netfilter: x_tables: fix match/target revision lookup Greg KH
2009-01-23 1:12 ` [patch 29/46] netfilter: ebtables: fix inversion in match code Greg KH
2009-01-23 1:12 ` [patch 30/46] netfilter: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian Greg KH
2009-01-23 1:12 ` [patch 31/46] dell_rbu: use scnprintf() instead of less secure sprintf() Greg KH
2009-01-23 1:12 ` [patch 32/46] powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices Greg KH
2009-01-23 1:12 ` [patch 33/46] hwmon: (abituguru3) Fix CONFIG_DMI=n fallback to probe Greg KH
2009-01-23 1:12 ` [patch 34/46] mm: write_cache_pages cyclic fix Greg KH
2009-01-23 1:12 ` [patch 35/46] mm: write_cache_pages early loop termination Greg KH
2009-01-23 1:12 ` [patch 36/46] mm: write_cache_pages writepage error fix Greg KH
2009-01-23 1:12 ` [patch 38/46] mm: write_cache_pages cleanups Greg KH
2009-01-23 1:12 ` [patch 37/46] mm: write_cache_pages integrity fix Greg KH
2009-01-23 1:12 ` [patch 39/46] mm: write_cache_pages optimise page cleaning Greg KH
2009-01-23 1:13 ` [patch 40/46] mm: write_cache_pages terminate quickly Greg KH
2009-01-23 1:13 ` [patch 41/46] mm: write_cache_pages more " Greg KH
2009-01-23 1:13 ` [patch 42/46] mm: do_sync_mapping_range integrity fix Greg KH
2009-01-23 1:13 ` [patch 43/46] mm: direct IO starvation improvement Greg KH
2009-01-23 1:13 ` [patch 44/46] fs: remove WB_SYNC_HOLD Greg KH
2009-01-23 1:13 ` [patch 45/46] fs: sync_sb_inodes fix Greg KH
2009-01-23 1:13 ` [patch 46/46] fs: sys_sync fix Greg KH
2009-01-23 1:50 ` [patch 00/46] 2.6.28-stable review Stefan Lippers-Hollmann
2009-01-23 2:02 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090123011202.GR19756@kroah.com \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=cavokz@gmail.com \
--cc=cebbert@redhat.com \
--cc=chuckw@quantumlinux.com \
--cc=davej@redhat.com \
--cc=eteo@redhat.com \
--cc=greg@kroah.com \
--cc=jake@lwn.net \
--cc=jmforbes@linuxtx.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkrufky@linuxtv.org \
--cc=rbranco@la.checkpoint.com \
--cc=rdunlap@xenotime.net \
--cc=reviews@ml.cw.f00f.org \
--cc=stable@kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=usb-storage@lists.one-eyed-alien.net \
--cc=w@1wt.eu \
--cc=zwane@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox