From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.222.47 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792694248; b=DOjPe5ZMYoRnUc9kWMLP9pPgjhSvTX10KVIo1ixhTbso9uBrwlHs/JHf15aA13wyJp0O Ut6pKA8FB96nFEJ4UbBrUPdQKM8Iqd1nuYdpYIR4mX56OCORc8tQyuVSnM+EjM3lphor4 ItBoypS847F18hsx8lXGPSUN29MSHQKJWzXn7tmuo4gKVINySRWd1R7BskZqGdDs6wHx5 EDAE5RXWwimafNbxkU8OaCCvNjJ42DPyUOW31H4H2/PlJ3p+Tg6UGwuyy9iY+RulGMDCG Qlg65Ck9Aj54JRSoZ9yxnKKn3tTdYczKZN2qD2Vlqy/nsr8H2Wt6N8Nr6kIkkHcuuNA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792694248; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=m+dbMoF594CwKxVE5qey0vlA+ySrFoGi/fZzuG+HLlk=; b=MGqaB0KC4Yg+Yzn2TqIPhOBLcoMzUtADY8n1c+BibWw3sOg5WEsBJ6viY6MEvUNRUFGM PmSm9YZPysZUA5QV2BzHR2xtkwJqwjjATZUUOqkXuQry2TmQaUbiPdiVwZPC3GfqVUACE 604OR+oNsS83s8mfHvxBtUV58JfFzMiKQoo0YPwZ9a5cXcS5jVjGt/GLG7z7Z4low29je OsxgTDMcUUCSgfOLso11GTZf1zSnd/rn2KZbZSC85/sX+bCuWa6jsZUvI0NYGshmwU312 ytrNP2lBZWmnvX5vK2E9UhpHDlytNSz/jUAWawkVZvMaWfxwuQC0ymwgT7N3zuXOXgw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=WI3vn01B; arc=none smtp.remote-ip=209.85.222.47 Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACDDB60A3822 for ; Thu, 22 Oct 2026 18:37:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org ACDDB60A3822 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=WI3vn01B Received: by mail-ua1-f47.google.com with SMTP id a1e0cc1a2514c-9908c849564so57342241.3 for ; Thu, 22 Oct 2026 11:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792694246; x=1793299046; 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:content-type; bh=m+dbMoF594CwKxVE5qey0vlA+ySrFoGi/fZzuG+HLlk=; b=WI3vn01B89XLBnuJYaFrj2y9kkZgc8dGlcsMp7ePtGwnVTS82tZoD1iybL/GCIXQ2t umWY1Wh17EP7256g6l5HZD4PZ5vw7rLh5bghHsRZaCBGFiI5Nkdb9tDm/N8bilI3daZR sVPlL0Z9BNYZ9+Qztrwvba2dtoUokDIZkKhP4BlFuS9viU9O7QBIvsI42WmsdTlNnn5L WlfQ/8EXlVBozwusX6EnNuqktb6/bSiUY1qZbH3e1DH8k71JVlJk/qTEK8oCevAfWBYM L5CyIUjWcYWd3+q4Joia/mT5xhXa4HwI037+9zpwluQFSwMU2ZjKscnu3k4nCxPO+wcO 9rrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792694246; x=1793299046; 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:content-type; bh=m+dbMoF594CwKxVE5qey0vlA+ySrFoGi/fZzuG+HLlk=; b=w8JFHQfSnsUvl5YtskCzpvJhdTCoIvogoRFwp8+amJIn7k65CDeAwAuBujO/YiTsJc DMwT7W9o1apBT8NkUt2boU+a2dq/Ql8gfUl1MLGptapFzUsz+6WKoa2OR3b34WE3eyTC a1NBN6JJDKgTqzaxLpr4BQUMVgczda8OEQm/KY2KveXt6xyGk+ttYS669Otn04uTCO7z dM/r6ybTDHnsafEx33TcnWeeJKu8mk4Tm6GZdvDMzuvJnlbGPOaGDCeviKff09eNoo2R gsUUelKAhbGLM1Gjn5pBzVqDf5I4m+8VEpOkkimofTpiz1WgCJl/ZsBZ7PGCiBG8eB1I O68w== X-Forwarded-Encrypted: i=1; AKwUvBzq997VQqNs2fBtOhewWd5qAPtdxM+X6bucLn/0xAwoa5JWTktJGXiR/QJt9jkQpMHAV9sxxYmy+Tygq/I=@vger.kernel.org X-Gm-Message-State: AFq9FYL9WhZE/qxsbzC1Gi7qo9Q5gXk3Lp6q8MDorG5w6OI8OTPP1MLh fcOgfqYcxMrcZpD2MT6c9dGk1LIf/LkuV6tYljWrLp2VWyb+IVc2wloH X-Gm-Gg: AYBFou36jCz1bo8TeNTG66zXnbeBWXS/ED33/rYzbYmp+hQ3A6FnuKSTQKUHGMBN4FE /Seyc/b51lzFMXMDAns2pCozQLMC/FLa0BPISV/olhuoceNYghWKlhKsVX3iVlk6khiRj4EsCYD u/kUh26YrGCOMt1eUFfEsrj+nYhYSFevMXBV2pfjWite285hiICG3rxKc/kLZbjFucsJ8ktEywt 3k/7VNXOFVlvaYzomzLJZOooVbsQihSr26FzAVwK1fkhRdJoInAeF8bEU6LGnHJpVGuPc/Z2qMQ iGdoi7cS/lMRIbpjYxxzmU483AxkuAJ3pMgnvpx6qfuVyyS9K+yG0Gv4gc2ug5CI6nc8fjIKCU5 /yhEQK/AgFaqY+qCQoP9uqmZp0en9QjmtNfbSlSrV5CFQFdx2Xk7StZ3YH5WbiQtyqPQSRpPGKb PgwmBLIn/qFlt+tS+mFrCxsBfRKXhc97PBKmoWveAB6dYKSl8QZORC8YUaEsYnTvAI+TqxMdPLo hSw2rjAbL3mBY5p3IVtLqm9QtZhIBX3gnDhH9ZCxl1tn7yUgvmfWTNGcwN/HUNKBeevOJR9TKCn ZjD5OcD58OELimNwDHs6 X-Received: by 2002:a05:6102:370e:b0:7b7:3acf:bd3a with SMTP id ada2fe7eead31-7ccc3090cabmr152501137.4.1792694246314; Thu, 22 Oct 2026 11:37:26 -0700 (PDT) Received: from Biostar-A520MT ([187.94.15.233]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-7ccc2052f7dsm581623137.3.2026.10.22.11.37.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Oct 2026 11:37:25 -0700 (PDT) From: Breno Rodrigues Alves To: linux@armlinux.org.uk Cc: James.Bottomley@HansenPartnership.com, mkp@kernel.org, linux-arm-kernel@lists.infradead.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Rodrigues Alves Subject: [PATCH] scsi: arm: Convert acornscsi-io.S to C Date: Thu, 22 Oct 2026 15:36:58 -0300 Message-ID: <20261022183658.58090-2-breno3011alves@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261022183658.58090-1-breno3011alves@gmail.com> References: <20261022183658.58090-1-breno3011alves@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Acorn SCSI expansion card presents each 16-bit SCSI data halfword on the low half of a 32-bit card access. The hand-written assembly in acornscsi-io.S implements the two directions of the data path: - __acornscsi_in() : packs pairs of 16-bit card reads into 32-bit memory words - __acornscsi_out() : expands 16-bit memory halfwords into 32-bit card writes (duplicating the halfword in both halves for the bulk of the transfer) Both routines are simple pointer walks that a modern compiler handles just as well as hand-written assembly, so replace the .S file with an equivalent C implementation. The conversion also happens to handle odd transfer lengths correctly: the original assembly drops the final odd byte. The C version takes its arguments as (void __iomem *, char *, int), matching the prototype actually used by acornscsi.c. The assembly version had no C prototype, so the original comment declaring the first argument as unsigned int was never enforced; using the caller's type removes that latent inconsistency and lets the MMIO accessors do the right thing on any architecture. No functional change is intended for the normal case of even-length transfers, which is what all current callers of these helpers use. No Makefile change is required: acornscsi_mod-objs already lists acornscsi-io.o, and the build system will pick up the new .c file in preference to the removed .S file. Signed-off-by: Breno Rodrigues Alves --- drivers/scsi/arm/acornscsi-io.S | 135 ------------------------- drivers/scsi/arm/acornscsi-io.c | 168 ++++++++++++++++++++++++++++++++ drivers/scsi/arm/acornscsi-io.h | 14 +++ drivers/scsi/arm/acornscsi.c | 4 +- 4 files changed, 184 insertions(+), 137 deletions(-) delete mode 100644 drivers/scsi/arm/acornscsi-io.S create mode 100644 drivers/scsi/arm/acornscsi-io.c create mode 100644 drivers/scsi/arm/acornscsi-io.h diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S deleted file mode 100644 index fdd7237bb..000000000 --- a/drivers/scsi/arm/acornscsi-io.S +++ /dev/null @@ -1,135 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * linux/drivers/acorn/scsi/acornscsi-io.S: Acorn SCSI card IO - */ -#include - -#include -#include - -#if defined(__APCS_32__) -#define LOADREGS(t,r,l...) ldm##t r, l -#elif defined(__APCS_26__) -#define LOADREGS(t,r,l...) ldm##t r, l##^ -#endif - -@ Purpose: transfer a block of data from the acorn scsi card to memory -@ Proto : void acornscsi_in(unsigned int addr_start, char *buffer, int length) -@ Returns: nothing - - .align -ENTRY(__acornscsi_in) - stmfd sp!, {r4 - r7, lr} - bic r0, r0, #3 - mov lr, #0xff - orr lr, lr, #0xff00 -acornscsi_in16lp: - subs r2, r2, #16 - bmi acornscsi_in8 - ldmia r0!, {r3, r4, r5, r6} - and r3, r3, lr - orr r3, r3, r4, lsl #16 - and r4, r5, lr - orr r4, r4, r6, lsl #16 - ldmia r0!, {r5, r6, r7, ip} - and r5, r5, lr - orr r5, r5, r6, lsl #16 - and r6, r7, lr - orr r6, r6, ip, lsl #16 - stmia r1!, {r3 - r6} - bne acornscsi_in16lp - LOADREGS(fd, sp!, {r4 - r7, pc}) - -acornscsi_in8: adds r2, r2, #8 - bmi acornscsi_in4 - ldmia r0!, {r3, r4, r5, r6} - and r3, r3, lr - orr r3, r3, r4, lsl #16 - and r4, r5, lr - orr r4, r4, r6, lsl #16 - stmia r1!, {r3 - r4} - LOADREGS(eqfd, sp!, {r4 - r7, pc}) - sub r2, r2, #8 - -acornscsi_in4: adds r2, r2, #4 - bmi acornscsi_in2 - ldmia r0!, {r3, r4} - and r3, r3, lr - orr r3, r3, r4, lsl #16 - str r3, [r1], #4 - LOADREGS(eqfd, sp!, {r4 - r7, pc}) - sub r2, r2, #4 - -acornscsi_in2: adds r2, r2, #2 - ldr r3, [r0], #4 - and r3, r3, lr - strb r3, [r1], #1 - mov r3, r3, lsr #8 - strplb r3, [r1], #1 - LOADREGS(fd, sp!, {r4 - r7, pc}) - -@ Purpose: transfer a block of data from memory to the acorn scsi card -@ Proto : void acornscsi_in(unsigned int addr_start, char *buffer, int length) -@ Returns: nothing - -ENTRY(__acornscsi_out) - stmfd sp!, {r4 - r6, lr} - bic r0, r0, #3 -acornscsi_out16lp: - subs r2, r2, #16 - bmi acornscsi_out8 - ldmia r1!, {r4, r6, ip, lr} - mov r3, r4, lsl #16 - orr r3, r3, r3, lsr #16 - mov r4, r4, lsr #16 - orr r4, r4, r4, lsl #16 - mov r5, r6, lsl #16 - orr r5, r5, r5, lsr #16 - mov r6, r6, lsr #16 - orr r6, r6, r6, lsl #16 - stmia r0!, {r3, r4, r5, r6} - mov r3, ip, lsl #16 - orr r3, r3, r3, lsr #16 - mov r4, ip, lsr #16 - orr r4, r4, r4, lsl #16 - mov ip, lr, lsl #16 - orr ip, ip, ip, lsr #16 - mov lr, lr, lsr #16 - orr lr, lr, lr, lsl #16 - stmia r0!, {r3, r4, ip, lr} - bne acornscsi_out16lp - LOADREGS(fd, sp!, {r4 - r6, pc}) - -acornscsi_out8: adds r2, r2, #8 - bmi acornscsi_out4 - ldmia r1!, {r4, r6} - mov r3, r4, lsl #16 - orr r3, r3, r3, lsr #16 - mov r4, r4, lsr #16 - orr r4, r4, r4, lsl #16 - mov r5, r6, lsl #16 - orr r5, r5, r5, lsr #16 - mov r6, r6, lsr #16 - orr r6, r6, r6, lsl #16 - stmia r0!, {r3, r4, r5, r6} - LOADREGS(eqfd, sp!, {r4 - r6, pc}) - - sub r2, r2, #8 -acornscsi_out4: adds r2, r2, #4 - bmi acornscsi_out2 - ldr r4, [r1], #4 - mov r3, r4, lsl #16 - orr r3, r3, r3, lsr #16 - mov r4, r4, lsr #16 - orr r4, r4, r4, lsl #16 - stmia r0!, {r3, r4} - LOADREGS(eqfd, sp!, {r4 - r6, pc}) - - sub r2, r2, #4 -acornscsi_out2: adds r2, r2, #2 - ldr r3, [r1], #2 - strb r3, [r0], #1 - mov r3, r3, lsr #8 - strplb r3, [r0], #1 - LOADREGS(fd, sp!, {r4 - r6, pc}) - diff --git a/drivers/scsi/arm/acornscsi-io.c b/drivers/scsi/arm/acornscsi-io.c new file mode 100644 index 000000000..ad16d984d --- /dev/null +++ b/drivers/scsi/arm/acornscsi-io.c @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Acorn SCSI card I/O + * + * The Acorn SCSI expansion card exposes each 16-bit SCSI data + * halfword on the low half of a 32-bit card access: + * + * - on reads, one 16-bit value is returned per 32-bit card load; + * consecutive card reads are packed into 32-bit memory words + * + * - on writes, a 16-bit memory halfword is expanded into a 32-bit + * card word. The original assembly duplicates the halfword into + * both halves of the card word for the bulk of the transfer and + * writes only the low 16 bits of the trailing partial word, + * since the hardware samples only the low half. + */ + +#include +#include +#include +#include "acornscsi-io.h" + +/* + * Transfer a block of data from the Acorn SCSI card into memory. + * + * The card address is rounded down to a 32-bit boundary. Each + * 32-bit read from the card yields one valid 16-bit halfword in + * the low half; pairs of card reads are packed into single 32-bit + * memory words. + */ +void __acornscsi_in(void __iomem *addr, char *buffer, int length) +{ + const u32 __iomem *card = PTR_ALIGN((const u32 __iomem *)addr, 4); + u8 *buf = (u8 *)buffer; + + while (length >= 16) { + u32 w0 = readl(card + 0), w1 = readl(card + 1); + u32 w2 = readl(card + 2), w3 = readl(card + 3); + u32 w4 = readl(card + 4), w5 = readl(card + 5); + u32 w6 = readl(card + 6), w7 = readl(card + 7); + + card += 8; + + ((u32 *)buf)[0] = (w0 & 0xffff) | (w1 << 16); + ((u32 *)buf)[1] = (w2 & 0xffff) | (w3 << 16); + ((u32 *)buf)[2] = (w4 & 0xffff) | (w5 << 16); + ((u32 *)buf)[3] = (w6 & 0xffff) | (w7 << 16); + + buf += 16; + length -= 16; + } + + while (length >= 8) { + u32 w0 = readl(card + 0), w1 = readl(card + 1); + u32 w2 = readl(card + 2), w3 = readl(card + 3); + + card += 4; + + ((u32 *)buf)[0] = (w0 & 0xffff) | (w1 << 16); + ((u32 *)buf)[1] = (w2 & 0xffff) | (w3 << 16); + + buf += 8; + length -= 8; + } + + while (length >= 4) { + u32 w0 = readl(card + 0), w1 = readl(card + 1); + + card += 2; + + ((u32 *)buf)[0] = (w0 & 0xffff) | (w1 << 16); + + buf += 4; + length -= 4; + } + + while (length >= 2) { + u32 w0 = readl(card); + + card++; + + buf[0] = w0 & 0xff; + buf[1] = (w0 >> 8) & 0xff; + + buf += 2; + length -= 2; + } + + if (length >= 1) { + u32 w0 = readl(card); + + buf[0] = w0 & 0xff; + } +} + +/* + * Transfer a block of data from memory to the Acorn SCSI card. + * + * Each 16-bit value read from memory is expanded into a 32-bit card + * word, with the halfword duplicated in both halves (matching the + * original assembly). For the trailing partial halfword the card + * only samples the low 16 bits, so two byte stores are sufficient. + */ +void __acornscsi_out(void __iomem *addr, char *buffer, int length) +{ + u32 __iomem *card = PTR_ALIGN((u32 __iomem *)addr, 4); + const u8 *buf = (const u8 *)buffer; + + while (length >= 16) { + u32 v0 = ((const u32 *)buf)[0]; + u32 v1 = ((const u32 *)buf)[1]; + u32 v2 = ((const u32 *)buf)[2]; + u32 v3 = ((const u32 *)buf)[3]; + + writel((v0 & 0xffff) | ((v0 & 0xffff) << 16), card + 0); + writel((v0 >> 16) | ((v0 >> 16) << 16), card + 1); + writel((v1 & 0xffff) | ((v1 & 0xffff) << 16), card + 2); + writel((v1 >> 16) | ((v1 >> 16) << 16), card + 3); + writel((v2 & 0xffff) | ((v2 & 0xffff) << 16), card + 4); + writel((v2 >> 16) | ((v2 >> 16) << 16), card + 5); + writel((v3 & 0xffff) | ((v3 & 0xffff) << 16), card + 6); + writel((v3 >> 16) | ((v3 >> 16) << 16), card + 7); + + card += 8; + buf += 16; + length -= 16; + } + + while (length >= 8) { + u32 v0 = ((const u32 *)buf)[0]; + u32 v1 = ((const u32 *)buf)[1]; + + writel((v0 & 0xffff) | ((v0 & 0xffff) << 16), card + 0); + writel((v0 >> 16) | ((v0 >> 16) << 16), card + 1); + writel((v1 & 0xffff) | ((v1 & 0xffff) << 16), card + 2); + writel((v1 >> 16) | ((v1 >> 16) << 16), card + 3); + + card += 4; + buf += 8; + length -= 8; + } + + while (length >= 4) { + u32 v0 = ((const u32 *)buf)[0]; + + writel((v0 & 0xffff) | ((v0 & 0xffff) << 16), card + 0); + writel((v0 >> 16) | ((v0 >> 16) << 16), card + 1); + + card += 2; + buf += 4; + length -= 4; + } + + while (length >= 2) { + u16 v = *(const u16 *)buf; + void __iomem *cp = (void __iomem *)card; + + writeb(v & 0xff, cp); + writeb(v >> 8, cp + 1); + + card = (u32 __iomem *)(cp + 2); + buf += 2; + length -= 2; + } + + if (length >= 1) + writeb(*buf, (void __iomem *)card); +} diff --git a/drivers/scsi/arm/acornscsi-io.h b/drivers/scsi/arm/acornscsi-io.h new file mode 100644 index 000000000..64acfb8bb --- /dev/null +++ b/drivers/scsi/arm/acornscsi-io.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Acorn SCSI card I/O + */ + +#ifndef _ACORNSCSI_IO_H +#define _ACORNSCSI_IO_H + +#include + +void __acornscsi_in(void __iomem *addr, char *buffer, int length); +void __acornscsi_out(void __iomem *addr, char *buffer, int length); + +#endif /* _ACORNSCSI_IO_H */ diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 79d7d7336..263a1bf24 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -140,6 +140,8 @@ #include +#include "acornscsi-io.h" + #define VER_MAJOR 2 #define VER_MINOR 0 #define VER_PATCH 6 @@ -886,7 +888,6 @@ static void acornscsi_data_read(AS_Host *host, char *ptr, unsigned int start_addr, unsigned int length) { - extern void __acornscsi_in(void __iomem *, char *buf, int len); unsigned int page, offset, len = length; page = (start_addr >> 12); @@ -931,7 +932,6 @@ static void acornscsi_data_write(AS_Host *host, char *ptr, unsigned int start_addr, unsigned int length) { - extern void __acornscsi_out(void __iomem *, char *buf, int len); unsigned int page, offset, len = length; page = (start_addr >> 12); -- 2.56.0