From nobody Sat Jun 20 05:51:50 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 A1F072BE641 for ; Sun, 19 Apr 2026 16:29:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616154; cv=none; b=uyYgAe2rf8XWZ26dhYECspB7vj9snyjYWIO3Hhl3y7rONPg28Un6U+n3nZ41D4vR/v/87l7ZEuenufv8wpeIypetKqYV/ptE3O5/s4wIN1C2Jb+mL7MzLH9iG0YeGj3T+itnqLm5nPO9ef1MdtF7xBHlH6ZAV1tEf8+mG3yLtQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616154; c=relaxed/simple; bh=1sb7wN3eYGAQdamJ89DLNnKCT1xdePZdB8hf7+oTijM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QkGpp2PQKebpRhoUIcsdmqnW3PQBs0rPBci3gZDGPajZxcLgamZI9n6NFizfgbmBj12RT7gAClnupN2fPWppo4938B7NE+F2lvaiGh1F29s7uctb3jkxZ3HpoO9cBbvKSWwrFzFU5x1uJqiC7rPWQbIQPgq5CzzXrBo5V9hPXtY= 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=PUuMBEh0; arc=none smtp.client-ip=209.85.221.52 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="PUuMBEh0" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-43d7605ec91so1977751f8f.3 for ; Sun, 19 Apr 2026 09:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776616151; x=1777220951; 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=IH1mNiSxJXGXo2HwZVp3mXz1xbpeH6Y5j/S+8PSgzoY=; b=PUuMBEh0uOTApYtibXKsWNAxsx9VcwUljpjB0Czb4K8GGC2mKdFKilTfu5qiSntaQi fPOO/G4AkTvOqmfcSIsa+L4VynoG1PgAZf4hCwAfrKY4PGomet8N0sJUpwB55NXl+3kp xU5/bk7yem8w3QGt26sAR+YnTiUBKHE2NsUzk4ke3b+rOU3sYT8kvfv4D03AgbyD4A0b s1Q3qNRQcQVZadGvsS7ETk+mZuRxeN9T6dem61L4rqv9UiQALWBD8i4MVHT+dbDxfTKD NQWJdrNSc99N0Cf4gjy4QyixEBuemg0znrag/rYxvWPg1RFb768byBmh7yN/2hzBbMc/ YQdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776616151; x=1777220951; 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=IH1mNiSxJXGXo2HwZVp3mXz1xbpeH6Y5j/S+8PSgzoY=; b=tXO6v3J/J5362E9Iaw+K1m72HEk/u8Lo4egNoHX3tPVWh4o3bubnKfGblgt6PSYb/z qoUHvHwc68YUaWdjPXt+H9gKlYerTOYULIE/Pz7zrJFvp2wkDzaOFOavLhbSbxzTUZwf URFxhnfAAa0hXzRgd4fUpiKhlJg8y+MYPie9wjHW8olO4nIjzVOrT9g8/OKahBYRaNXB EcPFUmeqlM3YTDnaKIhjaX3HgGLYW6b2OM5LLlaRxfEkQ/m9IKffcl6D5KJR+GSobtO7 c/xW7awXfPteG7GIayED+8drg5XHNRHMM1Xanwrb92novifpbz6raB0jVVJ0eYjVSwbi oJKw== X-Forwarded-Encrypted: i=1; AFNElJ+mn7rlB7LZC9rHaFYESShe+YCc43qYUWy/r440sn+WMcPi5fxlxkZrCmOpD44cYu30EZJK0FCELh/vQn8=@vger.kernel.org X-Gm-Message-State: AOJu0YwGB2YbWnbXM/me2CSwXaPeEkrzleLLHON4js9Od89JogEO6uki M6HZ7tOfc5sWN0oB7xHKf1v8Vugp8hHdvS5FO/luSEWLehv/gt1CN8E= X-Gm-Gg: AeBDiev1RCzIkCfvKA0W6iRpiaa28OvG4d2tYLCqvPuuhc+dUH+uqHSO3OavbnvgcUE fDWMsNnh/dd27k7sYQPFi3tN6hIcu/WxjumKXComs3lofWxjJAxX2tUZ7R40IojcuvqPZqB1Nh+ 7tm4xUgCBC0TveyPxhweOax0G9ZazlJU2X/hJ/5FNK/Yw8Vg0fZghb7AZ0Xw2DzPjBG0EDFcOAs BTIPAB82t2vbRDB1OwDrZqcRdfGIaZmj12fgs93werNbFGfpmcQlRmlYtcI2oc4XJN11W2/3Stl KRQMDZpggRIsgemdWJHqb9h7BsBaRERiKMDzB7b+4ctQF7OBFqlZrvZG4pIkg9bl/231D4gYdXa Ja+sKBr3+sK8HoXG/zbheUI5D43nLQFwHE10aKr8B9nSbztN2f9b9bkxzQlsSMbqH4Bq+H1xMiD rOhVdmmywSwKdpGM8v0xKbjOByPACVZBM6UgPzAE3coP/P2Kl8AYTXpJ6nLI+U0Q3ueuTlDKEia NCztlJYNVqP7ie5d2Y= X-Received: by 2002:adf:fe8b:0:b0:43f:e414:1bed with SMTP id ffacd0b85a97d-43fe4141c7bmr10259511f8f.0.1776616150912; Sun, 19 Apr 2026 09:29:10 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:e7d2:9a54:d18c:d3f3]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4e3a381sm23740919f8f.21.2026.04.19.09.29.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2026 09:29:10 -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 v2 1/2] cdrom: gdrom: replace port I/O with MMIO accessors Date: Sun, 19 Apr 2026 18:28:22 +0200 Message-ID: <20260419162823.2829286-2-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260419162823.2829286-1-fuchsfl@gmail.com> References: <20260419162823.2829286-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 --- v1->v2: Don't use helper functions with io.*_rep(), but writesw() and readsw() local in the respective functions 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..89938d9b2825 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 Sat Jun 20 05:51:50 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 535DB2D060D for ; Sun, 19 Apr 2026 16:29:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616155; cv=none; b=khxWvBWklKWVRB65CyBoteS37rp/WT/ZJaWOAMr6ljZIHvorrlu4AJpxveV8AkoXvg07fav3Kv4KgF25iQnhcAWgFtFfNTt711jM3VP/UgwMDeWe0vnhawg2qhZgS9atVrhFylH/HLHAUdeztxuDHhQ2yYTrJ5sw+63H0XXkdGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776616155; c=relaxed/simple; bh=/0TEkY+sxpaC0GlCPNbeaHDoXij7IeFeKG2B7njq+AQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PWyMot0jKpJyt3Z4tG2hy7joXey8HQOCRDUYtpZUt4soNscidQVEQTMwRYN+HRktpa+zU0MKyi5FWyVGN144buP6WFb3hBgcSO6EJw15F4qYLV9bTjrhcK7o4EQcW7rxFsbvoUvmrnEpuBPvFkgojYp+0hn3vT4VDuh6/9nSYqs= 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=nh1UoKJ/; arc=none smtp.client-ip=209.85.221.41 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="nh1UoKJ/" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-43d77f60944so1743229f8f.3 for ; Sun, 19 Apr 2026 09:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776616153; x=1777220953; 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=CG0WEefAtVYQQDx1GALJY/zb5ptlk38Q48NQwoW8PzY=; b=nh1UoKJ/VOa8G1i/gyBJpRmUqnOuMx2alI5jWvWvyY6lO14gWWaVcfgd0xdvDLx3f6 4c+I4E12dv4SOOk3aawG3NkJElWRs34cxuC0V2uOIGcrcypawfF+h+Qv8/H682YvKq60 8g9htjIxPTZmkU7aaIGobvzOl4pKndHtoK1hVxnotZSfSp3V/Hsd0gIDvy2DuYeEHVyq wWJEJEdENgELpK+FbVTfqWlCD0q6DN6TxzNRXgHPsiMY/Uizth/nv4ObE+vDSbxVZ/e6 wfmjc2i0V80Hm6Voc3HC7mug2i39JrI/LuZNVS8QQFStd2Xvv43xZELVsMGmW545T09m HQ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776616153; x=1777220953; 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=CG0WEefAtVYQQDx1GALJY/zb5ptlk38Q48NQwoW8PzY=; b=Kdak/0wtq6GZ80JqJleVUj+wZjwrSTbmN2BHkWF+0rWkTgRTw0ubBSAGYz7NWimn8s L+/Tg13OkIOyDQ9G0PBGAVRQ4CfSXek1VbpfrWnMAcJ/Jch92wFZ5YRN1BOSZ1dRSiL6 ondo7JnDAYDb5kjvAaHQfan2elqQcXo66XUQCE5tVyMKgESY0u3TMf/8wdquSLP/ABNJ Qig1bZihXuR7qEa+ljMz2N5ny++twY/KNEQvquhrYo1bpnF8TCTdidfXn9LpUTq8FFgt eeHEQaj7lQ4tWGLw8Frzva1f4XVLf7TlWy2CEkvtxukvyES9aMnQ4c9UIjbAa2g7EeNs Xh3w== X-Forwarded-Encrypted: i=1; AFNElJ8yWzAxgv+3bMbvXG3jFy8/A4YpxPPbEgUpGhNxOfNhtNTwKJ8GT+mQYgkCNHqok/QdoqUV3h/YdIQDce4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyt3+E53cBvyzp/YBKGvyAROg9veHj10t0kVwBwSzz9fmKzVXrA G3svDm45/exfSRbKYqbmMeBE+gIGDpD9VzrYyYhYp3LOMOLpxV3hWoI= X-Gm-Gg: AeBDievqbw/K1AIaqQCsykDjaLfVoEU1a8FOPjN1mZtsOIEmJi+DWKqSmwUrwOkv1dQ lDuXCW0m7u7h6Ut6uL0SymmYnjhWbnM66CV2Zl0YQImZagXS81hndI5+pE0xZpfZAReX2+Z0B7K afZKqjx5IZ+GK9vDshBarlyIvYaokR+eXkaoku7Ro+c1znU0UeCHyzSrfAy17kq8Q5ksLdBCIgO 1mAmgsXMLiotWeUan/yJ6UCO4jJhPN5mouyAPrvXL2lqe9JMLJdrp4+QMRHG2qRP2wGP3uIHlv+ 1na4FSkrgCjuwvp3hguI+RqWJM5CDCtJkEwmBGTn4kLmSLkOJOJEb08d6I67CDJv4VfxPHSE3x7 LMZSeiolLOaMGJ1b9f9Qe1F9LSnrVbqpX5EaOfJ78HY+2fbROJjGvnPT7NpH5vBS4STuqObO1JK TVawbzb5X+TenfDQwvV7fb1h5yCHPFQPs4xhde+e5Co3/lF5xMwhqTOOpjt+4yH8gxc6bIIKh/L itXsXfVMZYh/keJEm4= X-Received: by 2002:a05:6000:2dc3:b0:439:b1c3:84c8 with SMTP id ffacd0b85a97d-43fe3de2bf5mr15121663f8f.21.1776616152477; Sun, 19 Apr 2026 09:29:12 -0700 (PDT) Received: from localhost ([2a02:810d:4a94:b300:e7d2:9a54:d18c:d3f3]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-43fe4e591cesm29467804f8f.36.2026.04.19.09.29.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Apr 2026 09:29:11 -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 v2 2/2] cdrom: gdrom: update gendisk capacity on open Date: Sun, 19 Apr 2026 18:28:23 +0200 Message-ID: <20260419162823.2829286-3-fuchsfl@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260419162823.2829286-1-fuchsfl@gmail.com> References: <20260419162823.2829286-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 --- 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() v1: https://lore.kernel.org/linux-sh/20260405082330.4104672-3-fuchsfl@gmail= .com/ --- drivers/cdrom/gdrom.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index 89938d9b2825..fb95288fad72 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c @@ -474,6 +474,25 @@ 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, 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 +501,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