From nobody Sat Feb 08 21:43:13 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 4Yr48K5Z67z5nFhT; Sat, 08 Feb 2025 21:43:13 +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 4Yr48K1w3qz3NVN; Sat, 08 Feb 2025 21:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739050993; 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=sn+Y0f63OcF0lfVFD7Np7OwNZVRgE0+K25TX6pNETos=; b=Li1n6WbhXPGS3nWtycdgHj+j2kkzLWghQBYzTJhGV7EGsOQLjhzmwUeYDMgdA7fhcw566E GU5jlRaPXik3hFvzGQ0tu2XMIdK4WSiMG1W79jclIO8ErnH89bXe5t/B3xVnIiNGiiqoPx CtKmEj6l28HoHdON3W1g55/UMTb+O3BW6xqw+5yoiU1wsDcgVcNA33kDuPdKdSWuTLG4Sf WycgXDFkRox0CswUBllNI+ghyoiqgZTjiBXDrZhJQmbNqvkK50m+hO874nSHQAt7dmDCHN JvLdzyhXiuQrp6msQk8z4pzxy4GEcug98C2bE7Lempu2hW3QDlrwJpAFmSBgtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739050993; 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=sn+Y0f63OcF0lfVFD7Np7OwNZVRgE0+K25TX6pNETos=; b=VBG5dcPweTg92F/29weGZzdZiMQ3vgYGz2HyegvBpWrwIV8IdEBTqwvaBDMHSbRrDTfQFO 8u0gTFn2DbZKXGDLOJT6B+Z7MrhbRUm6/DaN41lAPI4EQnzumoyaVRffc7h9udUeEO62wI QlDuxuUsMHnLMAfcHzXLiA6O/KiR08GQw/fm20zczNgLuNKr+AVRkrrVnj+pRNCNIQh5ON jyqchjbZIRPdBQFDDAgTNV5oFoDVV78nRSpD59SDeGffa0M0XaiVMtzxmF7tUuQlvDKO6L +84kzJR9VIz++L38kfF5709HBcDJYlT4cAzFtre03BQMNCWkhArei3MkE1mBGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739050993; a=rsa-sha256; cv=none; b=hw6tUb/sqlgGmZB/A1GCDI8Sla4LYzJ1J7LfNbcTX7UvxTYrHuncqifVNieCLYH8OEfnwQ 3iDaYtDCuXvGVkVaR9yYieggyYC0GMHhgolviMfsqSRo/3bBvTiRT2+SRPnrcYVzYbAyDk RUWTSoTFx5eWxGkpqWrpLaCSLSL4tkYer1sQHxtxruQonhWtvppdi2yArHquRbaw1KYSmR VIeRh0hUpqBhUONIqNX2G5RjskdV1XaB7if3rzZIZ1057jpePvOvGWP/YwGMSatc5csmS2 OGC8jjz48J1ARANJySzBlgOvSqBtvI9Af/cpae8kwFV/tSEcfB+YdvBRU3iy6g== 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 4Yr48K1WHtzBxH; Sat, 08 Feb 2025 21:43:13 +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 518LhDiR097610; Sat, 8 Feb 2025 21:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 518LhDYa097607; Sat, 8 Feb 2025 21:43:13 GMT (envelope-from git) Date: Sat, 8 Feb 2025 21:43:13 GMT Message-Id: <202502082143.518LhDYa097607@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: 80d0d1614cdc - main - cam/cd: The SAW_MEDIA flag duplicates VALID_MEDIA 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: 80d0d1614cdc91acffa9b2e1dc73e47b21e78b8f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=80d0d1614cdc91acffa9b2e1dc73e47b21e78b8f commit 80d0d1614cdc91acffa9b2e1dc73e47b21e78b8f Author: Warner Losh AuthorDate: 2025-02-08 21:40:28 +0000 Commit: Warner Losh CommitDate: 2025-02-08 21:40:28 +0000 cam/cd: The SAW_MEDIA flag duplicates VALID_MEDIA This change mirrors what we do in da. Use only the VALID_MEDIA flag. SAW_MEDIA was just used in one place. Transition to using similar technique to what da uses for valid media. We seem to handle media being ejected while we're doing I/O correctly, both with prevent-allow and without (though the former threw some vendor-specific errors before returning seek errors). I could only test USB attached DVD (over ATAPI over BULK). I couldn't test it with SCSI CD attachment, sata attached CD nor parallel ATA attached CDs because I no longer have any of that hardware. Differential Revision: https://reviews.freebsd.org/D48841 Sponsored by: Netflix --- sys/cam/scsi/scsi_cd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index ec6e31d49b22..00a417f65052 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -103,7 +103,6 @@ typedef enum { CD_FLAG_NEW_DISC = 0x0002, CD_FLAG_DISC_LOCKED = 0x0004, CD_FLAG_DISC_REMOVABLE = 0x0008, - CD_FLAG_SAW_MEDIA = 0x0010, CD_FLAG_ACTIVE = 0x0080, CD_FLAG_SCHED_ON_COMP = 0x0100, CD_FLAG_RETRY_UA = 0x0200, @@ -1490,7 +1489,7 @@ cddone(struct cam_periph *periph, union ccb *done_ccb) softc->disk->d_mediasize = (off_t)softc->params.blksize * softc->params.disksize; - softc->flags |= CD_FLAG_SAW_MEDIA | CD_FLAG_VALID_MEDIA; + softc->flags |= CD_FLAG_VALID_MEDIA; softc->state = CD_STATE_MEDIA_TOC_HDR; } else { softc->flags &= ~(CD_FLAG_VALID_MEDIA | @@ -2886,13 +2885,13 @@ cderror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags) /* 28/0: NOT READY TO READY CHANGE, MEDIUM MAY HAVE CHANGED */ disk_media_changed(softc->disk, M_NOWAIT); } else if (sense_key == SSD_KEY_NOT_READY && - asc == 0x3a && (softc->flags & CD_FLAG_SAW_MEDIA)) { + asc == 0x3a && (softc->flags & CD_FLAG_VALID_MEDIA)) { /* 3a/0: MEDIUM NOT PRESENT */ /* 3a/1: MEDIUM NOT PRESENT - TRAY CLOSED */ /* 3a/2: MEDIUM NOT PRESENT - TRAY OPEN */ /* 3a/3: MEDIUM NOT PRESENT - LOADABLE */ /* 3a/4: MEDIUM NOT PRESENT - MEDIUM AUXILIARY MEMORY ACCESSIBLE */ - softc->flags &= ~CD_FLAG_SAW_MEDIA; + softc->flags &= ~CD_FLAG_VALID_MEDIA; disk_media_gone(softc->disk, M_NOWAIT); } }