• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: Commit

2.4.36-stable kernel tree


Commit MetaInfo

Revisiona290a24e714b36dd5bc5b6bc03dd6d5606a7de15 (tree)
Zeit2007-02-25 16:02:41
AutorGilles Espinasse <g.esp@free...>
CommiterWilly Tarreau

Log Message

[PATCH] usb-storage: backport unusual_devs from 2.6.20

Backport unusual devices from 2.6.20, only those with flags known in 2.4 :

NEC USB UF000x, FDC GOLD-2.30, NIKON DSC D70, NIKON DSC D70s,
Epson 875DC Storage, Sony DSC-T1/T5/H5, Sony Handycam,
Sony PEG Mass Storage, SAMSUNG SFD-321U [FW 0C], Apple iPod,
Thomson Multimedia Inc. RCA RD1080 MP3 Player,
Freecom Technologies FHD-Classic, DataFab Systems Inc. USB CF+MS,
CITIZEN X1DE-USB, Acomdata CF, Acomdata CM, Unknown 0x0c45, 0x1060,
Sony Ericsson P990i, Sony Ericsson M600i, Minolta Dimage Z10

Devices with those flags unknown in 2.4 were not backported :

CONFIG_USB_STORAGE_ONETOUCH, US_FL_BULK32, US_FL_GO_SLOW,
US_FL_IGNORE_DEVICE, US_FL_IGNORE_RESIDUE, US_FL_MAX_SECTORS_64,
US_FL_NEED_OVERRIDE, US_FL_NOT_LOCKABLE, US_FL_NO_WP_DETECT,
US_PR_ALAUDA, US_PR_KARMA, US_PR_USBAT

Update those devices :

- Mitsumi FDD modified in 2.6.19

Keep those devices blacklisted in 2.4 although they were removed in 2.6 :

- LaCie USB Hard Disk
- Flashgate Hagiwara 0x0693, 0x0002, 0x0100, 0x0100
- IBM USB Memory Key 0x0a16, 0x8888, 0x0100, 0x0100

Ändern Zusammenfassung

Diff

