From nobody Wed May 7 21:37:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zt7rd1LpSz5vKqv; Wed, 07 May 2025 21:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zt7rc5h94z3lq6; Wed, 07 May 2025 21:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfoivQR8h1Nn0y0R4cdO39C08JTmmHVsDz5qQiD+K0k=; b=kR34NHUeyMtreG1Q8HNSt8vp6ostd666iLt74c5iUxoBl2F9/OR0Stks8HVxKtbbehHjPE TJUTNg/toz6B8JbweqMedsJt8qIx2Dw6xb61ca21tKWxd99eiU9Q66tq9nzgYdnXl/sA+c r+m5JkOn7Q/KPMI5iT5eWXNIUHGoIQkpBIDOWfjQSnCrOGeVVtqZYDr35da/5jK2N5zcXw jCbzUXSaLbhTXR1+GxdLqZ8lBYSLmt/1fGfPyvjjY6loNP9HNa4AUk20yB2K3TOs9+yA9m WY6AKFDQsED2q/n+LHerMlLZCWJznW34BfcdZ3dHXrldYXeyrGmg4cPWC9o5RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746653824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfoivQR8h1Nn0y0R4cdO39C08JTmmHVsDz5qQiD+K0k=; b=YT/SunTsAcI3O+ZNvGcou7jrlaoOPqf2skYzd90TLqtyeiuscKi9Sps8mQQhyKT2MDHBLg 56V2xyNTdRDbkybNwe5Zq0z72G6GWw+gnlKhd12P+3pO9KJzCd8AR4f2E5RWDs4tRQPPda DMYYfAYD3GlNyiV8MPZNqRT0RTXP8arH10hIsKsLinuSZWrHMziPkN8Ma+JoHe9mdLMeGL jMh8Q3wy1Lijlf1ycGo9s0l0I7Q5Q+6FzaXn6uyfJkVMEYSeChQqEdbXq4BHfQZBWdSmf7 Ppbt1Tw2zAJzpV9qp+aRCNWvYABMVq4gaNdsFF92+PHRvSCETgOTXmghJ3S4PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746653824; a=rsa-sha256; cv=none; b=aMkLFtW42J/1L+FO92NynT06WENJm36Niixfmioo9hJW3O/al33WN1ApDylgtYg5ESsJf7 avQrLDSwwDBhcDjIJYSyIAQoVCOIFuJLX6hzIDVh7aFdVdBnxZgs7moo8HfeWRayN8L8ER 6VTiFvf8Uah5q5nYk9sygMuZmtg+X3XTUsGuf8YvmfubNLBBlIXCDYtTQ12zIZshLZL3Zs jf4P40gbeOJhRz/FwpQMIgPhBGICpUrezfG0EWGD7rGEI36GjVz9KSZwE9cIhdYgfovgPT 7DiqF5hAauLrWhz6wAJnFCC2CF4lsb3ZTzqqWNtkb8+sPHWr0cm1dmz67TV7EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zt7rc54h7zn7K; Wed, 07 May 2025 21:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547Lb4h2091919; Wed, 7 May 2025 21:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547Lb41W091916; Wed, 7 May 2025 21:37:04 GMT (envelope-from git) Date: Wed, 7 May 2025 21:37:04 GMT Message-Id: <202505072137.547Lb41W091916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 668cef02ce8c - main - umass: Move illegal opcode return to a function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 668cef02ce8c9a9bb9862e98c55a2fe15030e042 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=668cef02ce8c9a9bb9862e98c55a2fe15030e042 commit 668cef02ce8c9a9bb9862e98c55a2fe15030e042 Author: Warner Losh AuthorDate: 2025-05-07 16:06:59 +0000 Commit: Warner Losh CommitDate: 2025-05-07 21:36:54 +0000 umass: Move illegal opcode return to a function Move illegal opcode completion of ccb to its own function. da can cope with a number of different failures now (it didn't used to), so we should return the unnsupported commands as illegal rather than faking completion. This will allow da to, in the future, do more intelligent things in response to these quirks. Other SIMs will need to do this too. Differential Revision: https://reviews.freebsd.org/D49465 Sponsored by: Netflix --- sys/dev/usb/storage/umass.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index 3e5cc9a7e084..145c2ba81b3c 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -489,6 +489,7 @@ static void umass_cam_sense_cb(struct umass_softc *, union ccb *, uint32_t, uint8_t); static void umass_cam_quirk_cb(struct umass_softc *, union ccb *, uint32_t, uint8_t); +static void umass_cam_illegal_request(union ccb *ccb); static uint8_t umass_scsi_transform(struct umass_softc *, uint8_t *, uint8_t); static uint8_t umass_rbc_transform(struct umass_softc *, uint8_t *, uint8_t); static uint8_t umass_ufi_transform(struct umass_softc *, uint8_t *, uint8_t); @@ -2262,20 +2263,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb) */ if ((sc->sc_quirks & (NO_INQUIRY_EVPD | NO_INQUIRY)) && (sc->sc_transfer.cmd_data[1] & SI_EVPD)) { - scsi_set_sense_data(&ccb->csio.sense_data, - /*sense_format*/ SSD_TYPE_NONE, - /*current_error*/ 1, - /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST, - /*asc*/ 0x24, /* 24h/00h INVALID FIELD IN CDB */ - /*ascq*/ 0x00, - /*extra args*/ SSD_ELEM_NONE); - ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; - ccb->ccb_h.status = - CAM_SCSI_STATUS_ERROR | - CAM_AUTOSNS_VALID | - CAM_DEV_QFRZN; - xpt_freeze_devq(ccb->ccb_h.path, 1); - xpt_done(ccb); + umass_cam_illegal_request(ccb); goto done; } /* @@ -2463,6 +2451,29 @@ umass_cam_poll(struct cam_sim *sim) usbd_transfer_poll(sc->sc_xfer, UMASS_T_MAX); } +/* umass_cam_illegal_request + * Complete the command as an illegal command with invalid field + */ + +static void +umass_cam_illegal_request(union ccb *ccb) +{ + scsi_set_sense_data(&ccb->csio.sense_data, + /*sense_format*/ SSD_TYPE_NONE, + /*current_error*/ 1, + /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST, + /*asc*/ 0x24, /* 24h/00h INVALID FIELD IN CDB */ + /*ascq*/ 0x00, + /*extra args*/ SSD_ELEM_NONE); + ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND; + ccb->ccb_h.status = + CAM_SCSI_STATUS_ERROR | + CAM_AUTOSNS_VALID | + CAM_DEV_QFRZN; + xpt_freeze_devq(ccb->ccb_h.path, 1); + xpt_done(ccb); +} + /* umass_cam_cb * finalise a completed CAM command */