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 v2 07/32] swim: Enable clock divider only where appropriate
Date: Mon, 17 Aug 2026 11:17:10 +1000 [thread overview]
Message-ID: <1e349506a7cc6aa574aacbd4c69c240b5a1e3eb8.1786929430.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1786929430.git.fthain@linux-m68k.org>
Some models have a 16 MHz FCLK oscillator and others 32 MHz. Put this
information into the swim device platform_data so that the driver can
correctly enable the clock divider. When this is enabled incorrectly,
nothing can be read and failures from the Error Correction Machine are
flagged in the error register.
This is chip initialization, so do this in swim_floppy_init() rather
than floppy_open(). Drop the udelay() which was apparently copied and
pasted from swim3.c, where it relates to interrupts (of which this chip
has none).
Cc: Joshua Thompson <funaho@jurai.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
arch/m68k/mac/config.c | 31 ++++++++++++++++++++++++++++++-
drivers/block/swim.c | 11 +++++++----
2 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index c0033f885ed4..dba3de21c3c4 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -984,8 +984,37 @@ static int __init mac_platform_init(void)
.start = swim_base,
.end = swim_base + 0x1FFF,
};
+ unsigned int data = 0;
+
+ /* Models in this list are supposed to run FCLK at 32 MHz */
+ switch (macintosh_config->ident) {
+ case MAC_MODEL_CCL:
+ case MAC_MODEL_CCLII:
+ case MAC_MODEL_LCIII:
+ case MAC_MODEL_Q605:
+ case MAC_MODEL_Q605_ACC:
+ case MAC_MODEL_Q610:
+ case MAC_MODEL_Q630:
+ case MAC_MODEL_Q650:
+ case MAC_MODEL_Q800:
+ case MAC_MODEL_P460:
+ case MAC_MODEL_P475:
+ case MAC_MODEL_P475F:
+ case MAC_MODEL_P520:
+ case MAC_MODEL_P550:
+ case MAC_MODEL_P575:
+ case MAC_MODEL_P588:
+ case MAC_MODEL_TV:
+ case MAC_MODEL_C610:
+ case MAC_MODEL_C650:
+ case MAC_MODEL_PB190:
+ case MAC_MODEL_PB520:
+ data = 1;
+ break;
+ }
- platform_device_register_simple("swim", -1, &swim_rsrc, 1);
+ platform_device_register_resndata(NULL, "swim", -1, &swim_rsrc, 1,
+ &data, sizeof(data));
}
/*
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index c2d7ad3f065c..597d35b514ae 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -628,8 +628,7 @@ static int floppy_open(struct gendisk *disk, blk_mode_t mode)
fs->ref_count = -1;
else
fs->ref_count++;
- swim_write(base, setup, S_IBM_DRIVE | S_FCLK_DIV2);
- udelay(10);
+
swim_drive(base, fs->location);
swim_motor(base, ON);
swim_action(base, SETMFM);
@@ -807,8 +806,10 @@ static void swim_set_parameters(struct swim __iomem *base)
swim_write(base, parameter, mem[i]);
}
-static int swim_floppy_init(struct swim_priv *swd)
+static int swim_floppy_init(struct platform_device *pdev)
{
+ struct swim_priv *swd = platform_get_drvdata(pdev);
+ unsigned int *data = pdev->dev.platform_data;
struct queue_limits lim = {
.features = BLK_FEAT_ROTATIONAL,
};
@@ -816,6 +817,8 @@ static int swim_floppy_init(struct swim_priv *swd)
int drive;
struct swim __iomem *base = swd->base;
+ swim_write(base, setup, S_IBM_DRIVE | (*data ? S_FCLK_DIV2 : 0));
+
swim_set_parameters(base);
/* scan floppy drives */
@@ -930,7 +933,7 @@ static int swim_probe(struct platform_device *dev)
swd->base = swim_base;
- ret = swim_floppy_init(swd);
+ ret = swim_floppy_init(dev);
if (ret)
goto out_kfree;
--
2.52.0
next prev parent reply other threads:[~2026-08-17 1:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 1:17 [PATCH v2 00/32] block/swim: Fixes and improvements Finn Thain
2026-08-17 1:17 ` [PATCH v2 24/32] swim: Don't search beyond the first data mark Finn Thain
2026-08-17 1:17 ` [PATCH v2 18/32] swim: Remove redundant RELAX actions Finn Thain
2026-08-17 1:17 ` [PATCH v2 17/32] swim: Convert to blocking queue Finn Thain
2026-08-17 1:17 ` [PATCH v2 23/32] swim: Don't needlessly re-read sectors Finn Thain
2026-08-17 1:17 ` [PATCH v2 20/32] swim: Check drive ready bit Finn Thain
2026-08-17 1:17 ` [PATCH v2 26/32] swim: Move swd initialization Finn Thain
2026-08-17 1:17 ` [PATCH v2 28/32] swim: Remove unused macro definitions Finn Thain
2026-08-17 1:17 ` [PATCH v2 03/32] swim: Enable the drive when probing Finn Thain
2026-08-17 1:17 ` [PATCH v2 13/32] swim: Check for CRC errors Finn Thain
2026-08-17 1:17 ` [PATCH v2 31/32] swim: Define symbols for constants Finn Thain
2026-08-17 1:17 ` [PATCH v2 32/32] swim: Unexport global symbols Finn Thain
2026-08-17 1:17 ` [PATCH v2 27/32] swim: Add some helpful references Finn Thain
2026-08-17 1:17 ` [PATCH v2 02/32] swim: Select appropriate drive once only Finn Thain
2026-08-17 1:17 ` [PATCH v2 09/32] swim: Recalibrate when drive is probed Finn Thain
2026-08-17 1:17 ` [PATCH v2 10/32] swim: Add track zero recalibration delay Finn Thain
2026-08-17 1:17 ` [PATCH v2 08/32] swim: Don't start motor until medium is present Finn Thain
2026-08-17 1:17 ` [PATCH v2 14/32] swim: Check error register during sector read Finn Thain
2026-08-17 1:17 ` [PATCH v2 29/32] swim: Clean up whitespace Finn Thain
2026-08-17 1:17 ` [PATCH v2 15/32] swim: Don't use the mark register to read data Finn Thain
2026-08-17 1:17 ` [PATCH v2 30/32] swim: Define macros for constants Finn Thain
2026-08-17 1:17 ` [PATCH v2 21/32] swim: Revisit delays Finn Thain
2026-08-17 1:17 ` [PATCH v2 12/32] swim: Simplify return value initialization Finn Thain
2026-08-17 1:17 ` [PATCH v2 06/32] swim: Configure parameter memory Finn Thain
2026-08-17 1:17 ` [PATCH v2 01/32] swim: Assert strobe with stable outputs Finn Thain
2026-08-17 1:17 ` [PATCH v2 22/32] swim: Remove pointless mode0 register write Finn Thain
2026-08-17 1:17 ` Finn Thain [this message]
2026-08-31 7:38 ` [PATCH v2 07/32] swim: Enable clock divider only where appropriate Geert Uytterhoeven
2026-09-01 7:56 ` Finn Thain
2026-09-01 9:10 ` Geert Uytterhoeven
2026-08-17 1:17 ` [PATCH v2 25/32] swim: Remove pointless specifiers Finn Thain
2026-08-17 1:17 ` [PATCH v2 11/32] swim: Handle FIFO timeout error Finn Thain
2026-08-17 1:17 ` [PATCH v2 05/32] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-08-17 1:17 ` [PATCH v2 19/32] swim: Deduplicate polling loops Finn Thain
2026-08-17 1:17 ` [PATCH v2 04/32] swim: Don't disable drive after every sector Finn Thain
2026-08-17 1:17 ` [PATCH v2 16/32] swim: Fix buffer overflow 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=1e349506a7cc6aa574aacbd4c69c240b5a1e3eb8.1786929430.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®