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=1795016974; b=rEQuWOtgmo4qsU3Cgs+Wn1O5lu2gB1iZ0l7I5ooXZ5lb1XkQQn/i+ODLWTqOkQVcC46m 4UwKF/E/Ljn/AluCC67iYBd979hXklm0eFOz4FgBglEb0rcy8fQgk8pqGA1wsPCsrgc3+ Wi+CjfHm/gCHg4HYPST0zuuNvVeqkPduyWODdvad3fSnByFV4MHIg8NrsOlsMMKSLECS4 q6kuhg+TZaS0u8GSJ6jb7Q/E6DXI7eOxcUpDmIaBhkUxEJIX4TGgXB8EiHrCtaB5gmYia 3QdgselQTFvnd8nbQmSRM0dTssgBf3xPwTIzbqf+U2JurzGhYd6wOsdRQfcMKj1oe7w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795016974; 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=h41tGzdDUfkCxVR73DwDaD2kd2HFTvDjkuDdnIcY81s=; b=mdW3qt63EmhuwfoC776/N88Aq/EloHun4fU9+TFxz+Uwiy/ekEXoXaomMf8UyaIQHS1Y HzOcsNmSrJ5a9MnSE3DwIBN5YzjDnwIUksprUDid+I164pnp2wK2kkmO3t2OzdNI+dSLM /tXtFnAGL1IkbqmPXtzLj6Hq10zuXqgk40H2FOljgZ4IQmD5rpjTVVGtSeKjHbPxDoJwv YQI2D0rgEg2/4O6ztOOh0SU+V3kZUbDhg+qoXG2y19UGFeELvDRf0wH1b6l3u5RAjcXzT G9/fGxa8VbgKPfDBh4p8ARnpiv2va7oAOuQ9djMl1L20KxmyvEh/NftG+4qUj5n1Axw== 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="zcxQw/o9"; 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 B3BD5606A31C; Wed, 18 Nov 2026 15: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=zcxQw/o9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F27981F000C4; Wed, 18 Nov 2026 15:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795016974; bh=h41tGzdDUfkCxVR73DwDaD2kd2HFTvDjkuDdnIcY81s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zcxQw/o9p8Ecm4ifmNOMZVZErbe6uRoGtMFN4lVYMrenmcBh7DqV12G57B4n4QnV2 kNFa9F0zb9BBSZqmT+a9CesdjIZIhP22ftiIKmW1vPMMWeZ6CSSooY18SZ/pntsCCS GKA4qaRp0UZzw/JLCyzXRbhaL8HemZ0j9TKTzPjo= 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 7.3 0719/2651] swim: Deduplicate polling loops Date: Wed, 18 Nov 2026 15:32:39 +0100 Message-ID: <20261118150313.758231004@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@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 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Finn Thain [ Upstream commit b736189c93c9ad1056521a4229ec2f252b714b5a ] Replace duplicated polling loops with poll_timeout_us(). Change the interruptible sleep to uninterruptible because signal delivery shouldn't be allowed to shorten delays required by the drive hardware. Change the timeout for the !STEP transition to 20 ms in accordance with the maximum interval required by the UPD72070 spec. The existing 1 second timeout is impractical considering the number of steps in a typical seek. Change the return type of swim_readbit() to bool because that way the bit names make sense i.e. the reader doesn't have to remember to invert the active-low logic used for drive signals. 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/0ea2d3313dea26f8b4c2abc4d29055ac95aeb74b.1788513997.git.fthain@linux-m68k.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim.c | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/drivers/block/swim.c b/drivers/block/swim.c index ea46639455053..59e00fb2bff5d 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -296,7 +297,7 @@ static inline void swim_action(struct swim __iomem *base, int action) local_irq_restore(flags); } -static inline int swim_readbit(struct swim __iomem *base, int bit) +static inline bool swim_readbit(struct swim __iomem *base, int bit) { int stat; @@ -309,6 +310,9 @@ static inline int swim_readbit(struct swim __iomem *base, int bit) return (stat & SENSE) == 0; } +#define swim_readbit_timeout(base, bit, val, timeout_us) \ + poll_timeout_us(, swim_readbit(base, bit) == val, 1000, timeout_us, false) + static inline void swim_drive(struct swim __iomem *base, enum drive_location location) { @@ -331,16 +335,8 @@ static inline void swim_motor(struct swim __iomem *base, enum motor_action action) { if (action == ON) { - int i; - swim_action(base, MOTOR_ON); - - for (i = 0; i < 2*HZ; i++) { - if (swim_readbit(base, MOTOR_ON)) - break; - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); - } + swim_readbit_timeout(base, MOTOR_ON, true, 2000 * 1000); } else if (action == OFF) { swim_action(base, MOTOR_OFF); swim_write(base, phase, RELAX | PHASE_PIN_DIR); @@ -349,16 +345,8 @@ static inline void swim_motor(struct swim __iomem *base, static inline void swim_eject(struct swim __iomem *base) { - int i; - swim_action(base, EJECT); - - for (i = 0; i < 2*HZ; i++) { - if (!swim_readbit(base, DISK_IN)) - break; - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); - } + swim_readbit_timeout(base, DISK_IN, false, 2000 * 1000); } static inline void swim_head(struct swim __iomem *base, enum head head) @@ -373,19 +361,8 @@ static inline void swim_head(struct swim __iomem *base, enum head head) static inline int swim_step(struct swim __iomem *base) { - int wait; - swim_action(base, STEP); - - for (wait = 0; wait < HZ; wait++) { - - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); - - if (!swim_readbit(base, STEP)) - return 0; - } - return -1; + return swim_readbit_timeout(base, STEP, false, 20 * 1000); } static inline int swim_track00(struct swim __iomem *base) -- 2.53.0