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 08/31] swim: Don't start motor until medium is present
Date: Thu, 16 Jul 2026 20:02:15 +1000 [thread overview]
Message-ID: <b54674c57285acfba1179eead2c3b7868c1061a0.1784196135.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1784196135.git.fthain@linux-m68k.org>
The spindle motor should not be running when a disk is to be inserted.
Don't start the motor while the drive is empty.
Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
drivers/block/swim.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index c49e584cd663..03a89916d4ed 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -630,8 +630,7 @@ static int floppy_open(struct gendisk *disk, blk_mode_t mode)
fs->ref_count++;
swim_drive(base, fs->location);
- swim_motor(base, ON);
- swim_action(base, SETMFM);
+
if (fs->ejected)
setup_medium(fs);
if (!fs->disk_in) {
@@ -639,6 +638,9 @@ static int floppy_open(struct gendisk *disk, blk_mode_t mode)
goto out;
}
+ swim_motor(base, ON);
+ swim_action(base, SETMFM);
+
set_capacity(fs->disk, fs->total_secs);
if (mode & BLK_OPEN_NDELAY)
--
2.52.0
next prev parent reply other threads:[~2026-07-16 10:18 UTC|newest]
Thread overview: 32+ 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 03/31] swim: Enable the drive when probing Finn Thain
2026-07-16 10:02 ` [PATCH 30/31] swim: Define symbols for constants Finn Thain
2026-07-16 10:02 ` [PATCH 16/31] swim: Fix buffer overflow Finn Thain
2026-07-16 10:02 ` [PATCH 27/31] swim: Remove unused macro definitions Finn Thain
2026-07-16 10:02 ` [PATCH 25/31] swim: Move swd initialization Finn Thain
2026-07-16 10:02 ` [PATCH 22/31] swim: Remove pointless mode0 register write Finn Thain
2026-07-16 10:02 ` [PATCH 18/31] swim: Remove redundant RELAX actions Finn Thain
2026-07-16 10:02 ` [PATCH 24/31] swim: Remove pointless specifiers Finn Thain
2026-07-16 10:02 ` [PATCH 11/31] swim: Handle FIFO timeout error Finn Thain
2026-07-16 10:02 ` [PATCH 20/31] swim: Check drive ready bit Finn Thain
2026-07-16 10:02 ` Finn Thain [this message]
2026-07-16 10:02 ` [PATCH 12/31] swim: Simplify return value initialization Finn Thain
2026-07-16 10:02 ` [PATCH 13/31] swim: Check for CRC errors Finn Thain
2026-07-16 10:02 ` [PATCH 02/31] swim: Select appropriate drive once only Finn Thain
2026-07-16 10:02 ` [PATCH 19/31] swim: Deduplicate polling loops Finn Thain
2026-07-16 10:02 ` [PATCH 14/31] swim: Check error register during sector read Finn Thain
2026-07-16 10:02 ` [PATCH 09/31] swim: Recalibrate when drive is probed Finn Thain
2026-07-16 10:02 ` [PATCH 28/31] swim: Clean up whitespace Finn Thain
2026-07-16 10:02 ` [PATCH 29/31] swim: Define macros for constants Finn Thain
2026-07-16 10:02 ` [PATCH 05/31] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-07-16 10:02 ` [PATCH 26/31] swim: Add some helpful references Finn Thain
2026-07-16 10:02 ` [PATCH 06/31] swim: Configure parameter memory Finn Thain
2026-07-16 10:02 ` [PATCH 04/31] swim: Don't disable drive after every sector Finn Thain
2026-07-16 10:02 ` [PATCH 21/31] swim: Revisit delays Finn Thain
2026-07-16 10:02 ` [PATCH 31/31] swim: Unexport global symbols Finn Thain
2026-07-16 10:02 ` [PATCH 01/31] swim: Assert strobe with stable outputs Finn Thain
2026-07-16 10:02 ` [PATCH 23/31] swim: Don't needlessly re-read sectors Finn Thain
2026-07-16 10:02 ` [PATCH 15/31] swim: Don't use the mark register to read data Finn Thain
2026-07-16 10:02 ` [PATCH 07/31] swim: Enable clock divider only where appropriate Finn Thain
2026-07-16 10:02 ` [PATCH 17/31] swim: Convert to blocking queue Finn Thain
2026-07-16 10:02 ` [PATCH 10/31] swim: Add track zero recalibration delay Finn Thain
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=b54674c57285acfba1179eead2c3b7868c1061a0.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