From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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 buflen) gdrom_getsense(NULL); return; } - outsw(GDROM_DATA_REG, cmd, 6); + writesw((void __iomem *)GDROM_DATA_REG, cmd, 6); } @@ -282,7 +282,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session) err = -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 = -EINVAL; @@ -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 = 1; gd.transfer = 1; - outsw(GDROM_DATA_REG, &read_command->cmd, 6); + writesw((void __iomem *)GDROM_DATA_REG, read_command->cmd, 6); timeout = jiffies + HZ / 2; /* Wait for any pending DMA to finish */ while (__raw_readb(GDROM_DMA_STATUS_REG) && base-commit: 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f -- 2.43.0