From: Finn Thain <fthain@linux-m68k.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: Laurent Vivier <laurent@vivier.eu>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Joshua Thompson <funaho@jurai.org>,
linux-block@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 15/31] swim: Don't use the mark register to read data
Date: Thu, 16 Jul 2026 20:02:15 +1000 [thread overview]
Message-ID: <c25cd3fe9919ad85d1e2147a294bfbd6ae2a2c21.1784196135.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1784196135.git.fthain@linux-m68k.org>
If an unexpected mark byte were to be read from the data register, an
error would be flagged. But no error gets flagged when such a byte is
read from the mark register, which is misleading. Always use the data
register except when a mark byte is expected.
Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
drivers/block/swim_asm.S | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
index 1d394ee930d6..5caeba3a75d8 100644
--- a/drivers/block/swim_asm.S
+++ b/drivers/block/swim_asm.S
@@ -47,11 +47,11 @@
.global swim_read_sector_header
swim_read_sector_header:
link %a6, #0
- moveml %d1-%d5/%a0-%a4,%sp@-
+ moveml %d1-%d5/%a0-%a5,%sp@-
movel %a6@(0x0c), %a4
moveq #-1, %d0
bsr mfm_read_addrmark
- moveml %sp@+, %d1-%d5/%a0-%a4
+ moveml %sp@+, %d1-%d5/%a0-%a5
unlk %a6
rts
@@ -63,6 +63,7 @@ sector_data_mark:
mfm_read_addrmark:
movel %a6@(0x08), %a3
lea %a3@(read_handshake), %a2
+ lea %a3@(read_data), %a5
lea %a3@(read_mark), %a3
movew #seek_time, %d2
@@ -93,7 +94,7 @@ amark0: tstb %a2@
dbmi %d2, amark0
bpl signal_nonyb
- moveb %a3@, %a4@(o_track)
+ moveb %a5@, %a4@(o_track)
moveq #max_retry, %d2
@@ -101,7 +102,7 @@ amark1: tstb %a2@
dbmi %d2, amark1
bpl signal_nonyb
- moveb %a3@, %a4@(o_side)
+ moveb %a5@, %a4@(o_side)
moveq #max_retry, %d2
@@ -109,7 +110,7 @@ amark2: tstb %a2@
dbmi %d2, amark2
bpl signal_nonyb
- moveb %a3@, %a4@(o_sector)
+ moveb %a5@, %a4@(o_sector)
moveq #max_retry, %d2
@@ -117,7 +118,7 @@ amark3: tstb %a2@
dbmi %d2, amark3
bpl signal_nonyb
- moveb %a3@, %a4@(o_size)
+ moveb %a5@, %a4@(o_size)
moveq #max_retry, %d2
@@ -125,7 +126,7 @@ crc0: tstb %a2@
dbmi %d2, crc0
bpl signal_nonyb
- moveb %a3@, %a4@(o_crc0)
+ moveb %a5@, %a4@(o_crc0)
moveq #max_retry, %d2
@@ -133,7 +134,7 @@ crc1: moveb %a2@, %d5
dbmi %d2, crc1
bpl signal_nonyb
- moveb %a3@, %a4@(o_crc1)
+ moveb %a5@, %a4@(o_crc1)
andb #.Lhr_crc_error, %d5
bne signal_nonyb
@@ -211,7 +212,7 @@ data_crc0:
dbmi %d2, data_crc0
bpl data_exit
- moveb %a3@, %d2
+ moveb %a5@, %d2
moveq #max_retry, %d2
@@ -221,7 +222,7 @@ data_crc1:
dbmi %d2, data_crc1
bpl data_exit
- moveb %a3@, %d2
+ moveb %a5@, %d2
andb #.Lhr_crc_error, %d5
bne data_exit
--
2.52.0
next prev parent reply other threads:[~2026-07-16 10:19 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-16 10:02 [PATCH 00/31] block/swim: Fixes and improvements Finn Thain
2026-07-16 10:02 ` [PATCH 08/31] swim: Don't start motor until medium is present Finn Thain
2026-07-20 19:02 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 13/31] swim: Check for CRC errors Finn Thain
2026-07-20 19:37 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 14/31] swim: Check error register during sector read Finn Thain
2026-07-21 5:43 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 12/31] swim: Simplify return value initialization Finn Thain
2026-07-20 19:21 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 29/31] swim: Define macros for constants Finn Thain
2026-07-26 15:46 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 21/31] swim: Revisit delays Finn Thain
2026-07-26 14:50 ` Laurent Vivier
2026-07-16 10:02 ` Finn Thain [this message]
2026-07-21 5:49 ` [PATCH 15/31] swim: Don't use the mark register to read data Laurent Vivier
2026-07-16 10:02 ` [PATCH 30/31] swim: Define symbols for constants Finn Thain
2026-07-26 15:47 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 31/31] swim: Unexport global symbols Finn Thain
2026-07-26 15:51 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 19/31] swim: Deduplicate polling loops Finn Thain
2026-07-26 14:43 ` Laurent Vivier
2026-07-27 0:19 ` Finn Thain
2026-07-16 10:02 ` [PATCH 20/31] swim: Check drive ready bit Finn Thain
2026-07-26 14:48 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 18/31] swim: Remove redundant RELAX actions Finn Thain
2026-07-21 6:10 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 02/31] swim: Select appropriate drive once only Finn Thain
2026-07-20 13:27 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 27/31] swim: Remove unused macro definitions Finn Thain
2026-07-26 15:43 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 03/31] swim: Enable the drive when probing Finn Thain
2026-07-20 18:08 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 26/31] swim: Add some helpful references Finn Thain
2026-07-26 15:41 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 17/31] swim: Convert to blocking queue Finn Thain
2026-07-21 6:03 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 07/31] swim: Enable clock divider only where appropriate Finn Thain
2026-07-20 18:49 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 24/31] swim: Remove pointless specifiers Finn Thain
2026-07-26 15:38 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 23/31] swim: Don't needlessly re-read sectors Finn Thain
2026-07-26 16:01 ` Laurent Vivier
2026-07-27 0:30 ` Finn Thain
2026-07-16 10:02 ` [PATCH 11/31] swim: Handle FIFO timeout error Finn Thain
2026-07-20 19:17 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 01/31] swim: Assert strobe with stable outputs Finn Thain
2026-07-20 13:22 ` Laurent Vivier
2026-07-21 5:41 ` Finn Thain
2026-07-21 6:23 ` Laurent Vivier
2026-07-21 7:37 ` Finn Thain
2026-07-21 7:48 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 05/31] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-07-20 18:20 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 28/31] swim: Clean up whitespace Finn Thain
2026-07-26 15:45 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 10/31] swim: Add track zero recalibration delay Finn Thain
2026-07-20 19:14 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 25/31] swim: Move swd initialization Finn Thain
2026-07-26 15:40 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 04/31] swim: Don't disable drive after every sector Finn Thain
2026-07-20 18:10 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 09/31] swim: Recalibrate when drive is probed Finn Thain
2026-07-20 19:12 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 16/31] swim: Fix buffer overflow Finn Thain
2026-07-21 5:59 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 22/31] swim: Remove pointless mode0 register write Finn Thain
2026-07-26 14:51 ` Laurent Vivier
2026-07-16 10:02 ` [PATCH 06/31] swim: Configure parameter memory Finn Thain
2026-07-20 18:31 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c25cd3fe9919ad85d1e2147a294bfbd6ae2a2c21.1784196135.git.fthain@linux-m68k.org \
--to=fthain@linux-m68k.org \
--cc=axboe@kernel.dk \
--cc=funaho@jurai.org \
--cc=geert@linux-m68k.org \
--cc=laurent@vivier.eu \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®