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 31/31] swim: Unexport global symbols
Date: Thu, 16 Jul 2026 20:02:15 +1000 [thread overview]
Message-ID: <b1193c2e8e8850922bec72f7ea2b07710d9f0fdd.1784196135.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1784196135.git.fthain@linux-m68k.org>
These symbols aren't used outside of this file so use local ones.
No functional change.
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
drivers/block/swim_asm.S | 251 ++++++++++++++++++++-------------------
1 file changed, 128 insertions(+), 123 deletions(-)
diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
index c17a25e1cd33..65b4e4658e10 100644
--- a/drivers/block/swim_asm.S
+++ b/drivers/block/swim_asm.S
@@ -14,33 +14,33 @@
* 2008-11-05 (lv) - add get_swim_mode
*/
- .equ write_data, 0x0000
- .equ write_mark, 0x0200
- .equ write_CRC, 0x0400
- .equ write_parameter,0x0600
- .equ write_phase, 0x0800
- .equ write_setup, 0x0a00
- .equ write_mode0, 0x0c00
- .equ write_mode1, 0x0e00
- .equ read_data, 0x1000
- .equ read_mark, 0x1200
- .equ read_error, 0x1400
- .equ read_parameter, 0x1600
- .equ read_phase, 0x1800
- .equ read_setup, 0x1a00
- .equ read_status, 0x1c00
- .equ read_handshake, 0x1e00
-
- .equ o_side, 0
- .equ o_track, 1
- .equ o_sector, 2
- .equ o_size, 3
- .equ o_crc0, 4
- .equ o_crc1, 5
-
- .equ seek_time, 30000
- .equ max_retry, 40
- .equ sector_size, 512
+ .equ .Lwrite_data, 0x0000
+ .equ .Lwrite_mark, 0x0200
+ .equ .Lwrite_CRC, 0x0400
+ .equ .Lwrite_parameter, 0x0600
+ .equ .Lwrite_phase, 0x0800
+ .equ .Lwrite_setup, 0x0a00
+ .equ .Lwrite_mode0, 0x0c00
+ .equ .Lwrite_mode1, 0x0e00
+ .equ .Lread_data, 0x1000
+ .equ .Lread_mark, 0x1200
+ .equ .Lread_error, 0x1400
+ .equ .Lread_parameter, 0x1600
+ .equ .Lread_phase, 0x1800
+ .equ .Lread_setup, 0x1a00
+ .equ .Lread_status, 0x1c00
+ .equ .Lread_handshake, 0x1e00
+
+ .equ .Lo_side, 0
+ .equ .Lo_track, 1
+ .equ .Lo_sector, 2
+ .equ .Lo_size, 3
+ .equ .Lo_crc0, 4
+ .equ .Lo_crc1, 5
+
+ .equ .Lseek_time, 30000
+ .equ .Lmax_retry, 40
+ .equ .Lsector_size, 512
.equ .Lmr_clear_fifo, 0x01
.equ .Lmr_action, 0x08
@@ -56,91 +56,96 @@ swim_read_sector_header:
moveml %d1-%d5/%a0-%a5,%sp@-
movel %a6@(0x0c), %a4
moveq #-1, %d0
- bsr mfm_read_addrmark
+ bsr .Lmfm_read_addrmark
moveml %sp@+, %d1-%d5/%a0-%a5
unlk %a6
rts
-sector_address_mark:
+.Lsector_address_mark:
.byte 0xa1, 0xa1, 0xa1, 0xfe
-sector_data_mark:
+.Lsector_data_mark:
.byte 0xa1, 0xa1, 0xa1, 0xfb
-mfm_read_addrmark:
+.Lmfm_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
-
-wait_header_init:
- moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
- moveb #.Lmr_clear_fifo, %a3@(write_mode1 - read_mark)
- moveb #.Lmr_clear_fifo, %a3@(write_mode0 - read_mark)
- tstb %a3@(read_error - read_mark)
- moveb #.Lmr_action, %a3@(write_mode1 - read_mark)
-
- lea sector_address_mark, %a0
+ lea %a3@(.Lread_handshake), %a2
+ lea %a3@(.Lread_data), %a5
+ lea %a3@(.Lread_mark), %a3
+ movew #.Lseek_time, %d2
+
+.Lwait_header_init:
+ moveb #.Lmr_write_action, %a3@(.Lwrite_mode0 - .Lread_mark)
+ moveb #.Lmr_clear_fifo, %a3@(.Lwrite_mode1 - .Lread_mark)
+ moveb #.Lmr_clear_fifo, %a3@(.Lwrite_mode0 - .Lread_mark)
+ tstb %a3@(.Lread_error - .Lread_mark)
+ moveb #.Lmr_action, %a3@(.Lwrite_mode1 - .Lread_mark)
+
+ lea .Lsector_address_mark, %a0
moveq #3, %d1
-wait_addr_mark_byte:
+.Lwait_addr_mark_byte:
tstb %a2@
- dbmi %d2, wait_addr_mark_byte
- bpl signal_nonyb
+ dbmi %d2, .Lwait_addr_mark_byte
+ bpl .Lsignal_nonyb
moveb %a3@, %d3
cmpb %a0@+, %d3
- dbne %d1, wait_addr_mark_byte
- bne wait_header_init
+ dbne %d1, .Lwait_addr_mark_byte
+ bne .Lwait_header_init
- moveq #max_retry, %d2
-amark0: tstb %a2@
- dbmi %d2, amark0
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lamark0:
+ tstb %a2@
+ dbmi %d2, .Lamark0
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_track)
+ moveb %a5@, %a4@(.Lo_track)
- moveq #max_retry, %d2
-amark1: tstb %a2@
- dbmi %d2, amark1
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lamark1:
+ tstb %a2@
+ dbmi %d2, .Lamark1
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_side)
+ moveb %a5@, %a4@(.Lo_side)
- moveq #max_retry, %d2
-amark2: tstb %a2@
- dbmi %d2, amark2
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lamark2:
+ tstb %a2@
+ dbmi %d2, .Lamark2
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_sector)
+ moveb %a5@, %a4@(.Lo_sector)
- moveq #max_retry, %d2
-amark3: tstb %a2@
- dbmi %d2, amark3
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lamark3:
+ tstb %a2@
+ dbmi %d2, .Lamark3
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_size)
+ moveb %a5@, %a4@(.Lo_size)
- moveq #max_retry, %d2
-crc0: tstb %a2@
- dbmi %d2, crc0
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lcrc0:
+ tstb %a2@
+ dbmi %d2, .Lcrc0
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_crc0)
+ moveb %a5@, %a4@(.Lo_crc0)
- moveq #max_retry, %d2
-crc1: moveb %a2@, %d5
- dbmi %d2, crc1
- bpl signal_nonyb
+ moveq #.Lmax_retry, %d2
+.Lcrc1: moveb %a2@, %d5
+ dbmi %d2, .Lcrc1
+ bpl .Lsignal_nonyb
- moveb %a5@, %a4@(o_crc1)
+ moveb %a5@, %a4@(.Lo_crc1)
andb #.Lhr_crc_error, %d5
- bne signal_nonyb
+ bne .Lsignal_nonyb
moveq #0, %d0
-signal_nonyb:
- moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
+.Lsignal_nonyb:
+ moveb #.Lmr_write_action, %a3@(.Lwrite_mode0 - .Lread_mark)
rts
.global swim_read_sector_data
@@ -149,86 +154,86 @@ swim_read_sector_data:
moveml %d1-%d5/%a0-%a5,%sp@-
movel %a6@(0x0c), %a4
moveq #-1, %d0
- bsr mfm_read_data
+ bsr .Lmfm_read_data
moveml %sp@+, %d1-%d5/%a0-%a5
unlk %a6
rts
-mfm_read_data:
+.Lmfm_read_data:
movel %a6@(0x08), %a3
- lea %a3@(read_handshake), %a2
- lea %a3@(read_data), %a5
- lea %a3@(read_mark), %a3
- movew #seek_time, %d2
-
-wait_data_init:
- moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
- moveb #.Lmr_clear_fifo, %a3@(write_mode1 - read_mark)
- moveb #.Lmr_clear_fifo, %a3@(write_mode0 - read_mark)
- tstb %a3@(read_error - read_mark)
- moveb #.Lmr_action, %a3@(write_mode1 - read_mark)
-
- lea sector_data_mark, %a0
+ lea %a3@(.Lread_handshake), %a2
+ lea %a3@(.Lread_data), %a5
+ lea %a3@(.Lread_mark), %a3
+ movew #.Lseek_time, %d2
+
+.Lwait_data_init:
+ moveb #.Lmr_write_action, %a3@(.Lwrite_mode0 - .Lread_mark)
+ moveb #.Lmr_clear_fifo, %a3@(.Lwrite_mode1 - .Lread_mark)
+ moveb #.Lmr_clear_fifo, %a3@(.Lwrite_mode0 - .Lread_mark)
+ tstb %a3@(.Lread_error - .Lread_mark)
+ moveb #.Lmr_action, %a3@(.Lwrite_mode1 - .Lread_mark)
+
+ lea .Lsector_data_mark, %a0
moveq #3, %d1
/* wait data address mark */
-wait_data_mark_byte:
+.Lwait_data_mark_byte:
tstb %a2@
- dbmi %d2, wait_data_mark_byte
- bpl data_exit
+ dbmi %d2, .Lwait_data_mark_byte
+ bpl .Ldata_exit
moveb %a3@, %d3
cmpb %a0@+, %d3
- dbne %d1, wait_data_mark_byte
- bne wait_data_init
+ dbne %d1, .Lwait_data_mark_byte
+ bne .Lwait_data_init
/* read data */
- movel #sector_size - 1, %d4 /* sector size */
-read_new_data:
- movew #max_retry, %d2
-read_data_loop:
+ movel #.Lsector_size - 1, %d4 /* sector size */
+.Lread_new_data:
+ movew #.Lmax_retry, %d2
+.Lread_data_loop:
moveb %a2@, %d5
andb #(.Lhr_fifo_2bytes + .Lhr_fifo_1byte), %d5
beq 1f
- movew #max_retry, %d2
+ movew #.Lmax_retry, %d2
moveb %a5@, %a4@+
dbra %d4, 1f
- bra data_crc0
+ bra .Ldata_crc0
1: andb #.Lhr_fifo_2bytes, %d5
- dbne %d2, read_data_loop
- beq data_exit
+ dbne %d2, .Lread_data_loop
+ beq .Ldata_exit
moveb %a5@, %a4@+
- dbra %d4, read_new_data
+ dbra %d4, .Lread_new_data
/* read CRC */
- movew #max_retry, %d2
-data_crc0:
+ movew #.Lmax_retry, %d2
+.Ldata_crc0:
tstb %a2@
- dbmi %d2, data_crc0
- bpl data_exit
+ dbmi %d2, .Ldata_crc0
+ bpl .Ldata_exit
moveb %a5@, %d2
- moveq #max_retry, %d2
-data_crc1:
+ moveq #.Lmax_retry, %d2
+.Ldata_crc1:
moveb %a2@, %d5
- dbmi %d2, data_crc1
- bpl data_exit
+ dbmi %d2, .Ldata_crc1
+ bpl .Ldata_exit
moveb %a5@, %d2
andb #.Lhr_crc_error, %d5
- bne data_exit
+ bne .Ldata_exit
/* return number of bytes read */
- movel #sector_size, %d0
+ movel #.Lsector_size, %d0
addw #1, %d4
subl %d4, %d0
-data_exit:
- moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
+.Ldata_exit:
+ moveb #.Lmr_write_action, %a3@(.Lwrite_mode0 - .Lread_mark)
rts
--
2.52.0
next prev parent reply other threads:[~2026-07-16 10:22 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 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 11/31] swim: Handle FIFO timeout error Finn Thain
2026-07-20 19:17 ` 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 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 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 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
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 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 30/31] swim: Define symbols for constants Finn Thain
2026-07-26 15:47 ` Laurent Vivier
2026-07-16 10:02 ` Finn Thain [this message]
2026-07-26 15:51 ` [PATCH 31/31] swim: Unexport global symbols 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 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 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 21/31] swim: Revisit delays Finn Thain
2026-07-26 14:50 ` 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 15/31] swim: Don't use the mark register to read data Finn Thain
2026-07-21 5:49 ` 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 26/31] swim: Add some helpful references Finn Thain
2026-07-26 15:41 ` 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 17/31] swim: Convert to blocking queue Finn Thain
2026-07-21 6:03 ` 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 07/31] swim: Enable clock divider only where appropriate Finn Thain
2026-07-20 18:49 ` Laurent Vivier
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 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 18/31] swim: Remove redundant RELAX actions Finn Thain
2026-07-21 6:10 ` 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=b1193c2e8e8850922bec72f7ea2b07710d9f0fdd.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®