From owner-freebsd-usb@FreeBSD.ORG Sun Nov 4 20:07:43 2012 Return-Path: Delivered-To: freebsd-usb@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 373BF6A for ; Sun, 4 Nov 2012 20:07:43 +0000 (UTC) (envelope-from marcel@xcllnt.net) Received: from mail.xcllnt.net (mail.xcllnt.net [70.36.220.4]) by mx1.freebsd.org (Postfix) with ESMTP id 097178FC12 for ; Sun, 4 Nov 2012 20:07:42 +0000 (UTC) Received: from marcelm-sslvpn-nc.jnpr.net (natint3.juniper.net [66.129.224.36]) (authenticated bits=0) by mail.xcllnt.net (8.14.5/8.14.5) with ESMTP id qA4K7Ybj058529 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 4 Nov 2012 12:07:35 -0800 (PST) (envelope-from marcel@xcllnt.net) Content-Type: multipart/mixed; boundary="Apple-Mail=_59387DA8-901B-40FC-9105-7D0F3BC6C8FB" Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\)) Subject: Re: RFC: new USB quirk From: Marcel Moolenaar In-Reply-To: <201211041147.11076.hselasky@c2i.net> Date: Sun, 4 Nov 2012 12:07:31 -0800 Message-Id: <1DCEF6B8-5917-49F0-90AE-072835A8E595@xcllnt.net> References: <5D9BFA84-4B90-4769-BE02-F771C3AE5441@xcllnt.net> <201211041147.11076.hselasky@c2i.net> To: Hans Petter Selasky X-Mailer: Apple Mail (2.1499) Cc: freebsd-usb@freebsd.org X-BeenThere: freebsd-usb@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: FreeBSD support for USB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2012 20:07:43 -0000 --Apple-Mail=_59387DA8-901B-40FC-9105-7D0F3BC6C8FB Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On Nov 4, 2012, at 2:47 AM, Hans Petter Selasky wrote: > On Saturday 03 November 2012 22:42:33 Marcel Moolenaar wrote: >> Hans, >> >> Juniper has a few products that use STmicro USB-NAND controllers >> (the ST72682 in particular) and they really don't like the SCSI >> command for prevent/allow medium removal. The attached patch >> adds a quirk for this to avoid spamming the console with errors >> or warnings. >> >> Does it look good to you? >> Ok to commit? >> >> Thanks, > > Hi, > > You also need to update this table in usb_quirk.c: > > static const char *usb_quirk_str[USB_QUIRK_MAX] = { > [UQ_NONE] = "UQ_NONE", > > Can you do that and send a new patch for review? See attached. FYI, -- Marcel Moolenaar marcel@xcllnt.net --Apple-Mail=_59387DA8-901B-40FC-9105-7D0F3BC6C8FB Content-Disposition: attachment; filename=usb.diff Content-Type: application/octet-stream; name="usb.diff" Content-Transfer-Encoding: 7bit Index: sys/dev/usb/quirk/usb_quirk.c =================================================================== --- sys/dev/usb/quirk/usb_quirk.c (revision 242577) +++ sys/dev/usb/quirk/usb_quirk.c (working copy) @@ -390,6 +390,7 @@ UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(SONY, PORTABLE_HDD_V2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), + USB_QUIRK(STMICRO, ST72682, 0x0000, 0xffff, UQ_MSC_NO_PREVENT_ALLOW), USB_QUIRK(SUPERTOP, IDE, 0x0000, 0xffff, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(SUPERTOP, FLASHDRIVE, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY, @@ -523,6 +524,7 @@ [UQ_MSC_NO_GETMAXLUN] = "UQ_MSC_NO_GETMAXLUN", [UQ_MSC_NO_INQUIRY] = "UQ_MSC_NO_INQUIRY", [UQ_MSC_NO_INQUIRY_EVPD] = "UQ_MSC_NO_INQUIRY_EVPD", + [UQ_MSC_NO_PREVENT_ALLOW] = "UQ_MSC_NO_PREVENT_ALLOW", [UQ_MSC_NO_SYNC_CACHE] = "UQ_MSC_NO_SYNC_CACHE", [UQ_MSC_SHUTTLE_INIT] = "UQ_MSC_SHUTTLE_INIT", [UQ_MSC_ALT_IFACE_1] = "UQ_MSC_ALT_IFACE_1", Index: sys/dev/usb/quirk/usb_quirk.h =================================================================== --- sys/dev/usb/quirk/usb_quirk.h (revision 242577) +++ sys/dev/usb/quirk/usb_quirk.h (working copy) @@ -75,6 +75,7 @@ UQ_MSC_NO_GETMAXLUN, /* does not support get max LUN */ UQ_MSC_NO_INQUIRY, /* fake generic inq response */ UQ_MSC_NO_INQUIRY_EVPD, /* does not support inq EVPD */ + UQ_MSC_NO_PREVENT_ALLOW, /* does not support medium removal */ UQ_MSC_NO_SYNC_CACHE, /* does not support sync cache */ UQ_MSC_SHUTTLE_INIT, /* requires Shuttle init sequence */ UQ_MSC_ALT_IFACE_1, /* switch to alternate interface 1 */ Index: sys/dev/usb/storage/umass.c =================================================================== --- sys/dev/usb/storage/umass.c (revision 242577) +++ sys/dev/usb/storage/umass.c (working copy) @@ -361,6 +361,8 @@ * result. */ #define NO_SYNCHRONIZE_CACHE 0x4000 + /* Device does not support 'PREVENT/ALLOW MEDIUM REMOVAL'. */ +#define NO_PREVENT_ALLOW 0x8000 struct umass_softc { @@ -831,6 +833,8 @@ quirks |= NO_INQUIRY; if (usb_test_quirk(uaa, UQ_MSC_NO_INQUIRY_EVPD)) quirks |= NO_INQUIRY_EVPD; + if (usb_test_quirk(uaa, UQ_MSC_NO_PREVENT_ALLOW)) + quirks |= NO_PREVENT_ALLOW; if (usb_test_quirk(uaa, UQ_MSC_NO_SYNC_CACHE)) quirks |= NO_SYNCHRONIZE_CACHE; if (usb_test_quirk(uaa, UQ_MSC_SHUTTLE_INIT)) @@ -2245,6 +2249,13 @@ if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { ccb->csio.dxfer_len = SHORT_INQUIRY_LENGTH; } + } else if (sc->sc_transfer.cmd_data[0] == PREVENT_ALLOW) { + if (sc->sc_quirks & NO_PREVENT_ALLOW) { + ccb->csio.scsi_status = SCSI_STATUS_OK; + ccb->ccb_h.status = CAM_REQ_CMP; + xpt_done(ccb); + goto done; + } } else if (sc->sc_transfer.cmd_data[0] == SYNCHRONIZE_CACHE) { if (sc->sc_quirks & NO_SYNCHRONIZE_CACHE) { ccb->csio.scsi_status = SCSI_STATUS_OK; Index: sys/dev/usb/usbdevs =================================================================== --- sys/dev/usb/usbdevs (revision 242577) +++ sys/dev/usb/usbdevs (working copy) @@ -3949,6 +3949,7 @@ /* STMicroelectronics products */ product STMICRO BIOCPU 0x2016 Biometric Coprocessor product STMICRO COMMUNICATOR 0x7554 USB Communicator +product STMICRO ST72682 0xfada USB 2.0 Flash drive controller /* STSN products */ product STSN STSN0001 0x0001 Internet Access Device --Apple-Mail=_59387DA8-901B-40FC-9105-7D0F3BC6C8FB--