From nobody Wed Jun 17 07:20:37 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 E3F3331E827 for ; Thu, 23 Apr 2026 20:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975663; cv=none; b=hekzH/qyG/thwTnFciQL5fUYHRWAM7+Pn0AK6Bkw/qc6r7cPdPhZnmPE7ZqtxLqnvjwRBVC+QxuImB3DzVJVL8Ly11rk64O1oxSjq5zaJ2qzG0TjuBqVSOA5aCKkuPsT1i+D+eqhCwdiolkSjkkgqaaD1ADTnzb+1rWMMEhDmn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975663; c=relaxed/simple; bh=MItMYgTPqjew35OjcNGzbayMaTYrkGdkOC9phsLKuPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lYsspMQWbpWYnpZ1SdNrRHr5q3M1Zt6zfJC46rgkXBx4inEfyaXhziml2wZhmPT3RrBgClZ/nOUw3sscEINtg8IzegO3/xvZMS/9itxEc0gvUwdpkosgDQiJdj5z1v+X97+81RxG6wIY4lNnCbh80TMutL24M5LoWwBiOBjkkXc= 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=gG3qZaTn; arc=none smtp.client-ip=209.85.128.42 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="gG3qZaTn" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-488ad135063so62870475e9.0 for ; Thu, 23 Apr 2026 13:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776975660; x=1777580460; 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=8uZeS63roDC90AYjgGVCDBffRF1wcD1gyBrAlyIC0N8=; b=gG3qZaTnIhRpa0zcZkIyaaTPfACCihksJdfydohIGbwOFW8RnHoxEXF/CyniCDnQB/ 6LaO/HCnFj5ESZ4uIe16/ISxlvzojcRsxP/BAPGn1SMnkwX44A3XyA2yRX0hKks5pvfx mneD30y+duPPNE/jop65CDzf9JZFR++xIP9jq/YCVlJqchB122/GKcbTbYmalGfHDpS5 NHQoqLZ2mwFj6DFxgQ1uie3Aubh9mZCfIxqc1nVIRcTc17LYs2X9XDq9OBzAyfTX1Hc3 cKjud0bIdLXpQ2uEh2XuK5WZQcPY6wus1WvH/lUt1OlFosn9ltFOzFEW8vJTSOQcR/bG x4yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776975660; x=1777580460; 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=8uZeS63roDC90AYjgGVCDBffRF1wcD1gyBrAlyIC0N8=; b=OCbV6Knh3JD/CgcoMqGTXVzc6vjmexzIo87povHLQYaA889WmX9+RhK7gIo4haLHEj qntAiFXnmKe1V2c/aTgdM9P402Qjl61uBHdQGtwtEMaQa2EUnqgb3SlPC5ymmMesweVD ulHww3I4KGpQvqTdRh8KIzRH6OJtHnKDb4Vsp/vBbaB4eM71r6y1pnhcW2THXoOJnBux V/6+ONFZuzioxYClLMkTiBVhHjK/T8zDjs9h9kGWcNop6wUGIYbb2PD0w2qHNJ70kMTb +H6BCKZKNmipuJZWltZQQJ0oig/1YsKQ5rZldBy8sUE1MMI/kh/vk4MhbOjaA64Mffob n1lQ== X-Forwarded-Encrypted: i=1; AFNElJ8B00aEfxZjC/OBto4a3UqArbB/IPQXg4Cpn2WbF6BQgU87ev7W9KqMFN1I+uKhyz1PyuUnpzFzqBZPn2U=@vger.kernel.org X-Gm-Message-State: AOJu0Yy6W2hoZQ0aEhpLWhI12Fk83US8qmjB6ZdIOdZ5EqoE+a0wpMrK GemX7QrGB/D21jFcDSqof5xasCIGNXDw9q1wa0JH9V3bgx/jRdxcQu4= X-Gm-Gg: AeBDievv2ZSLmqR5j20aMN+656QvXzh97pFZvSN4E5w5pXhQbq6xnOu6qkxNjMEEnxx yv1n8Q9cDFTkH9IQ9RrYPYt126YxQdi7/VRHni7J+O5p13SOtXvQnQCiDbzKLGoXdVmiVQIqxhc Ug/dEMmXAZgWd0C3dkLSq/vgWdamw50y6rUJQWOww2Dm+j35HYYB7AuaPzr8p7bCcSEh8fNc2Fu k4IsDhoacNeQPmM6eGcZtpstd6htiecJRa7E8XQhsa/ldoC7hNCvcMR0SyU/Sr9Y/BTG8eyroog BCWKpOGQCjVfzr1f4OE+5sjGl6j5m4mq/NaRE5R+cKpzTipWLubDy+zCI6v9jZDIHwtdugOaDVE l8oDSlD9DKpQsm0OyIDk6i1h8E7nzWyVfRDgyK+s0r5jok8nyhne6Zl/hCG8nKMg1K6u55cECg9 ejN7ucL3bdwmZSktpaPasLHrXpg8kXySJzj1DwLCCCnJSti6js+5i1sMcIFMmXhJuJasVl/gH9a XhyEchGqyM/kRgA2qlBOP84ykk= X-Received: by 2002:a05:600c:3423:b0:488:fd7e:1063 with SMTP id 5b1f17b1804b1-488fd7e1253mr219912995e9.29.1776975660167; Thu, 23 Apr 2026 13:21:00 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb97:cfb5:53a1:28]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-488fb75a913sm165439815e9.12.2026.04.23.13.20.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2026 13:20:59 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: Adrian McMenamin , linux-kernel@vger.kernel.org, Florian Fuchs Subject: [PATCH v3 1/3] cdrom: gdrom: replace port I/O with MMIO accessors Date: Thu, 23 Apr 2026 21:41:30 +0200 Message-ID: <20260423194132.693271-2-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423194132.693271-1-fuchsfl@gmail.com> References: <20260423194132.693271-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 Signed-off-by: Florian Fuchs Acked-by: Artur Rojek Reviewed-by: Adrian McMenamin --- 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 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) && --=20 2.43.0 From nobody Wed Jun 17 07:20:37 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 3592B33439F for ; Thu, 23 Apr 2026 20:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975664; cv=none; b=cVsPFLF1KmHsH9Rj93Mmol8AUexHlX5dC0/BKIWk3Mw8k6sOBfwZOmPtCYJMBUk9M/E4fi5MmsBSeawcouN9FpTRjrGBdKxT07Dg6CHsRKlnMHVDZa9HElvYoNzZZfp4ZZGml1rBPRtW9cZern1quUxj5pl8ZQkCzgrKHKMGgGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975664; c=relaxed/simple; bh=clRQBLZLyMkNToXv7TBsJc8dayp8m4uA7BFHlQ2ixJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LjaQ52Bgg+SWJKsPp/gs4RNTV4FeV4VHEVbaYuPK4fX+vLVE3qasrUu9TIL1n8t1ay1zak6nq2kCqKCHWKxH/DgUjnY1hYU0Qh/v4n6wLKJLNEjidpn2KSeBu7iCsIKgvoPhHFpFDYiCLXjsQYGwhAKAdPHcfuUzgVWgkUPqtmQ= 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=G/3/lFXC; arc=none smtp.client-ip=209.85.128.50 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="G/3/lFXC" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-488a8ca4aadso97405095e9.3 for ; Thu, 23 Apr 2026 13:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776975662; x=1777580462; 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=FhO7XdLlo3g+fXfBF98bZHpoFBDk4f+SfNDZuUrfUlU=; b=G/3/lFXCR4JwEc/wvlZT2m9waU/OfRWVfUzz9jKKC5Gs6IcgR83TvYR9HVfj4jBxsy C/G+I/kAIKu92ViVeFhJcV28e8R+RYuCD7mXC/EOM8gW6kL0A6sb4xUmq+4e5o63onBy kBqheUrTltFzMHdIO0zXlJKSC+z+sYjQLjYnwZxW07uVj5uC4Z5N61cH98llZb2t6Ld4 4KoIkQybgEeG1kxAi6MiSaIa1GTnlxUyNHy0OnOhRfonS2Wh/riWNEB3aq3CsPQyiQrd hS8aMR2j0cgo+40h9SVN4sCzWHejhF1ct+MgMkJErEyg4mK1/vyL82pX9htRWZlaf+2k iQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776975662; x=1777580462; 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=FhO7XdLlo3g+fXfBF98bZHpoFBDk4f+SfNDZuUrfUlU=; b=tAM1VnGkcxL2cfQ9sED+yC/eY7b/+ypzuCM7ktIBnwUlVobuBexOsLFfOzNLuuzunn eZKSvRBZsoZxjL368OQykmQPiLDkAdscKhloKF/WZlokpwfokGHpT2E6nLBni429RLR4 rG9SOKY4qN+Fx2l6Ux3gjgvjjRo+1R4mTrHUwDom+x639fZEbHawyEbyNa1Ur0MshLH8 kdXWbJuA9rWSjnPJlGpwqFUMM5XAMtZTBe99HOs0O5YhfCsA3OlIR7kfX42gdjQQZZpX goTKY8VP2i113mT+skAQpRUkadz8KadMs8ow7NaQXoS7UrWYIaQTmKZWFf54KuLw0nsN jPVw== X-Forwarded-Encrypted: i=1; AFNElJ9RrbgBgTevgRCA/dXNTaQVjT7FwjvHxoEKjNn+V+4mo5YRQMfFenRbtoleh55wo9UZOd0iZwGPGbKiXlg=@vger.kernel.org X-Gm-Message-State: AOJu0YxTinLZZyuDDL7wikH8nF6OzgZe2UB7QLSHhwyyoOqDpjfGWKpA +aPq4NXkZSG1rwPujwsKzt+bVY+T/DYwJH2GjdsaTSSsuiad+d1nc5o= X-Gm-Gg: AeBDiescLSln4tfPTpwpoLWO/OsjS1PuafFhiK9rSFOOW+7AdL9Yd/9qmZw8kTT7o7+ sWEKo9rHYHLNxdwar4bzNUwrWslRpRoTg/cK9RRt5qQtv8EgPuWka777v5A6T/6MYEQqkITbF7a M3PKpQXxbL/fzkUfq8PY1zwEBjhdh2lAslT6rHJ9+eNk+FdE0MXpDVuEwYbqbtZUkOykMufRcoT 42Ca7uGq3ZoVRzHRrxVqOHTIpidAbr0+Foc9S735efUNi5EgQ6QNxKg+9Qeie/0AP+gkAebUJhG ZZ8FTBYeRZTqM0V5JebArH3cidK1NclN6gmHkmBdtBGuTrJYYlVIg1dJM5kpTlAyekSmscLFFtf S7MbK/ILcS/mJTmdFkY4xSV1tm3IcMrrHrTIuuQz9XPSrXYc5BUE1mjCwqzNoYdGU7yr37nb8Pd e+HnPmlxtmxhgTVC0iFrKPBbXV1z25P4by7NjpRPhaCG/SYuSGQprF/kpzVqwv7wUM7LWdZ4kbJ 6HB7hsQ8ZHd1WPT X-Received: by 2002:a05:600c:620d:b0:489:1d23:4524 with SMTP id 5b1f17b1804b1-4891d23468bmr266800665e9.5.1776975661257; Thu, 23 Apr 2026 13:21:01 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb97:cfb5:53a1:28]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4891bb3d121sm529336555e9.14.2026.04.23.13.21.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2026 13:21:00 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: Adrian McMenamin , linux-kernel@vger.kernel.org, Florian Fuchs Subject: [PATCH v3 2/3] cdrom: gdrom: update gendisk capacity on open Date: Thu, 23 Apr 2026 21:41:31 +0200 Message-ID: <20260423194132.693271-3-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423194132.693271-1-fuchsfl@gmail.com> References: <20260423194132.693271-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. Signed-off-by: Florian Fuchs Acked-by: Artur Rojek --- 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() 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 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 094d55b2d004..1e73617b39ac 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -474,6 +474,27 @@ 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; + int ret; + + if (gdrom_drivestatus(gd.cd_info, CDSL_CURRENT) !=3D CDS_DISC_OK) { + set_capacity(gd.disk, 0); + return -ENOMEDIUM; + } + ret =3D gdrom_readtoc_cmd(gd.toc, 1); + if (ret) + ret =3D gdrom_readtoc_cmd(gd.toc, 0); + if (ret) { + set_capacity(gd.disk, 0); + return ret; + } + 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 +503,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 Wed Jun 17 07:20:37 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 5EBA1329373 for ; Thu, 23 Apr 2026 20:21:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975665; cv=none; b=klA3e8sG/9huLsUzuZEE3rWrx9EUA3hW52QIBZsK8KpoefqPCEdYBWnF3MPsmye0CbIA3qmsMjVP+lND1uBxMqz1iMdP2T82BYORICbujmaFh5aEaspu467pijq2iY1GRVB3Yffjwe5NjaN2sjHjsY8tzXSgmGiOacbIO5lekGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776975665; c=relaxed/simple; bh=qXIKkX4h7OUd60DQ2fKPN5FHdbGxmbN3u0xWQKFzdCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aajHvM5tO7HdslGq1TQ+fTTvIvshU4lRSCLF4TOaXq+BlOX/0iNE0khwFLSPH1d0frjNBo38SRzAkx4aVsrPzT6+7MlIAUs2sju8aIYFZOaZbbBHkm09x/J/nzrx/YZtDm2rEG0pQniBC3Yu6dufAqntUKdYAiIP0rsAM5PUv/8= 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=EsW+ClON; arc=none smtp.client-ip=209.85.128.45 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="EsW+ClON" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso66733655e9.3 for ; Thu, 23 Apr 2026 13:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776975663; x=1777580463; 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=wL3tWq3fcfB8j/Jja0BNy+0Edqs7WrfstTJmG5tBxQw=; b=EsW+ClONHjmF60uY82w+6IkqP56ogNbo/gTCgnK1t4snsPUlgVsLH+uaY9xLWK9son 2DZN0ikGZpyw503+HBtt5qsE4ghA9RIirNQaupCY2J/vbPkaYuxWVB3wGtpf9oe4WVGf OlLGiKYfkavJi24EvDJhK4o6mzYbMRUNgFpFkVKeXkt9B27UWdWmjgeXloSlLLFDv43P 4SoROzxs1GBZleNAf7BpFPiOq0fVXaO2IM9vt9CK/ofkMka3jswO9d820S0yLE4KIuFj LIsft+qFJW1ysEytnsM1VbR3VYelozpPdZy9DtZES4qEedez12XlLIaUX11+MzSS36JL CuPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776975663; x=1777580463; 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=wL3tWq3fcfB8j/Jja0BNy+0Edqs7WrfstTJmG5tBxQw=; b=F7+HQfxA2AyPQ9tpRh2Y9fPhXOGmby/OIePWGBKvp5GdxNk5CjhL8EUEyVAa6MG4ux 5nJESUut8J2fqLKbAC/05BIVuAfxPSVdKUOjnzaXyWkxvkL+0tsD4kLHxh+1qUoxKh8J APDy7XISv/BcvkIP/DiuOdy5bPDnlLCTIFwuCiIp3lU1GncV+AwSWvIJF+h3REZ6BJw2 7mGMPdPjRgW9RgNYMqIELHKaPM/almpqD6bPy8CoIC2EpyKp28eJNOJgt8meCuy9jptV p7YEaHD+udHmAUlz2iSFgFw/ELB6p+Ute3P2KQ68M077aXXxioyRGc7bbrd6IZM9gT2r OJcg== X-Forwarded-Encrypted: i=1; AFNElJ9PuIqACFgJTMo+PYXJeS0hxleWLWE6jYIEonzZz9o+8weG8TmbW6mmAdyg9BCJmefMZjrWZ5H+PLlFdeU=@vger.kernel.org X-Gm-Message-State: AOJu0YzT2sxjp8Fljz0CTIqCLpVlyUkrYx0qa3jUcMwKA8Ht32NLIfzE +gyKPGXZRhTDN6UfYVcy3pEK2d8v4e5gZkPKIRIqV3Ek5MOGbIVW4DQ= X-Gm-Gg: AeBDietdLyXxa46IYeFkubyC21/UexsL1rbo5W1fgtXLvT9y9+tZD0TqSi0ny/t4LA7 jt+Eqqg89EOU2mWtwsTv5HxYoGnmNtPxvX4fJAnq1IUzDhsxIsfKlneDQODa7e/urB2S/8d8djC Av/Bg47e9x5buY62bx4kUfivVUyCpnJy3erYdGS4TM9Tm+zBnD4B31hC6lmTBc0rQ2s9sJGfi3U t4WiIfGJMyeAv03HfquuELqlmDdG4+GSM8q9eZ8XA5Hefz8CrLHJSlpirfd4AzsNi8qLxZr2LqM XWD3z/pGn7oxfm4eYzWnNYCNKgliBXc8rEUCTy15r/ghbGBFUuJVxrT3ejLvXaKRC7ch4sgf6+n 3Kqg+0GwysC0NATXBWS6BgJ4IbgegFVFNT+EeB4jX6MY1BDD96oo4hf7u2QwIiMEIfZlzxND0ji owBQ3hPkUw3uUXrF2B9D6RTLwts1pyKnD5p9GALCMCZ0eI2H/HhHJLZMNFc6yUMPfQpODsjqDC/ FPrCd7sMmSiNMijarfZ+NG8QkM= X-Received: by 2002:a05:600c:a106:b0:48a:58ae:9933 with SMTP id 5b1f17b1804b1-48a58ae9fbdmr108145875e9.18.1776975662557; Thu, 23 Apr 2026 13:21:02 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:fb97:cfb5:53a1:28]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-48a5aa3ae83sm271709905e9.12.2026.04.23.13.21.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2026 13:21:02 -0700 (PDT) From: Florian Fuchs To: linux-sh@vger.kernel.org, John Paul Adrian Glaubitz , Artur Rojek Cc: Adrian McMenamin , linux-kernel@vger.kernel.org, Florian Fuchs Subject: [PATCH v3 3/3] cdrom: gdrom: verify device access after disc swap Date: Thu, 23 Apr 2026 21:41:32 +0200 Message-ID: <20260423194132.693271-4-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423194132.693271-1-fuchsfl@gmail.com> References: <20260423194132.693271-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: new patch added from Artur Rojek and also verified that it works. drivers/cdrom/gdrom.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 1e73617b39ac..21ef4657dd2b 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