From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795024191; b=mX5qo6V+DCDRxI7ymGIQc6ZK7pQisHFNpGEiFmYqWHJbY/zr5Vfx8B/Q25Ff+bUjHITC 5aYmDbS2Vi97gno44aVkyFi5oA/99QJIIDcVmNKHEt7rWa5i9NiJkOw7svVto387c8v4Z xp8KYxpT77XmnWxkGE5zflyvpTgUF09uUNInnBfbXvQHcWphNYIpaVBgsF5UeuECyACFi qFZEzx+if1wM8brMIfhTmxPrkp/jEwOv0caWuNEHgpay3CwndaMyd78KI/c8aHTAJsjCt I1KGgQGEc0legCW8oxZ3bSRcGBViu6+70rgzCvQYq6QeVeUJ+stepexxqUUAbk0ltCQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024191; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=jrkLNZa50bvdJYOw9plDAQt9j1RrPx2lNgkFxgnCCis=; b=aFZYbyrtjqhki4HBs5faETnSyvVQtYkTMZbJrALdQkVQQDGxBcdpd0vRqdIQJ9N2GiSu rIHh6Jzfd68Ox4r6B7oonLzF27PtUsluZA1g827at7n3tMAxMJw8zWEAVn2GjFHFnviAN wKGC/CdACpywPVNklJBKd0d4l90ejjtL3OJS2dfh+z+Guhs2rYM3eAvlcKerPTdlRESWn 1D2v1lIX5nwcG81CIcNlQmZ8SicKx99o87x6cWwplkDMfajtx4fuMiW+drRrILIEK9Mnp 1T8KlXL4knrbpBV/UXMeq/fwNvv1OQzCatEYmU5pFkrXRqfwsAWZ/TJokq5mUFJR/rw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iSEQlKPl; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 374AE606A31C; Wed, 18 Nov 2026 17:49:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=iSEQlKPl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92D9B1F000C4; Wed, 18 Nov 2026 17:49:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024191; bh=jrkLNZa50bvdJYOw9plDAQt9j1RrPx2lNgkFxgnCCis=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iSEQlKPlHqx3S3jEG+HIDCXDG48dMEsZUC4BPS7biHMbO/SVP+NrSfMkzEW81/oeX V32qyX/C2vxe6/xo3oxXiIzjASbhSnIRTiYO/TLHY7+xTyP20BSIn7re9qR92tTZX+ bOR3Lv4d/SOExvWoar1FVAj2lMlDcejFMxrNrYMg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joshua Thompson , Geert Uytterhoeven , Laurent Vivier , Finn Thain , Stan Johnson , Jens Axboe , Sasha Levin Subject: [PATCH 6.18 0636/2151] swim: Enable clock divider only where appropriate Date: Wed, 18 Nov 2026 15:39:31 +0100 Message-ID: <20261118150145.050964361@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit 3c02a14c89962c88ed0abb3cce4101021c63149c ] 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. Cc: Joshua Thompson Acked-by: Geert Uytterhoeven Reviewed-by: Laurent Vivier Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support") Signed-off-by: Finn Thain Tested-by: Stan Johnson Link: https://patch.msgid.link/483efa2f8ac6beb2a2d4fa2d8b431cb1a8b560c7.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- arch/m68k/mac/config.c | 31 ++++++++++++++++++++++++++++++- drivers/block/swim.c | 9 ++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index c0033f885ed4f..b745cf20a71f9 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, }; + bool fast_fclk = false; + + /* 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: + fast_fclk = true; + break; + } - platform_device_register_simple("swim", -1, &swim_rsrc, 1); + platform_device_register_resndata(NULL, "swim", -1, &swim_rsrc, 1, + &fast_fclk, sizeof(fast_fclk)); } /* diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 7e567e7219ba1..a2303e2e24ff0 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -806,8 +806,11 @@ 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); + bool *data = pdev->dev.platform_data; + bool fast_fclk = data && *data; struct queue_limits lim = { .features = BLK_FEAT_ROTATIONAL, }; @@ -815,7 +818,7 @@ static int swim_floppy_init(struct swim_priv *swd) int drive; struct swim __iomem *base = swd->base; - swim_write(base, setup, S_IBM_DRIVE | S_FCLK_DIV2); + swim_write(base, setup, S_IBM_DRIVE | (fast_fclk ? S_FCLK_DIV2 : 0)); swim_set_parameters(base); @@ -931,7 +934,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.53.0