From nobody Sun Mar 16 19:25:26 2025 X-Original-To: dev-commits-src-main@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 4ZG7Nl3hyhz5qxsG; Sun, 16 Mar 2025 19:25: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 4ZG7Nk708Hz3LCn; Sun, 16 Mar 2025 19:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742153127; 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=SlPAOiArTyeVHhifkjEEM2fVbNjK8gStyEq5nLrwMf4=; b=ceooTJ1E3VeCLwT2OSGExV018lzNoEvQS7/swzx+DXjE7fiFcA7kq9l1j2gEboeO7D5Lhx kXDEgMZCMB/9frKgPIEx1gcQz4I3/qC+wio0Yl0JRyfCKjpOL3d4lcqzhVU74vULvAHnLN 8IZ4FCeDJS7dWeqKNxNDWGXIy7r+Z3+vhos9qrSqdoqRwZn//SXvCNc7mZJADnCoXSlHGp cv3/PNUQEndn1l6Qb5rrSBd8KtB2M+IdjTVBpTtlqkoH0RNFrCfE5EB82FY5LG13YyM/SD yB5wsegZ8S+bVJCz2IHlPt6FUo/s2GzmB5OimUA/qlb1fJPGQPtCbtqIhXgc0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742153127; a=rsa-sha256; cv=none; b=JL1skSApINYSGhs6PbhGW06VY5chMm2X/5wTxl5/UkV7MeI1fZS2EKdmJxmhLueKp/Et47 NCvGO768wVGUPnwKkxIiJ2abQi8TfgZ2TPxXiFrlttAL93H+hpo/uZtzwf7hJcrgAaM9ua D/enwxspELdgRmedk1AhGBu4n/auA15q8pA6Y64vSjQX/iC6cfHSc5szevAUtJqN3M/RCx 9ETyUtpjjuHKulGO5DqanLm60ksSbVrOX46ZEJ+PE353ftWLnBiqaobNu3P4BwJCPeN5AJ N748oU1W/HR7xnbkXZutz1idAFjQ9u97Duom5trJwtaUZHdRgL6zBH1RU2GC3g== 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=1742153127; 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=SlPAOiArTyeVHhifkjEEM2fVbNjK8gStyEq5nLrwMf4=; b=uKXo6Xuv2NfrrAkP5kM7UJS/DGWU2t/HdIHrgfwutP8nZ1bSS61F+ivGVCTBg9QEoGuJOH xY2Yu4gbsdMK//v/uyumCGg6w/wpxDi596ecSQXv/BMKhqD6429jjuqbt/QC7AxMFx4NVr vLLTpAm/pjdSDhmCUVDLZ0s4DwGx7wwueCfoE4x9u+4h5+Rk9+LBrfKBmC6ZhkfGMfI+qU AyJfZrPFlXUmmDp0P8YUQDFOqFYxhZi42aiFSDK0Fmltt/AIXle26ec7tGXz5v7K4/DyTP VnycrVtatbtd3hk/13HH2crw3ey/PCdZVwDb24SBOm+SN6huE/pVjKFcmffx7g== 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 4ZG7Nk6Cs8z1Ctp; Sun, 16 Mar 2025 19:25: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 52GJPQJi015707; Sun, 16 Mar 2025 19:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52GJPQwe015704; Sun, 16 Mar 2025 19:25:26 GMT (envelope-from git) Date: Sun, 16 Mar 2025 19:25:26 GMT Message-Id: <202503161925.52GJPQwe015704@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: b0375f78e32a - main - usb-msctest: Be more conservative setting GETMAXLUN quirk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b0375f78e32acd7947d28126a5e165f8139a5a23 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b0375f78e32acd7947d28126a5e165f8139a5a23 commit b0375f78e32acd7947d28126a5e165f8139a5a23 Author: Warner Losh AuthorDate: 2025-03-16 19:20:09 +0000 Commit: Warner Losh CommitDate: 2025-03-16 19:23:25 +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 --- 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); }