--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -50,7 +50,7 @@ UNUSUAL_DEV( 0x03ee, 0x0000, 0x0000, 0x0245,
5050 "CD-R/RW Drive",
5151 US_SC_8020, US_PR_CBI, NULL, 0),
5252
53-UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x0100,
53+UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x0200,
5454 "Mitsumi",
5555 "USB FDD",
5656 US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -73,6 +73,16 @@ UNUSUAL_DEV( 0x03f0, 0x0307, 0x0001, 0x0001,
7373 US_SC_8070, US_PR_SCM_ATAPI, init_8200e, 0),
7474 #endif
7575
76+/* Reported by Sebastian Kapfer <sebastian_kapfer@gmx.net>
77+ * and Olaf Hering <olh@suse.de> (different bcd's, same vendor/product)
78+ * for USB floppies that need the SINGLE_LUN enforcement.
79+ */
80+UNUSUAL_DEV( 0x0409, 0x0040, 0x0000, 0x9999,
81+ "NEC",
82+ "NEC USB UF000x",
83+ US_SC_DEVICE, US_PR_DEVICE, NULL,
84+ US_FL_SINGLE_LUN ),
85+
7686 /* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
7787 * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message
7888 * always fails and confuses drive.
@@ -83,6 +93,13 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x0113,
8393 US_SC_DEVICE, US_PR_DEVICE, NULL,
8494 US_FL_FIX_INQUIRY ),
8595
96+/* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
97+UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210,
98+ "SMSC",
99+ "FDC GOLD-2.30",
100+ US_SC_DEVICE, US_PR_DEVICE, NULL,
101+ US_FL_SINGLE_LUN ),
102+
86103 #ifdef CONFIG_USB_STORAGE_DPCM
87104 UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x0100,
88105 "Microtech",
@@ -115,6 +132,27 @@ UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001,
115132 "DVD-CAM DZ-MV100A Camcorder",
116133 US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN),
117134
135+/* Reported by Andreas Bockhold <andreas@bockionline.de> */
136+UNUSUAL_DEV( 0x04b0, 0x0405, 0x0100, 0x0100,
137+ "NIKON",
138+ "NIKON DSC D70",
139+ US_SC_DEVICE, US_PR_DEVICE, NULL,
140+ US_FL_FIX_CAPACITY),
141+
142+/* Reported by Jamie Kitson <jamie@staberinde.fsnet.co.uk> */
143+UNUSUAL_DEV( 0x04b0, 0x040d, 0x0100, 0x0100,
144+ "NIKON",
145+ "NIKON DSC D70s",
146+ US_SC_DEVICE, US_PR_DEVICE, NULL,
147+ US_FL_FIX_CAPACITY),
148+
149+/* Reported by Simon Levitt <simon@whattf.com>
150+ * This entry needs Sub and Proto fields */
151+UNUSUAL_DEV( 0x04b8, 0x0601, 0x0100, 0x0100,
152+ "Epson",
153+ "875DC Storage",
154+ US_SC_SCSI, US_PR_CB, NULL, US_FL_FIX_INQUIRY),
155+
118156 /* Reported by Khalid Aziz <khalid@gonehiking.org>
119157 * This entry is needed because the device reports Sub=ff */
120158 UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110,
@@ -122,10 +160,13 @@ UNUSUAL_DEV( 0x04b8, 0x0602, 0x0110, 0x0110,
122160 "785EPX Storage",
123161 US_SC_SCSI, US_PR_BULK, NULL, US_FL_SINGLE_LUN),
124162
163+/* Not sure who reported this originally but
164+ * Pavel Machek <pavel@ucw.cz> reported that the extra US_FL_SINGLE_LUN
165+ * flag be added */
125166 UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
126167 "Fujifilm",
127168 "FinePix 1400Zoom",
128- US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
169+ US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN),
129170
130171 /* Reported by Peter W臘htler <pwaechtler@loewe-komp.de>
131172 * The device needs the flags only.
@@ -255,6 +296,14 @@ UNUSUAL_DEV( 0x054c, 0x0010, 0x0106, 0x0450,
255296 US_SC_SCSI, US_PR_DEVICE, NULL,
256297 US_FL_SINGLE_LUN | US_FL_MODE_XLATE ),
257298
299+/* Submitted by Lars Jacob <jacob.lars@googlemail.com>
300+ * This entry is needed because the device reports Sub=ff */
301+UNUSUAL_DEV( 0x054c, 0x0010, 0x0500, 0x0610,
302+ "Sony",
303+ "DSC-T1/T5/H5",
304+ US_SC_8070, US_PR_DEVICE, NULL,
305+ US_FL_SINGLE_LUN ),
306+
258307 /* Reported by wim@geeks.nl */
259308 UNUSUAL_DEV( 0x054c, 0x0025, 0x0100, 0x0100,
260309 "Sony",
@@ -283,6 +332,13 @@ UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310,
283332 US_SC_SCSI, US_PR_DEVICE, NULL,
284333 US_FL_SINGLE_LUN | US_FL_MODE_XLATE),
285334
335+/* Submitted by Klaus Mueller <k.mueller@intershop.de> */
336+UNUSUAL_DEV( 0x054c, 0x002e, 0x0106, 0x0310,
337+ "Sony",
338+ "Handycam",
339+ US_SC_SCSI, US_PR_DEVICE, NULL,
340+ US_FL_SINGLE_LUN ),
341+
286342 /* Submitted by Rajesh Kumble Nayak <nayak@obs-nice.fr> */
287343 UNUSUAL_DEV( 0x054c, 0x002e, 0x0500, 0x0500,
288344 "Sony",
@@ -315,7 +371,28 @@ UNUSUAL_DEV( 0x054c, 0x006d, 0x0000, 0x9999,
315371 "PEG Mass Storage",
316372 US_SC_DEVICE, US_PR_DEVICE, NULL,
317373 US_FL_FIX_INQUIRY ),
318-
374+
375+/* Submitted by Mike Alborn <malborn@deandra.homeip.net> */
376+UNUSUAL_DEV( 0x054c, 0x016a, 0x0000, 0x9999,
377+ "Sony",
378+ "PEG Mass Storage",
379+ US_SC_DEVICE, US_PR_DEVICE, NULL,
380+ US_FL_FIX_INQUIRY ),
381+
382+/* Submitted by Frank Engel <frankie@cse.unsw.edu.au> */
383+UNUSUAL_DEV( 0x054c, 0x0099, 0x0000, 0x9999,
384+ "Sony",
385+ "PEG Mass Storage",
386+ US_SC_DEVICE, US_PR_DEVICE, NULL,
387+ US_FL_FIX_INQUIRY ),
388+
389+/* floppy reports multiple luns */
390+UNUSUAL_DEV( 0x055d, 0x2020, 0x0000, 0x0210,
391+ "SAMSUNG",
392+ "SFD-321U [FW 0C]",
393+ US_SC_DEVICE, US_PR_DEVICE, NULL,
394+ US_FL_SINGLE_LUN ),
395+
319396 UNUSUAL_DEV( 0x057b, 0x0000, 0x0000, 0x0299,
320397 "Y-E Data",
321398 "Flashbuster-U",
@@ -374,6 +451,41 @@ UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110,
374451 0 ),
375452 #endif
376453
454+/* Submitted by Sven Anderson <sven-linux@anderson.de>
455+ * There are at least four ProductIDs used for iPods, so I added 0x1202 and
456+ * 0x1204. They just need the US_FL_FIX_CAPACITY. As the bcdDevice appears
457+ * to change with firmware updates, I changed the range to maximum for all
458+ * iPod entries.
459+ */
460+UNUSUAL_DEV( 0x05ac, 0x1202, 0x0000, 0x9999,
461+ "Apple",
462+ "iPod",
463+ US_SC_DEVICE, US_PR_DEVICE, NULL,
464+ US_FL_FIX_CAPACITY ),
465+
466+/* Reported by Avi Kivity <avi@argo.co.il> */
467+UNUSUAL_DEV( 0x05ac, 0x1203, 0x0000, 0x9999,
468+ "Apple",
469+ "iPod",
470+ US_SC_DEVICE, US_PR_DEVICE, NULL,
471+ US_FL_FIX_CAPACITY ),
472+
473+UNUSUAL_DEV( 0x05ac, 0x1205, 0x0000, 0x9999,
474+ "Apple",
475+ "iPod",
476+ US_SC_DEVICE, US_PR_DEVICE, NULL,
477+ US_FL_FIX_CAPACITY ),
478+
479+/*
480+ * Reported by Tyson Vinson <lornoss@gmail.com>
481+ * This particular productId is the iPod Nano
482+ */
483+UNUSUAL_DEV( 0x05ac, 0x120a, 0x0000, 0x9999,
484+ "Apple",
485+ "iPod",
486+ US_SC_DEVICE, US_PR_DEVICE, NULL,
487+ US_FL_FIX_CAPACITY ),
488+
377489 #ifdef CONFIG_USB_STORAGE_JUMPSHOT
378490 UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001,
379491 "Lexar",
@@ -394,28 +506,34 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x0113,
394506 * That is the only reason this entry is needed.
395507 */
396508 UNUSUAL_DEV( 0x05e3, 0x0700, 0x0000, 0xffff,
397- "SIIG",
509+ "Genesys Logic",
398510 "CompactFlash Card Reader",
399511 US_SC_DEVICE, US_PR_DEVICE, NULL,
400512 US_FL_FIX_INQUIRY ),
401513
402-/* Submitted Alexander Oltu <alexander@all-2.com> */
514+/* The following two entries are for a Genesys USB to IDE
515+ * converter chip, but it changes its ProductId depending
516+ * on whether or not a disk or an optical device is enclosed
517+ * They were originally reported by Alexander Oltu
518+ * <alexander@all-2.com> and Peter Marks <peter.marks@turner.com>
519+ * respectively.
520+ */
403521 UNUSUAL_DEV( 0x05e3, 0x0701, 0x0000, 0xffff,
404- "",
405- "USB TO IDE",
522+ "Genesys Logic",
523+ "USB to IDE Optical",
406524 US_SC_DEVICE, US_PR_DEVICE, NULL,
407525 US_FL_MODE_XLATE ),
408526
409527 /* Reported by Peter Marks <peter.marks@turner.com>
410- * Like the SIIG unit above, this unit needs an INQUIRY to ask for exactly
528+ * Like the Genesys Logic unit above, this unit needs an INQUIRY to ask for exactly
411529 * 36 bytes of data. No more, no less. That is the only reason this entry
412530 * is needed.
413531 *
414532 * ST818 slim drives (rev 0.02) don't need special care.
415533 */
416534 UNUSUAL_DEV( 0x05e3, 0x0702, 0x0000, 0x0001,
417- "EagleTec",
418- "External Hard Disk",
535+ "Genesys Logic",
536+ "USB to IDE Disk",
419537 US_SC_DEVICE, US_PR_DEVICE, NULL,
420538 US_FL_FIX_INQUIRY ),
421539
@@ -491,6 +609,13 @@ UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x0100,
491609 "Flashgate",
492610 US_SC_SCSI, US_PR_BULK, NULL, 0 ),
493611
612+/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
613+UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001,
614+ "Thomson Multimedia Inc.",
615+ "RCA RD1080 MP3 Player",
616+ US_SC_DEVICE, US_PR_DEVICE, NULL,
617+ US_FL_FIX_CAPACITY ),
618+
494619 UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
495620 "Sandisk",
496621 "ImageMate SDDR-05a",
@@ -524,6 +649,13 @@ UNUSUAL_DEV( 0x07ab, 0xfc01, 0x0000, 0x9999,
524649 US_SC_QIC, US_PR_FREECOM, freecom_init, 0),
525650 #endif
526651
652+/* Reported by Eero Volotinen <eero@ping-viini.org> */
653+UNUSUAL_DEV( 0x07ab, 0xfccd, 0x0000, 0x9999,
654+ "Freecom Technologies",
655+ "FHD-Classic",
656+ US_SC_DEVICE, US_PR_DEVICE, NULL,
657+ US_FL_FIX_CAPACITY),
658+
527659 UNUSUAL_DEV( 0x07af, 0x0004, 0x0100, 0x0133,
528660 "Microtech",
529661 "USB-SCSI-DB25",
@@ -618,6 +750,19 @@ UNUSUAL_DEV( 0x07c4, 0xa109, 0x0000, 0xffff,
618750 US_FL_SINGLE_LUN ),
619751 #endif
620752
753+#ifdef CONFIG_USB_STORAGE_DATAFAB
754+/* Reported by Felix Moeller <felix@derklecks.de>
755+ * in Germany this is sold by Hama with the productnumber 46952
756+ * as "DualSlot CompactFlash(TM) & MStick Drive USB"
757+ */
758+UNUSUAL_DEV( 0x07c4, 0xa10b, 0x0000, 0xffff,
759+ "DataFab Systems Inc.",
760+ "USB CF+MS",
761+ US_SC_SCSI, US_PR_DATAFAB, NULL,
762+ 0 ),
763+
764+#endif
765+
621766 /* Datafab KECF-USB / Sagatek DCS-CF / Simpletech Flashlink UCF-100
622767 * Only revision 1.13 tested (same for all of the above devices,
623768 * based on the Datafab DF-UG-07 chip). Needed for US_FL_FIX_INQUIRY.
@@ -659,6 +804,13 @@ UNUSUAL_DEV( 0x08ca, 0x2011, 0x0000, 0x9999,
659804 US_SC_DEVICE, US_PR_DEVICE, NULL,
660805 US_FL_MODE_XLATE ),
661806
807+/* Submitted by Jan De Luyck <lkml@kcore.org> */
808+UNUSUAL_DEV( 0x08bd, 0x1100, 0x0000, 0x0000,
809+ "CITIZEN",
810+ "X1DE-USB",
811+ US_SC_DEVICE, US_PR_DEVICE, NULL,
812+ US_FL_SINGLE_LUN),
813+
662814 /*Medion 6047 Digital Camera
663815 Davide Andrian <_nessuno_@katamail.com>
664816 */
@@ -734,6 +886,31 @@ UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110,
734886 0 ),
735887 #endif
736888
889+#ifdef CONFIG_USB_STORAGE_DATAFAB
890+UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
891+ "Acomdata",
892+ "CF",
893+ US_SC_SCSI, US_PR_DATAFAB, NULL,
894+ US_FL_SINGLE_LUN ),
895+#endif
896+#ifdef CONFIG_USB_STORAGE_SDDR55
897+UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
898+ "Acomdata",
899+ "SM",
900+ US_SC_SCSI, US_PR_SDDR55, NULL,
901+ US_FL_SINGLE_LUN ),
902+#endif
903+
904+/*
905+ * Pete Zaitcev <zaitcev@yahoo.com>, bz#164688.
906+ * The device blatantly ignores LUN and returns 1 in GetMaxLUN.
907+ */
908+UNUSUAL_DEV( 0x0c45, 0x1060, 0x0100, 0x0100,
909+ "Unknown",
910+ "Unknown",
911+ US_SC_DEVICE, US_PR_DEVICE, NULL,
912+ US_FL_SINGLE_LUN ),
913+
737914 /* Submitted by Joris Struyve <joris@struyve.be> */
738915 UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
739916 "Medion",
@@ -768,7 +945,21 @@ UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300,
768945 "Solid state disk",
769946 US_SC_DEVICE, US_PR_DEVICE, NULL,
770947 US_FL_FIX_INQUIRY ),
771-
948+
949+/* Reported by Jan Mate <mate@fiit.stuba.sk> */
950+UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x0000,
951+ "Sony Ericsson",
952+ "P990i",
953+ US_SC_DEVICE, US_PR_DEVICE, NULL,
954+ US_FL_FIX_CAPACITY ),
955+
956+/* Reported by Emmanuel Vasilakis <evas@forthnet.gr> */
957+UNUSUAL_DEV( 0x0fce, 0xe031, 0x0000, 0x0000,
958+ "Sony Ericsson",
959+ "M600i",
960+ US_SC_DEVICE, US_PR_DEVICE, NULL,
961+ US_FL_FIX_CAPACITY ),
962+
772963 /* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu>
773964 * Tested on hardware version 1.10.
774965 * Entry is needed only for the initializer function override.
@@ -790,6 +981,13 @@ UNUSUAL_DEV( 0x1065, 0x2136, 0x0000, 0x9999,
790981 US_SC_DEVICE, US_PR_DEVICE, NULL,
791982 US_FL_MODE_XLATE ),
792983
984+/* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
985+UNUSUAL_DEV( 0x132b, 0x000b, 0x0001, 0x0001,
986+ "Minolta",
987+ "Dimage Z10",
988+ US_SC_DEVICE, US_PR_DEVICE, NULL,
989+ 0 ),
990+
793991 #ifdef CONFIG_USB_STORAGE_SDDR55
794992 UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x9999,
795993 "Sandisk",
Show on old repository browser