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=1795029917; b=chKE4eIUIyVNIHvW90+J1nSPXvUC7Z+y6h6RqtalRuXDgHv6NSO2X6u6OZA16W3LEjmU YdKcG4L8FmU/AdPUOEODm2H/ErFC6zp2K+JHOcv6N+3Z00o9Qf1kg9fZfPrDqgDk17wo0 VqtujlNLlcAUxdsIpWUlPatjaDjmYRAJY+yrn3qhB2PogG33SNiGO9i07vrfVFlJoKNIA S87t+3+zBFEoo6i7RbphEMrs4sBd5AF23/Ic6X6gMX+lr3M9COoHfrtM85rmKx6dSs1gt mgLqWWwi/HnSnwhmHfd1n/J4K70MQPBmqcjIkR7p5GonjoqWpgrlDhW4npUMbrtNRLA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029917; 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=o+eeKEbJxz6zn2TPSN03AsTw26md4BmCGcMESEAjTjQ=; b=sR8GDIw733S4eQLBegn60hvObMMlkCq21CI4A1KfarA8X9u7n+zYuuXi663XIwYCnZjh 8ktmMdFCJtuuWVmR3ed1hofwEyN1oWjjxTGcBG7vo4exuzozwhRiMCBceXY88lwSaJ/Ha D2Nq3b2uzYVJ7HKsCbCHmyj9qlBSC4+xm1y8LbOeH6W2j7EmqY4TKGVf09e0VGH14wD0/ IZeHIV6PJJgha47Ub2ETYRiWiyWitmFYj91bgfRixv03XWITqxoJ77Cb+ZpTD+qPLTTlc ux63rWa1hbmXjzsBdBjrnaXIg6GIqgS9YSxDjgcMPFTvZDddWEU3qewnyEbjGxCxBSQ== 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=1Zup2Jab; 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 D8F9560A260E; Wed, 18 Nov 2026 19:25:17 +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=1Zup2Jab Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34FE71F000CD; Wed, 18 Nov 2026 19:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029917; bh=o+eeKEbJxz6zn2TPSN03AsTw26md4BmCGcMESEAjTjQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1Zup2Jabt+H1ZnrTNG2wHwHKzWZXR2TflwVXnXBma3w0czom0RVc/JUDGPZHQLZ8Z Z8CCsqKxbmv7OmI2hvp/NTrKz2S9qRli/Qodx3Iw+yBuUQkI0VhQ1llTP9G+bR2JJO J9GBGKQyBHHuv95eotjB+VFmZYWYks07xuBpt+rg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Laurent Vivier , Finn Thain , Stan Johnson , Jens Axboe , Sasha Levin Subject: [PATCH 6.12 0521/1756] swim: Perform ISM/IWM mode switching according to specs Date: Wed, 18 Nov 2026 15:44:08 +0100 Message-ID: <20261118150029.898367249@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit 52981bb358d1b5c38040b00f81e2cf973f9148ad ] The SWIM spec says, "MOTOREN must be low to switch modes" and "after switching from ISM to IWM, the very first command must be a clear L7". The ISM spec says, MOTOREN "must not be cleared until after the Action bit is cleared". Perform those operations in the correct sequence. When switching to ISM mode, the Mode register has to be selected with a particular sequence of bit flips. Set q7 low then q6 low then mtrOff. 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/75714ecc9a12d59511967dc9e24163dc8f3bbdd8.1788513996.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 6f40b057032a8..3e08fbf2ba2d9 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -149,6 +149,7 @@ struct iwm { #define ACTION 0x08 #define WRITE_MODE 0x10 #define HEDSEL 0x20 +#define ISM_SELECT 0x40 #define MOTON 0x80 /*----------------------------------------------------------------------------*/ @@ -223,18 +224,21 @@ extern int swim_read_sector_data(struct swim __iomem *base, static DEFINE_MUTEX(swim_mutex); static inline void set_swim_mode(struct swim __iomem *base, int enable) { - struct iwm __iomem *iwm_base; + struct iwm __iomem *iwm_base = (struct iwm __iomem *)base; unsigned long flags; if (!enable) { - swim_write(base, mode0, 0xf8); + swim_write(base, mode0, ACTION); + swim_write(base, mode0, ENBL1 | ENBL2 | MOTON); + swim_write(base, mode0, ISM_SELECT); + iwm_read(iwm_base, q7L); return; } - iwm_base = (struct iwm __iomem *)base; local_irq_save(flags); iwm_read(iwm_base, q7L); + iwm_read(iwm_base, q6L); iwm_read(iwm_base, mtrOff); iwm_read(iwm_base, q6H); -- 2.53.0