From nobody Tue Mar 25 03:02:26 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 4ZMF8M6rZQz5rs8R; Tue, 25 Mar 2025 03:02:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMF8L6rZjz43Lq; Tue, 25 Mar 2025 03:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742871747; 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=xUUjSi7N0WZzwQLPqNEwhU/Xy9QVQP8I/HgWskxRktA=; b=XzobbvPjX4nQR0ejSZQF7wjLNprb3JHSSJZ6ZVmGAgNeyeUYz3QkGfm3NY4jOhNXokmrU0 KhYlWuvomJxDQnF/oJ7so/ouSBBjypmreruWlg064lh5QPEhaPOzjvYSLj0mU1B634nJOh idcQJyYLJMPENJv/0kwRWfmam1uq/HeThAp5V5oguWRf0Z0oU+Vhh5yZRDmmmlwP9K8h9z /AInk/rqEcMp5vqogNN0ExquRtgEwybXwTvBZRxy2I2Q50Fvyl5Wz2on+eHfPpIb/vpDHl bP+9hyDSB0ZY7wppZYUhhyQZnmBTmizps/tZWfw/08fNksfGCJuefX1ZykcFmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742871747; a=rsa-sha256; cv=none; b=MKzXANWdGoaE3rg4F8EtarniKvnFB2XkeLUHICCmBiAKc6s+Z3W4p7il+CvidqebYwk9KT 5Q0lbs/wsnpzecRLTFkurTbc7j+7zNoMt4ghkSHYLLdJBWobzCShPMZaVnJ+HgpNpnAkC6 /l+xEJEB169ZTfSJFnTKD+hbSEFgIuyLOCLxGsT4w+XT7I3IOcX9R0HZKl62/jr4ErYbSs 9G+xi4P+/xLo70PVasGSf/xcEgSL247O+IjZspP4SOGjzuZ3nbHftCdt8pKlpIjU7hAyr6 jet//X/PmJ+Ndksc+DJB5bigSI3ZB9obJ8RtX2uCWBAn2qFytL6M20xfloDX7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742871747; 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=xUUjSi7N0WZzwQLPqNEwhU/Xy9QVQP8I/HgWskxRktA=; b=KzX68MU/n0TqAIj8wrAJybsT+G7o/WJRjbMiV4/1A7u7q/RgBA6wO1t5hbeBJ9/iwJe2bC RuaKUf0AR7RaXp45P+cTUyVTHZZ+jXPZySIMNJmGz8pt+uviTLs/3EcWcag1BqKFb+xH5v AuD4lplSNDCSVGCFJ2O6IxoSlzqOmX8qyklRp7GAT+MfTOzOlAyKCLvkFMdKGMonTpio4e hzIkElIy4B1D78MXOxkrUzRZz2bFs26yE9QHt8JOCgjSYQ7i6Bb4fjOF6+1dgaOzJbH5yg HyYgaFY47JakEb+FCxmq5H+mzQMDmlNyL/CjI2NNERYeFQQSahv4NXJ/Ft5m0Q== 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 4ZMF8L6S6Dz6jc; Tue, 25 Mar 2025 03:02:26 +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 52P32QAu037647; Tue, 25 Mar 2025 03:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52P32QAv037630; Tue, 25 Mar 2025 03:02:26 GMT (envelope-from git) Date: Tue, 25 Mar 2025 03:02:26 GMT Message-Id: <202503250302.52P32QAv037630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d3a659a338cb - stable/14 - usb-msctest: Be more conservative setting GETMAXLUN quirk 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d3a659a338cbad72bd205e6fc8787a9fb3fb485b Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d3a659a338cbad72bd205e6fc8787a9fb3fb485b commit d3a659a338cbad72bd205e6fc8787a9fb3fb485b Author: Warner Losh AuthorDate: 2025-03-16 19:20:09 +0000 Commit: Warner Losh CommitDate: 2025-03-25 03:01:56 +0000 usb-msctest: Be more conservative setting GETMAXLUN quirk Only set the GETMAXLUN quirk when it causes an error, but don't set it when it returns 0. Since we reset the device when we set any quirk, only set this quirk when it generates an error so umass will avoid it. When the command works, there's no reason for umass to avoid it at all. MFC After: 1 week Sponsored by: Netflix (cherry picked from commit b0375f78e32acd7947d28126a5e165f8139a5a23) --- sys/dev/usb/usb_msctest.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c index d31baabcf875..7b31d9dadfab 100644 --- a/sys/dev/usb/usb_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -741,11 +741,10 @@ usb_iface_is_cdrom(struct usb_device *udev, uint8_t iface_index) return (is_cdrom); } -static uint8_t +static int usb_msc_get_max_lun(struct usb_device *udev, uint8_t iface_index) { struct usb_device_request req; - usb_error_t err; uint8_t buf = 0; /* The Get Max Lun command is a class-specific request. */ @@ -756,11 +755,7 @@ usb_msc_get_max_lun(struct usb_device *udev, uint8_t iface_index) req.wIndex[1] = 0; USETW(req.wLength, 1); - err = usbd_do_request(udev, NULL, &req, &buf); - if (err) - buf = 0; - - return (buf); + return usbd_do_request(udev, NULL, &req, &buf); } #define USB_ADD_QUIRK(udev, any, which) do { \ @@ -803,8 +798,8 @@ usb_msc_auto_quirk(struct usb_device *udev, uint8_t iface_index, usb_pause_mtx(NULL, hz); if (usb_test_quirk(uaa, UQ_MSC_NO_GETMAXLUN) == 0 && - usb_msc_get_max_lun(udev, iface_index) == 0) { - DPRINTF("Device has only got one LUN.\n"); + usb_msc_get_max_lun(udev, iface_index) != 0) { + DPRINTF("Device can't handle GETMAXLUN\n"); USB_ADD_QUIRK(udev, any_quirk, UQ_MSC_NO_GETMAXLUN); }