mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Finn Thain <fthain@linux-m68k.org>
To: Jens Axboe <axboe@kernel.dk>, Laurent Vivier <laurent@vivier.eu>
Cc: 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 v3 10/33] swim: Recalibrate when drive is probed
Date: Fri, 04 Sep 2026 19:26:36 +1000	[thread overview]
Message-ID: <119e799afcc00d6bd4a479c31e0c960cb1a1d71b.1788513997.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1788513996.git.fthain@linux-m68k.org>

Track zero recalibration can be slow and is normally done only once i.e.
during system POST or boot-up. Recalibrate once after the drive is probed
rather than every time the device is opened. Don't register the drive if
recalibration fails. Park the heads before ejecting.

Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
Changed since v1:
 - Refactor swim_add_floppy() slightly. Start spindle motor before
   recalibration if a disk is loaded.
 - Change return type of swim_add_floppy() to void.
 - Park heads at track 40 because that's what MacOS does.

Changed since v2:
 - Dropped reviewed-by tag due to unreviewed changes made since v1.
---
 drivers/block/swim.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 64073e8f6c36..5daa60938505 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -412,6 +412,7 @@ static inline int swim_track00(struct swim __iomem *base)
 	if (swim_readbit(base, TRACK_ZERO))
 		return 0;
 
+	pr_err("swim: track zero recalibration failed\n");
 	return -1;
 }
 
@@ -456,6 +457,7 @@ static int floppy_eject(struct floppy_state *fs)
 	struct swim __iomem *base = fs->swd->base;
 
 	swim_drive(base, fs->location);
+	swim_track(fs, 40);
 	swim_motor(base, OFF);
 	swim_eject(base);
 	swim_drive(base, NO_DRIVE);
@@ -596,13 +598,6 @@ static void setup_medium(struct floppy_state *fs)
 		struct floppy_struct *g;
 		fs->disk_in = 1;
 		fs->write_protected = swim_readbit(base, WRITE_PROT);
-
-		if (swim_track00(base))
-			printk(KERN_ERR
-				"SWIM: cannot move floppy head to track 0\n");
-
-		swim_track00(base);
-
 		fs->type = swim_readbit(base, TWOMEG_MEDIA) ?
 			HD_MEDIA : DD_MEDIA;
 		fs->head_number = swim_readbit(base, SINGLE_SIDED) ? 1 : 2;
@@ -610,7 +605,6 @@ static void setup_medium(struct floppy_state *fs)
 		fs->total_secs = g->size;
 		fs->secpercyl = g->head * g->sect;
 		fs->secpertrack = g->sect;
-		fs->track = 0;
 	} else {
 		fs->disk_in = 0;
 	}
@@ -759,24 +753,33 @@ static const struct block_device_operations floppy_fops = {
 	.check_events	 = floppy_check_events,
 };
 
