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=1795024174; b=pwGdqe1mXdIWDGQjYOGwNGYOUl/Ag2u+Wf7sHtt47qzhn8lpQ/oDqqQXOQj85ulIrVTj aqsqw3is443odSlsTrqPL+g8zBuDgaVZ4FFMJqUBA5kwuxwbPMS8xfSAmahsHpVNiX2is +21uU17U5ItGfe1bn9qkHG4XjxcC87YT9uPH3cch9aaERgYZYPLpgbZFPpivrsHCmqsOy l9g3wYxfiKQm13eXIl6SYgeTJzNQLrf+VEPxRVlb8nTxtyqsZtVLnDjiWcJX2ViMukbAr 9NiE/ncZbWGL8ip3py8jdfl1VcypoNgcEzTa7hw4XCY9NcQMkisch8xJ/UFNgk39fHA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024174; 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=BxuDPC5XBie5Uxxq8H+iGuriKNkuT+YJTfrL3ibh1w8=; b=vTaiYlc2cMEYeviz0cKkGjS4XAsbiBpLckf3yyIb2I4EmDCmKEm4GSD+OYpR27GNdUZz 202p3yL4f4JH2X2sm0w17sULsJtjN/zzms1zmSdJLnxKm/fRqE3oXMyj9AV/8G3jnIgg1 Qj5NQDNxCQ1yVu8ivea9/wLOQbym6Aq+T3PVqq9frGLYDD9VCVphx+cEIvOhHmG3T+yxH tfroFmetikrkp8ukxCx9TG3BTxbrMCuhCZKivsK6wwQcGsbiInASvdXgqOKajXsa3wcZk s+fRAdlOY0t+008HtX/ZWHo22g8zAe+6H8WGI7HJ8EXHeqxa5MOZPucFT7NXyCybS4g== 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=uYsxHhsm; 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 009AD606A31C; Wed, 18 Nov 2026 17:49:34 +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=uYsxHhsm Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F5911F000C4; Wed, 18 Nov 2026 17:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024173; bh=BxuDPC5XBie5Uxxq8H+iGuriKNkuT+YJTfrL3ibh1w8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uYsxHhsmScedTZiB6EtQJjHFzuGs2qM7GdZUUZWjMDqNzHk4n6YovRlobJoHqeM/N PUAKWC8+XqONFeuYjQBKrVqIjC9AadL4Ldc3n93pgVeTzqZ2L170uAR/1Gv1iddAEh e7lT0WT9nrDfA7RFJZ7TqA8r44Ln4oWMEhP1H+9k= 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.18 0631/2151] swim: Enable the drive when probing Date: Wed, 18 Nov 2026 15:39:26 +0100 Message-ID: <20261118150144.874791844@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: 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit 57d88c8f4ea34a4dd7c5351bd026e225c7283f3f ] According to the ISM spec, the MOTON bit "causes the Enable 1 and Enable 2 signals to be turned on to the drive." It doesn't actually turn on the motor. When selecting a drive, enable MOTON. Disable it upon eject or release. This fixes detection of the Sony FDHD drive. 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/f5bf5b596a33a801faaaaa6dc2844c30d3ee82b2.1788513996.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 143e104c7dfaf..1a67b458d2512 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -154,8 +154,9 @@ struct iwm { /*----------------------------------------------------------------------------*/ enum drive_location { - INTERNAL_DRIVE = 0x02, - EXTERNAL_DRIVE = 0x04, + NO_DRIVE = 0, + INTERNAL_DRIVE = BIT(1), + EXTERNAL_DRIVE = BIT(2), }; enum media_type { @@ -311,9 +312,15 @@ static inline void swim_drive(struct swim __iomem *base, if (location == INTERNAL_DRIVE) { swim_write(base, mode0, EXTERNAL_DRIVE); /* clear drive 1 bit */ swim_write(base, mode1, INTERNAL_DRIVE); /* set drive 0 bit */ + swim_write(base, mode1, MOTON); } else if (location == EXTERNAL_DRIVE) { swim_write(base, mode0, INTERNAL_DRIVE); /* clear drive 0 bit */ swim_write(base, mode1, EXTERNAL_DRIVE); /* set drive 1 bit */ + swim_write(base, mode1, MOTON); + } else { + swim_write(base, mode0, INTERNAL_DRIVE); + swim_write(base, mode0, EXTERNAL_DRIVE); + swim_write(base, mode0, MOTON); } } @@ -447,6 +454,7 @@ static int floppy_eject(struct floppy_state *fs) swim_drive(base, fs->location); swim_motor(base, OFF); swim_eject(base); + swim_drive(base, NO_DRIVE); fs->disk_in = 0; fs->ejected = 1; @@ -652,8 +660,10 @@ static int floppy_open(struct gendisk *disk, blk_mode_t mode) else if (fs->ref_count > 0) --fs->ref_count; - if (fs->ref_count == 0) + if (fs->ref_count == 0) { swim_motor(base, OFF); + swim_drive(base, NO_DRIVE); + } return err; } @@ -682,6 +692,7 @@ static void floppy_release(struct gendisk *disk) if (fs->ref_count == 0) { swim_drive(base, fs->location); swim_motor(base, OFF); + swim_drive(base, NO_DRIVE); } mutex_unlock(&swim_mutex); } @@ -804,6 +815,7 @@ static int swim_floppy_init(struct swim_priv *swd) if (swim_readbit(base, DRIVE_PRESENT) && !swim_readbit(base, ONEMEG_DRIVE)) swim_add_floppy(swd, EXTERNAL_DRIVE); + swim_drive(base, NO_DRIVE); /* register floppy drives */ -- 2.53.0