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=1795024216; b=5QmyiGyMVBWUkmstOdO61OTF0fAtPSD9OYq8c0UPmOy95vky8pRAeDkSK+9ssa/WwrOM kbSWdPlLcM0WUuQzUP9i0j47+SK+pVHswYC27Y5hV9qxXNm48ZBe5EcUP+L9YP+FGGZ2g ahMu7aRC2qCsh3bfqdelJtV0f6i55JLTiOobKH2rsMm2U5DayZhQY2HEl9oetQZBOX4eo SUgBKwPgUiigqgWpxcuhsyCt+/qv5K3C/hNCBLfTca2OfIgMHZ9u22E/PAk5A9ASaVoVr Oe0ALNX5JH9tBxYvo6/lV7jX+mlnjWDwWnu9PQjDrF7Hw1SJTD7zsTq8Z/4odOtO2nA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795024216; 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=so/4Lwv2JIMtIcZxMrN8vWOYt2xV1mdC832DJJvqOk4=; b=J11mxB/Mgjo59B/emAyqr3ZPeWY2BVqkz4L+LNZ5FhYz7tq4UFTyTK9pZGCvm9n/mVOk P+sIHgndsuSH6VZZQdGj39SKPMv6IzOIa+k6PGvcZ/xmADpS2eRw+3xaB9FMSbuFbI7wP qZOReGQk8+6ifTMqhTKi3Pxvj7c1enP4Dti+j3oYbPnvu2uYanQ4nWyunp2UQbrY0+Ezt CDJVx282eQKWkxViOgyEAoSFZdhFLQKzmpWvtol7VGLRVOAj3Rqa05nsTa5a1YdnwJbnV nxGKZNiguLhxm05NSqve5NMzOvfTfxhw3+OPk0j9y9jMzB4HctjDWwOi6r+LGcnw7Og== 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="Qn6VG/LB"; 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 278E4606A320; Wed, 18 Nov 2026 17:50:16 +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=Qn6VG/LB Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76AB41F000C6; Wed, 18 Nov 2026 17:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795024216; bh=so/4Lwv2JIMtIcZxMrN8vWOYt2xV1mdC832DJJvqOk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Qn6VG/LBgZa1QpJMLAVzD83hkXCX2R71gZZ9OQmzOv8lzmYiqh0MKsG1rgzt+pRPM HW9AKyjT6h3L2FBvgLpmOH+m/RYX2v18CfMc7uCDDtOizbsXL2PFTzJ2+MDUBvZk1+ G0Jkql1wp0ia8R0e0xiZneh5dnvsl9iNpGA4PO0Y= 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 0644/2151] swim: Dont use the mark register to read data Date: Wed, 18 Nov 2026 15:39:39 +0100 Message-ID: <20261118150145.318787409@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 cb7923133ec18e67e2d6718e29426a4423af6b73 ] If an unexpected mark byte were to be read from the data register, an error would be flagged. But no error gets flagged when such a byte is read from the mark register, which is misleading. Always use the data register except when a mark byte is expected. Fixes: 8852ecd97488 ("m68k: mac - Add SWIM floppy support") Reviewed-by: Laurent Vivier Signed-off-by: Finn Thain Tested-by: Stan Johnson Link: https://patch.msgid.link/fecd77b141bdd8a59ebae5f9efffccb155afdc4c.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim_asm.S | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S index fcf574ced85ec..699f7c90dd1c0 100644 --- a/drivers/block/swim_asm.S +++ b/drivers/block/swim_asm.S @@ -47,11 +47,11 @@ .global swim_read_sector_header swim_read_sector_header: link %a6, #0 - moveml %d1-%d5/%a0-%a4,%sp@- + moveml %d1-%d5/%a0-%a5,%sp@- movel %a6@(0x0c), %a4 moveq #-1, %d0 bsr mfm_read_addrmark - moveml %sp@+, %d1-%d5/%a0-%a4 + moveml %sp@+, %d1-%d5/%a0-%a5 unlk %a6 rts @@ -63,6 +63,7 @@ sector_data_mark: mfm_read_addrmark: movel %a6@(0x08), %a3 lea %a3@(read_handshake), %a2 + lea %a3@(read_data), %a5 lea %a3@(read_mark), %a3 movew #seek_time, %d2 @@ -93,7 +94,7 @@ amark0: tstb %a2@ dbmi %d2, amark0 bpl signal_nonyb - moveb %a3@, %a4@(o_track) + moveb %a5@, %a4@(o_track) moveq #max_retry, %d2 @@ -101,7 +102,7 @@ amark1: tstb %a2@ dbmi %d2, amark1 bpl signal_nonyb - moveb %a3@, %a4@(o_side) + moveb %a5@, %a4@(o_side) moveq #max_retry, %d2 @@ -109,7 +110,7 @@ amark2: tstb %a2@ dbmi %d2, amark2 bpl signal_nonyb - moveb %a3@, %a4@(o_sector) + moveb %a5@, %a4@(o_sector) moveq #max_retry, %d2 @@ -117,7 +118,7 @@ amark3: tstb %a2@ dbmi %d2, amark3 bpl signal_nonyb - moveb %a3@, %a4@(o_size) + moveb %a5@, %a4@(o_size) moveq #max_retry, %d2 @@ -125,7 +126,7 @@ crc0: tstb %a2@ dbmi %d2, crc0 bpl signal_nonyb - moveb %a3@, %a4@(o_crc0) + moveb %a5@, %a4@(o_crc0) moveq #max_retry, %d2 @@ -133,7 +134,7 @@ crc1: tstb %a2@ dbmi %d2, crc1 bpl signal_nonyb - moveb %a3@, %a4@(o_crc1) + moveb %a5@, %a4@(o_crc1) moveb %a2@, %d5 andb #.Lhr_crc_error, %d5 @@ -212,7 +213,7 @@ data_crc0: dbmi %d2, data_crc0 bpl data_exit - moveb %a3@, %d5 + moveb %a5@, %d5 moveq #max_retry, %d2 @@ -222,7 +223,7 @@ data_crc1: dbmi %d2, data_crc1 bpl data_exit - moveb %a3@, %d5 + moveb %a5@, %d5 moveb %a2@, %d5 andb #.Lhr_crc_error, %d5 -- 2.53.0