From nobody Mon May 25 08:11:33 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 298A1413D85 for ; Fri, 15 May 2026 19:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874738; cv=none; b=e2Xp3RhppJgjYVu2WZhnUAziAcIccxJSfs9rRhpxSHqxARw1a+GsEWGK48TGO1I14uTTB9sc1LTkFjvth2dT/dP9/mR7QyO/QgHxfeRW9FVYPFp3LGWtVBNA+m0CYB2D/z+DuHUCGRB1ojV+OXB0O7j3e947zstzQD3ekthZfjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874738; c=relaxed/simple; bh=rJ2E+SYstgHNYg9HfJKlddTJtm3NiuZdSrdaEV/cX7c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oD8ox3CCsUsYvzkkfw1SzGzbcD2duI3uXJIPy7Lof/+KQ8eDLpVxX5KYh//GFbsbsJ5tR984FSTLf4NSgvhzO2C+QAtRyhBcpCsYZkIKwUSYi0XQZwbQi4JgBNrUgUNNBm1toSQ72iHWw++LN6JIkjwh/dcOZDQzsnx1ImDbrcY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RLcYjjIz; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RLcYjjIz" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-48fde648a71so809005e9.0 for ; Fri, 15 May 2026 12:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874735; x=1779479535; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WYGTmQCcIfU+DrKSQlrVJ+uS7PIB4cLCZstWsw7lcqY=; b=RLcYjjIzmr03yuEPcvfmPkF0kIwtRTkWIQKOdYNokKaf1l4nnceJsrZhR5u2w+dicO n1kJBJtYvc0gXq5d3Hz6oZ3GA43+IzYNemJEPLXT3BmwuSefWrbRuEsQnTPEKiZ5Z5Pp MNJ1CBAfb/XXDiCn7MUGayDF7o/6AOGya09XIREZknTgEqoeWwUZ65vYsHrNc+Fhz+b2 ndZyfNKT2PMb3h1lZdNjNNeN9EramZetm4rGAsq+PHKRtq1vQOgtfPim5FWQje67AlVD IsMf8Os4jObhH+StvW8prSYjGV+T+0/u1OLwJ5n0QM01APxI27sotUs0mUWGAFdO67Cr WgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874735; x=1779479535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WYGTmQCcIfU+DrKSQlrVJ+uS7PIB4cLCZstWsw7lcqY=; b=oELDvmfQR2+7dKriVzOy9jVAokQth2Jn8I4vOlDrRqrD0Bicwf+bYNHJdGh/wXp+66 RgL9gJIxEWxmgSz5Ek//7dvENYRwGyHWzVpFxEP/RSX81P5jqkbqWJO8IZh41uRJLSJJ BmBxwRk2akkDNgnMTYhGil9H7pAXJLcLZSin3UsSv7oiy/+PxUOl+P2i7tiiMSQmsUmK u6ZRJ3oubvX0IskRGbXeMPdwWLWlVBBvqGnNthWU90l3KuCmFIjb8Vvf2hWc3vNrWasq KUTyAMueUYGZn91Kmdr14poJrqLD6gFEspLOKDDX6llYDiVd5Q+y7xWJBh5PXcqC6UEg fQlQ== X-Gm-Message-State: AOJu0YwvRu/pFDCL+kDegGBSgKPbbtu1Ci3mk6krQP+aaJXGIgU+TBZk ohSYWf+5MG6E3ii5iy2NlZJGQ4bkVkGBqTwuxcFVnrTS2wHVg42KXEU= X-Gm-Gg: Acq92OGawKAUsNjv64HV/sq0uv/hRyLCU7YMdHx2G2Ibg/8YDp3YUDNMAfEUsxXaRHt E/DgkBX5ffC96UKeRQwVtZeDuP5m/paRX+qEXkavgftF3Uu0shT2LkwLRZisIxNCJnuAgoEP/Bg mIwIQTTOmyMupkfBDEaX4mctJmO40MvhIFq5SY2AIKwPMTew9CTy+SSG0FB4xyvZ5pWhZErghqT sEGGD/JrxdwFzvEZ4hGTyYXdRYKhXPPJlHIPOhqzkE1ccYFXNhJaO9vX+7Lfrv2znnU9G6nUn+w szYursTpxN3J+goGbpYmoxoJUfmB3fahq4COB3MWi27swqq7Hbr62NFIUduAkE5jYqseFWs4Yrv jGdPAhMcyKwLLnfi4lHT5I/7AHSAe0N6veT7ezyMypUJcE/QydRDNpYW9cqm/hz8NIMUzIHdexI SGASq/2ya8gMJuM8BEe6K9iLzd4sMv4hx+YyCdOeOTU7QzIGaLZP1dVtX7/Uc7WkbFuc8cWDS+m ElbcArIWODDnXb6RA== X-Received: by 2002:a05:600c:8906:b0:488:aa33:dc8f with SMTP id 5b1f17b1804b1-48fe486cca4mr71178485e9.0.1778874735415; Fri, 15 May 2026 12:52:15 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb24:41ce:1d7:fad9]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48fe57943b2sm82007505e9.8.2026.05.15.12.52.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 12:52:15 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: linux-kernel@vger.kernel.org, Florian Fuchs , Adrian McMenamin Subject: [PATCH v4 1/3] cdrom: gdrom: replace port I/O with MMIO accessors Date: Fri, 15 May 2026 21:51:09 +0200 Message-ID: <20260515195111.3295031-2-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260515195111.3295031-1-fuchsfl@gmail.com> References: <20260515195111.3295031-1-fuchsfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" GDROM_DATA_REG is a memory-mapped data register, but the driver uses outsw() and insw() only for this register. Replace this with MMIO accessors readsw() / writesw(). Before, it oopsed accessing the data register, as the io_port_base P2SEG gets added to the argument in outsw() / insw(), which leads to an unusable drive: BUG: unable to handle kernel paging request at 405f7080 PC: [<8c28d5b4>] gdrom_spicommand+0x6c/0xb0 Acked-by: Artur Rojek Reviewed-by: Adrian McMenamin Signed-off-by: Florian Fuchs --- v3->v4: no functional change. Sort trailers. v2->v3: no functional change. Added Acked-by from Artur Rojek. Added Reviewed-by tag from Adrian McMenamin. v1->v2: Don't use helper functions with io.*_rep(), but writesw() and readsw() local in the respective functions v3: https://lore.kernel.org/linux-sh/20260423194132.693271-2-fuchsfl@gmail.= com/ v2: https://lore.kernel.org/linux-sh/20260419162823.2829286-2-fuchsfl@gmail= .com/ v1: https://lore.kernel.org/linux-sh/20260405082330.4104672-2-fuchsfl@gmail= .com/ drivers/cdrom/gdrom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 4ba4dd06cbf4..094d55b2d004 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -198,7 +198,7 @@ static void gdrom_spicommand(void *spi_string, int bufl= en) gdrom_getsense(NULL); return; } - outsw(GDROM_DATA_REG, cmd, 6); + writesw((void __iomem *)GDROM_DATA_REG, cmd, 6); } =20 =20 @@ -282,7 +282,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int = session) err =3D -EINVAL; goto cleanup_readtoc; } - insw(GDROM_DATA_REG, toc, tocsize/2); + readsw((void __iomem *)GDROM_DATA_REG, toc, tocsize / 2); if (gd.status & 0x01) err =3D -EINVAL; =20 @@ -433,7 +433,7 @@ static int gdrom_getsense(short *bufstring) GDROM_DEFAULT_TIMEOUT); if (gd.pending) goto cleanup_sense; - insw(GDROM_DATA_REG, &sense, sense_command->buflen/2); + readsw((void __iomem *)GDROM_DATA_REG, &sense, sense_command->buflen / 2); if (sense[1] & 40) { pr_info("Drive not ready - command aborted\n"); goto cleanup_sense; @@ -612,7 +612,7 @@ static blk_status_t gdrom_readdisk_dma(struct request *= req) cpu_relax(); gd.pending =3D 1; gd.transfer =3D 1; - outsw(GDROM_DATA_REG, &read_command->cmd, 6); + writesw((void __iomem *)GDROM_DATA_REG, read_command->cmd, 6); timeout =3D jiffies + HZ / 2; /* Wait for any pending DMA to finish */ while (__raw_readb(GDROM_DMA_STATUS_REG) && base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f --=20 2.43.0 From nobody Mon May 25 08:11:33 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EF6F318ED9 for ; Fri, 15 May 2026 19:52:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874739; cv=none; b=AbaRtFQ8oRcGsGQ3j3yzqaLkiaJevl6rV5gDx+WIekXKm+jONU1DpVyL0yCgHdvHcbB25TWsLHuKTnfN5rmMCmO8PmLb4XphBMIeELkzGyVhvY8YSdbUsCbqL7kGyT7M27uLhNuazCa9vmu9MA5gYSv2zlruVFCqU5sMFM8ZzM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874739; c=relaxed/simple; bh=xCVWl4uwmNXrwVsWzgyfOd7sqqVawCo0Cx+xJ/XQPvU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cPM+fdBPStWN1SpXQfe/AAT7+JabOUiVBI4mRGTxW60BEKtLTpojKDZLYjl16qHpWJmGwe/B7wBAM6oLzZwzbmq4i40BLk5P5OAavNGFA2jnb6XKXI7bYGoyH3ZmPJe2MY0CU29CvACsGJZjl0wwA6acM1I7czv/QZnXnJc+ZmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bsaLMlD0; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bsaLMlD0" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48e8132c6d0so1226175e9.1 for ; Fri, 15 May 2026 12:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874737; x=1779479537; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MJLq1riXpJimDOMmlqmNgk87J2NmQiv1+kjxBSblf3k=; b=bsaLMlD00/1vbEGMMn2r6WNae57WkBN2CmwzpAZiEw3TVOx3iZB0GjpLhh/IxN4Wkt OMOP4dAPRruUgkmIh3RNhE38UsS/4JIUr39CAiDpdk4B4b00ZGTREOrL8OX5yKALJWT9 TaL7KCg3v5d2kWN4t9QlagO02lR38fvhXU9HYVGWMbPPwVuNwNlAyqjaSj6aoRkMkY/B zjHS+bvoTWVCnGVdiD2gyE4TqoeGpZARKBy8Y6+dngSY3IY3pynUizFYs5m5cdCnCFIA y1y38ey0WmsEYSKMiCQdVGh3CsAw+3scFI7qCS2vpNUK5rh7RUngMnr3m9AWdZfGE/b7 iZLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874737; x=1779479537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MJLq1riXpJimDOMmlqmNgk87J2NmQiv1+kjxBSblf3k=; b=X4b4vReJ+vX/6xKKnQ+QQJiKI/VaZ38U+F5HXNBCNVLlORSSxwewdj3shoawSJLyZ2 GmtTziIJdkfIYBPM1pwwaQ2npIOwqCqmr5lZB9KYSqk6tSAT62vm9+ceHA7mLR6ugUsf Z61GcauMv02DwMgLs3LcozCzPpC4/CFvqMa5JYYhK7gbyx2kRcSVRC77NBDlGh3TRvbh CUj1vp22uNw5bNM/+2bkesi7Jf+omOXT8sDM4Me25EgaaUJ0vQzXm3N4SzNvS1/46b1v kVOgfoVg6VzZpkE/bkU2fmd81wzUkJPOMbx7b1N5/AVkQt9Uzwi4N4raoOqLxqu5RSRI 17Rw== X-Gm-Message-State: AOJu0YxvrhYv5LToE1bg3kHyTdJP/AlpNFJuVqp/p1p37OuXc4Q7ajR2 euvbtr9+43ThX8t1soP8LI8z8SzBLXElWmJKX10ZedY2zbf84Bkze3A= X-Gm-Gg: Acq92OGtDqFSqy0wETqte4wQEXnpFyHPVO6mtGwKVK1TGyJxeQb+S2IAmUi16+DJD73 p6mWrry8DxHiq8eSwSETzONgj3AzSvA0r47hdfSoMCmTWsl9wAwfe3uHcghJD2UO0PC2Y+bO0RK CpeKyBqtbQhEdq9I9ctLlOOCGhA57zwb7F+Q+6xpwbsi1Y8L2iQN6s0Ia4gc325A5apg/odPkkd wHqPUfFA4H9ZjJvheEPmz9+9hjjFYVyinQgi6Oti0Jl+o+bObGqGQXz8dpFKl1qMQbu3gn3g+Pu bGVO/X1Au2yrSB9we2NE38kKTUmzhWe8ev/bOIw6OPpp3HexryxsHWgV1RODhHsfF7HLFUocY40 c6nM3m0jNki1C/2qhpCYFmVGzUcybeN9gLV3WVjnWJ1ngjeXPN3qjgQQVTizH3RFkDtLdNZqt4I rkFVnSmnarHjtWj+KpI71iObNx3N+4NRZk5gCVpwHetRKnqPrPmPA7quBroIFCLKD5DAd2lVxTv hlcZiY= X-Received: by 2002:a05:600c:1389:b0:48f:de4e:882b with SMTP id 5b1f17b1804b1-48fe60e524dmr74554545e9.6.1778874736500; Fri, 15 May 2026 12:52:16 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb24:41ce:1d7:fad9]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48febf81970sm29065065e9.8.2026.05.15.12.52.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 12:52:16 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: linux-kernel@vger.kernel.org, Florian Fuchs , Adrian McMenamin Subject: [PATCH v4 2/3] cdrom: gdrom: update gendisk capacity on open Date: Fri, 15 May 2026 21:51:10 +0200 Message-ID: <20260515195111.3295031-3-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260515195111.3295031-1-fuchsfl@gmail.com> References: <20260515195111.3295031-1-fuchsfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update the gendisk capacity of the media. Without the capacity, the block reads fail before reaching the request queue, which prevented ISO9660 mounts. Refresh the capacity from the TOC leadout in gdrom_bdops_open() so it checks the inserted media. Acked-by: Artur Rojek Signed-off-by: Florian Fuchs --- v3->v4: Simplify condition in gdrom_update_capacity() according to review feedback v2->v3: Also add quirk to handle proprietary GDROMs, using the same mechanic like in gdrom_get_last_session() try session 1 first for GDROM, then session 0 for CDROMs. Dropped Acked-By due to code change. v1->v2: no change for gdrom_update_capacity(), but for gdrom_bdops_open(): handle the failure case when gdrom_update_capacity() fails but previous cdrom_open() succeeded, to cleanup the successful cdrom_open() with cdrom_release() v3: https://lore.kernel.org/linux-sh/20260423194132.693271-3-fuchsfl@gmail.= com/ v2: https://lore.kernel.org/linux-sh/20260419162823.2829286-3-fuchsfl@gmail= .com/ v1: https://lore.kernel.org/linux-sh/20260405082330.4104672-3-fuchsfl@gmail= .com/ drivers/cdrom/gdrom.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 094d55b2d004..603429756a34 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -474,6 +474,23 @@ static const struct cdrom_device_ops gdrom_ops =3D { CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, }; =20 +static int gdrom_update_capacity(void) +{ + sector_t cap; + + if (gdrom_drivestatus(gd.cd_info, CDSL_CURRENT) !=3D CDS_DISC_OK) { + set_capacity(gd.disk, 0); + return -ENOMEDIUM; + } + if (gdrom_readtoc_cmd(gd.toc, 1) && gdrom_readtoc_cmd(gd.toc, 0)) { + set_capacity(gd.disk, 0); + return -EINVAL; + } + cap =3D (sector_t)get_entry_lba(gd.toc->leadout) * GD_TO_BLK; + set_capacity(gd.disk, cap); + return 0; +} + static int gdrom_bdops_open(struct gendisk *disk, blk_mode_t mode) { int ret; @@ -482,6 +499,12 @@ static int gdrom_bdops_open(struct gendisk *disk, blk_= mode_t mode) =20 mutex_lock(&gdrom_mutex); ret =3D cdrom_open(gd.cd_info, mode); + if (ret) + goto out; + ret =3D gdrom_update_capacity(); + if (ret) + cdrom_release(gd.cd_info); +out: mutex_unlock(&gdrom_mutex); return ret; } --=20 2.43.0 From nobody Mon May 25 08:11:33 2026 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5295430C144 for ; Fri, 15 May 2026 19:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874740; cv=none; b=lT3YF2ny2JJJpxRC+sTx6dR6i3AM3lhfp4vnSqO/T6Tv273d0FZOSg88UtndZCqUWkkJyN44nFn5OxYxBQCgdfOxv2okFrNGlii5cYEkuIpRo+LUSXIKvw0rlL9B2dwOJuUYgl1kHWvn28W/6E9Q9m/cSZQEWi5EzbweJ96rO7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778874740; c=relaxed/simple; bh=6Ha/PEb51xP7chSZP65EQUMcHr107gh+nEamCTAJ2vo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=expfpwaWJqHfj67/PuLD+7jOuTKEcx2jGEzy6Jdtcyn6HVtjN5Vp4bRNDshnj7OXl+BnzHKZH9jjcQjPNXqI5ArmKhycqVfCvoddHPXPuHN4dlx3Fn3nJ7ZGsgMMv76pPNAcKgaMAdS59NEUU3c1EdczbA4SHhENjZMChQ5HdKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LOBMPq/H; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LOBMPq/H" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-48e6db3ff7eso994225e9.0 for ; Fri, 15 May 2026 12:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778874738; x=1779479538; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SPTAPHrOG00PlZmvn0SKpT8YOBlYRF/erWrb3+8AUB0=; b=LOBMPq/HMEYT8MzaR0H9FQWzyMZqVFaqDz1iaEI7Ssai0dDOXF21Lllmg4L2sQ9HRr Nw2jvqyAV8Ksh7XpfLMYSvXba/TYfqzZBy82WtFmuOHqLE6EJWVaYcmW9j1FC0V9OHgl xbfY0bAf/Noe2KUIhN4084Ym2DW/zr9Y5CLfXkjCSPWBcbcjlX8RbiZjCzteOHX6ZKe9 1tpkTcQv1S6pts65YjyFW2mHHoDoXHnO1wkSLiM+5iPWCkSZsPtAkAdbFgnFgdlXPWkp CaVArR6xFtm/X2RjMMLUHFaOxn2YjR63uY76gWpsi0uxUoGKb9S57xzq4jtV/rroBVWJ iHsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778874738; x=1779479538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SPTAPHrOG00PlZmvn0SKpT8YOBlYRF/erWrb3+8AUB0=; b=TCBFKeakkKmPns/q3r3hWgjlf6Q44UYaE7CbXA7S4+hXT4LSRZJtsTtPwx9aV1/Oj8 lhRT5d6QyylcDLu/diTsGS6piFFIKac0IvXbILeUgMs/dGGVWgbUuwyXrG5lW6GUscGG qh2hnvx1la2jVbC3oC9EXgtEps5p0XBqYD7NDWq9YuD/hRfROyIW20ACQ5U4VDdI4ZhS p9jE05jwjcV7kreogPgD37gw6xSrzpo+cQifeKoTPG8eIeemDAGt2mfHkrl1tvSYoMlE 7WlZFRUL2Le4lrpYB71qCA5cByh4bEyyjblW2LxjsUFiGZr2lNoUX+fgfXPyEj+9kib6 XjLg== X-Gm-Message-State: AOJu0YxdKpam0a84ge1cNpJjI9dgGuS+R/PMlCvGd8mmVfznTYdE568a IWWETTd7+QNHwkimmBmiZPPyUWznTdiL9mSxknlcuOPpdubTqkLVNg1S2s4zvCs= X-Gm-Gg: Acq92OGc+y1rNrTue960nIwqv7WVs5qJg6vWX9h/ZqDED9E68wUHOocMkxY8xfpO09h md5ieeOJsjWZi4ZoTb+xRIAj6qOZ2JWnqGll+Jb8TIJLhjQ83rJm1gV/IEMX7EuXdlwSeZw5CBa U3YHuvHRl/0+qC921n3VNJIoES+3+qnJwdClsxr/PA73clYRStUnlUcycGXWjWrPH+AfdzpNelo CaNuYJODDIAAEAaJxQq083ckkgVtrH9Txdjs6UWrdCb8/BNh5+liEtZy8CzH5tKXvisLfI1YO2x qThWTAQPkjkdfwdDgpiLEzPyjxrQiouOYm6kTK4bVkGkqNws8AFH+ZEHNIZSQ3yytRpaC7/qmnW XqJv66RFOiRc9Flcy6UovfUUbbkf4Dza2HrwyczX8aoz3vMTkSJQ1Pn6148udrqLr81XHGba8DR XtkyjeLvlMD2j1txKhKd6LE2ex14WIU2zIuONbnbLRGOF6aUkj6LkRxT51/BSrJkZbfPztgQsHy mYEDn4= X-Received: by 2002:a05:600c:8189:b0:48e:89f9:9408 with SMTP id 5b1f17b1804b1-48fe632374fmr82858405e9.20.1778874737711; Fri, 15 May 2026 12:52:17 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb24:41ce:1d7:fad9]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48febe81b2dsm20062395e9.34.2026.05.15.12.52.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 May 2026 12:52:17 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: linux-kernel@vger.kernel.org, Florian Fuchs , Adrian McMenamin Subject: [PATCH v4 3/3] cdrom: gdrom: verify device access after disc swap Date: Fri, 15 May 2026 21:51:11 +0200 Message-ID: <20260515195111.3295031-4-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260515195111.3295031-1-fuchsfl@gmail.com> References: <20260515195111.3295031-1-fuchsfl@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Artur Rojek To ready the drive for cdrom_open(), this driver sends a spin disc command. However, if the cd lid has been opened and the disc de-spinned, the very next SPI command will return UNIT_ATTENTION sense error, resulting in a failure to mount the disc. Fix this by sending a dummy TEST_UNIT command, which will catch the above error, and allow subsequent commands to execute correctly. Signed-off-by: Artur Rojek Signed-off-by: Florian Fuchs --- v3->v4: no change v3: new patch added from Artur Rojek and also verified that it works. v3: https://lore.kernel.org/linux-sh/20260423194132.693271-4-fuchsfl@gmail.= com/ drivers/cdrom/gdrom.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 603429756a34..0827f4f0344d 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -219,6 +219,33 @@ static char gdrom_execute_diagnostic(void) return __raw_readb(GDROM_ERROR_REG); } =20 +/* + * Test unit command + * byte 0 =3D 0x0 + * + * This command verifies whether device can be accessed. + * + * -EIO indicates that device is not ready for operation. + */ +static int gdrom_test_unit_cmd(void) +{ + struct packet_command *test_command; + + test_command =3D kzalloc_obj(struct packet_command); + if (!test_command) + return -ENOMEM; + test_command->cmd[0] =3D 0x0; + test_command->buflen =3D 0; + gd.pending =3D 1; + gdrom_packetcommand(gd.cd_info, test_command); + wait_event_interruptible_timeout(command_queue, gd.pending =3D=3D 0, + GDROM_DEFAULT_TIMEOUT); + gd.pending =3D 0; + kfree(test_command); + + return gd.status & 0x1 ? -EIO : 0; +} + /* * Prepare disk command * byte 0 =3D 0x70 @@ -353,6 +380,9 @@ static int gdrom_get_last_session(struct cdrom_device_i= nfo *cd_info, =20 static int gdrom_open(struct cdrom_device_info *cd_info, int purpose) { + /* Sink pending UNIT_ATTENTION sense error after a disc swap. */ + (void)gdrom_test_unit_cmd(); + /* spin up the disk */ return gdrom_preparedisk_cmd(); } --=20 2.43.0