-static int swim_add_floppy(struct swim_priv *swd, enum drive_location location)
+static void swim_add_floppy(struct swim_priv *swd, enum drive_location location)
 {
 	struct floppy_state *fs = &swd->unit[swd->floppy_count];
 	struct swim __iomem *base = swd->base;
 
-	fs->location = location;
+	swim_drive(base, location);
+	if (!swim_readbit(base, DRIVE_PRESENT) ||
+	    swim_readbit(base, ONEMEG_DRIVE))
+		goto out;
+	if (swim_readbit(base, DISK_IN))
+		swim_motor(base, ON);
+	if (swim_track00(base))
+		goto out;
 
-	swim_motor(base, OFF);
+	fs->location = location;
 
 	fs->type = HD_MEDIA;
 	fs->head_number = 2;
 
 	fs->ref_count = 0;
 	fs->ejected = 1;
+	fs->track = 0;
 
 	swd->floppy_count++;
 
-	return 0;
+out:
+	swim_motor(base, OFF);
 }
 
 static const struct blk_mq_ops swim_mq_ops = {
@@ -826,14 +829,8 @@ static int swim_floppy_init(struct platform_device *pdev)
 
 	/* scan floppy drives */
 
-	swim_drive(base, INTERNAL_DRIVE);
-	if (swim_readbit(base, DRIVE_PRESENT) &&
-	    !swim_readbit(base, ONEMEG_DRIVE))
-		swim_add_floppy(swd, INTERNAL_DRIVE);
-	swim_drive(base, EXTERNAL_DRIVE);
-	if (swim_readbit(base, DRIVE_PRESENT) &&
-	    !swim_readbit(base, ONEMEG_DRIVE))
-		swim_add_floppy(swd, EXTERNAL_DRIVE);
+	swim_add_floppy(swd, INTERNAL_DRIVE);
+	swim_add_floppy(swd, EXTERNAL_DRIVE);
 	swim_drive(base, NO_DRIVE);
 
 	/* register floppy drives */
-- 
2.52.0


  parent reply	other threads:[~2026-09-04  9:32 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-04  9:26 [PATCH v3 00/33] block/swim: Fixes and improvements Finn Thain
2026-09-04  9:26 ` [PATCH v3 21/33] swim: Check drive ready bit Finn Thain
2026-09-04  9:26 ` [PATCH v3 25/33] swim: Don't search beyond the first data mark Finn Thain
2026-09-04  9:26 ` [PATCH v3 12/33] swim: Handle FIFO timeout error Finn Thain
2026-09-04  9:26 ` [PATCH v3 01/33] swim: Assert strobe with stable outputs Finn Thain
2026-09-04  9:26 ` [PATCH v3 16/33] swim: Don't use the mark register to read data Finn Thain
2026-09-04  9:26 ` [PATCH v3 05/33] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-09-04  9:26 ` [PATCH v3 07/33] swim: Refactor SWIM setup Finn Thain
2026-09-04  9:26 ` [PATCH v3 23/33] swim: Remove pointless mode0 register write Finn Thain
2026-09-04  9:26 ` [PATCH v3 15/33] swim: Check error register during sector read Finn Thain
2026-09-04  9:26 ` [PATCH v3 22/33] swim: Revisit delays Finn Thain
2026-09-04  9:26 ` [PATCH v3 30/33] swim: Clean up whitespace Finn Thain
2026-09-04  9:26 ` Finn Thain [this message]
2026-09-04  9:26 ` [PATCH v3 08/33] swim: Enable clock divider only where appropriate Finn Thain
2026-09-04  9:26 ` [PATCH v3 02/33] swim: Select appropriate drive once only Finn Thain
2026-09-04  9:26 ` [PATCH v3 29/33] swim: Remove unused macro definitions Finn Thain
2026-09-04  9:26 ` [PATCH v3 06/33] swim: Configure parameter memory Finn Thain
2026-09-04  9:26 ` [PATCH v3 11/33] swim: Add track zero recalibration delay Finn Thain
2026-09-04  9:26 ` [PATCH v3 14/33] swim: Check for CRC errors Finn Thain
2026-09-04  9:26 ` [PATCH v3 27/33] swim: Move swd initialization Finn Thain
2026-09-04  9:26 ` [PATCH v3 26/33] swim: Remove pointless specifiers Finn Thain
2026-09-04  9:26 ` [PATCH v3 24/33] swim: Don't needlessly re-read sectors Finn Thain
2026-09-04  9:26 ` [PATCH v3 13/33] swim: Simplify return value initialization Finn Thain
2026-09-04  9:26 ` [PATCH v3 04/33] swim: Don't disable drive after every sector Finn Thain
2026-09-04  9:26 ` [PATCH v3 18/33] swim: Convert to blocking queue Finn Thain
2026-09-04  9:26 ` [PATCH v3 03/33] swim: Enable the drive when probing Finn Thain
2026-09-04  9:26 ` [PATCH v3 28/33] swim: Add some helpful references Finn Thain
2026-09-04  9:26 ` [PATCH v3 09/33] swim: Don't start motor until medium is present Finn Thain
2026-09-04  9:26 ` [PATCH v3 33/33] swim: Unexport global symbols Finn Thain
2026-09-04  9:26 ` [PATCH v3 32/33] swim: Define symbols for constants Finn Thain
2026-09-04  9:26 ` [PATCH v3 31/33] swim: Define macros " Finn Thain
2026-09-04  9:26 ` [PATCH v3 17/33] swim: Fix buffer overflow Finn Thain
2026-09-04  9:26 ` [PATCH v3 19/33] swim: Remove redundant RELAX actions Finn Thain
2026-09-04  9:26 ` [PATCH v3 20/33] swim: Deduplicate polling loops Finn Thain
2026-09-23  8:26 ` [PATCH v3 00/33] block/swim: Fixes and improvements Stanley J. Johnson
2026-09-23 11:15 ` Jens Axboe

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=119e799afcc00d6bd4a479c31e0c960cb1a1d71b.1788513997.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®