[src/trunk]: src/sys/dev/usb Restore original residue quirk proposed in PR#42...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/07aeb9949dbb
branches:  trunk
changeset: 767819:07aeb9949dbb
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Jul 31 16:32:02 2011 +0000

description:
Restore original residue quirk proposed in PR#42225, it is necessary.

diffstat:

 sys/dev/usb/umass.c        |  10 ++++++----
 sys/dev/usb/umass_quirks.c |  13 +++++++++++--
 sys/dev/usb/umassvar.h     |   3 ++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs (83 lines):

diff -r c70c4cb2d1f3 -r 07aeb9949dbb sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Sun Jul 31 16:19:21 2011 +0000
+++ b/sys/dev/usb/umass.c       Sun Jul 31 16:32:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass.c,v 1.138 2010/02/13 02:16:51 martin Exp $       */
+/*     $NetBSD: umass.c,v 1.139 2011/07/31 16:32:02 jakllsch Exp $     */
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.138 2010/02/13 02:16:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.139 2011/07/31 16:32:02 jakllsch Exp $");
 
 #include "atapibus.h"
 #include "scsibus.h"
@@ -1178,9 +1178,11 @@
 
                DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, &sc->csw));
 
-               residue = UGETDW(sc->csw.dCSWDataResidue);
-               if (residue < sc->transfer_datalen - sc->transfer_actlen)
+               if ((sc->sc_quirks & UMASS_QUIRK_IGNORE_RESIDUE) == 0) {
+                       residue = UGETDW(sc->csw.dCSWDataResidue);
+               } else {
                        residue = sc->transfer_datalen - sc->transfer_actlen;
+               }
 
                /* Translate weird command-status signatures. */
                if ((sc->sc_quirks & UMASS_QUIRK_WRONG_CSWSIG) &&
diff -r c70c4cb2d1f3 -r 07aeb9949dbb sys/dev/usb/umass_quirks.c
--- a/sys/dev/usb/umass_quirks.c        Sun Jul 31 16:19:21 2011 +0000
+++ b/sys/dev/usb/umass_quirks.c        Sun Jul 31 16:32:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_quirks.c,v 1.84 2010/12/30 19:35:33 jakllsch Exp $       */
+/*     $NetBSD: umass_quirks.c,v 1.85 2011/07/31 16:32:02 jakllsch Exp $       */
 
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.84 2010/12/30 19:35:33 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.85 2011/07/31 16:32:02 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -286,6 +286,15 @@
          UMATCH_VENDOR_PRODUCT,
          NULL, NULL
        },
+
+       /* Devices with bad residue. */
+       { { USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDEBRIDGE },
+         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+         UMASS_QUIRK_IGNORE_RESIDUE,
+         0,
+         UMATCH_VENDOR_PRODUCT,
+         NULL, NULL
+       },
 };
 
 const struct umass_quirk *
diff -r c70c4cb2d1f3 -r 07aeb9949dbb sys/dev/usb/umassvar.h
--- a/sys/dev/usb/umassvar.h    Sun Jul 31 16:19:21 2011 +0000
+++ b/sys/dev/usb/umassvar.h    Sun Jul 31 16:32:02 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umassvar.h,v 1.30 2010/11/03 22:34:24 dyoung Exp $     */
+/*     $NetBSD: umassvar.h,v 1.31 2011/07/31 16:32:02 jakllsch Exp $   */
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop%rr.iij4u.or.jp@localhost>,
  *                   Nick Hibma <n_hibma%freebsd.org@localhost>
@@ -180,6 +180,7 @@
 #define        UMASS_QUIRK_WRONG_CSWTAG        0x00000002
 #define        UMASS_QUIRK_RBC_PAD_TO_12       0x00000004
 #define        UMASS_QUIRK_NOGETMAXLUN         0x00000008
+#define        UMASS_QUIRK_IGNORE_RESIDUE      0x00000010
 
 #define UMASS_QUIRK_USE_DEFAULTMATCH   -1