From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAC0CC433DF for ; Sat, 8 Aug 2020 23:40:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C6C220829 for ; Sat, 8 Aug 2020 23:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596930049; bh=ILJ+X5dFj1WuZtMu5nk3WiTKNOR+oCEncXTbKxKz0t8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MJR/eTWvmRv8wqrlNomNSbLXK0GyatY/NagR7jfS0WCCIUfvKzru+YhcrXFUlQWRt S1nH25Px92HeQC+3KkUwG7mK4tHAkHlMt5FLybpYenDuz2Ks8YfRyPms1dhrqivV7b ZCD0WniuYDnSy9b7LBGmR+nNqcWNSPvQsThYD+IU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728906AbgHHXkr (ORCPT ); Sat, 8 Aug 2020 19:40:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:56372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728898AbgHHXkp (ORCPT ); Sat, 8 Aug 2020 19:40:45 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2610820656; Sat, 8 Aug 2020 23:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596930045; bh=ILJ+X5dFj1WuZtMu5nk3WiTKNOR+oCEncXTbKxKz0t8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PGz0e0L+4c/hTqnVMW4zz4jlX8edpW8iaCIg9crALDzh3cRxjpnrBO1Ar5mioT7/8 DPtscSoNhMdFmvBURuGG8ISe2jxGON1U6JLqyaTMxLsix1cv2TDhLI3K7BYS+BJ7sb EFV9oPnpIg9YzUj7oG211BLx+LHiUWZ31Hb8Z7m8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Finn Thain , Stan Johnson , Joshua Thompson , Geert Uytterhoeven , Sasha Levin , linux-m68k@lists.linux-m68k.org Subject: [PATCH AUTOSEL 4.9 4/9] m68k: mac: Don't send IOP message until channel is idle Date: Sat, 8 Aug 2020 19:40:31 -0400 Message-Id: <20200808234037.3619732-4-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200808234037.3619732-1-sashal@kernel.org> References: <20200808234037.3619732-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Finn Thain [ Upstream commit aeb445bf2194d83e12e85bf5c65baaf1f093bd8f ] In the following sequence of calls, iop_do_send() gets called when the "send" channel is not in the IOP_MSG_IDLE state: iop_ism_irq() iop_handle_send() (msg->handler)() iop_send_message() iop_do_send() Avoid this by testing the channel state before calling iop_do_send(). When sending, and iop_send_queue is empty, call iop_do_send() because the channel is idle. If iop_send_queue is not empty, iop_do_send() will get called later by iop_handle_send(). Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Finn Thain Tested-by: Stan Johnson Cc: Joshua Thompson Link: https://lore.kernel.org/r/6d667c39e53865661fa5a48f16829d18ed8abe54.1590880333.git.fthain@telegraphics.com.au Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- arch/m68k/mac/iop.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 7990b6f50105b..8209a74fbdebc 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c @@ -416,7 +416,8 @@ static void iop_handle_send(uint iop_num, uint chan) iop_free_msg(msg2); iop_send_queue[iop_num][chan] = msg; - if (msg) iop_do_send(msg); + if (msg && iop_readb(iop, IOP_ADDR_SEND_STATE + chan) == IOP_MSG_IDLE) + iop_do_send(msg); } /* @@ -497,16 +498,12 @@ int iop_send_message(uint iop_num, uint chan, void *privdata, if (!(q = iop_send_queue[iop_num][chan])) { iop_send_queue[iop_num][chan] = msg; + iop_do_send(msg); } else { while (q->next) q = q->next; q->next = msg; } - if (iop_readb(iop_base[iop_num], - IOP_ADDR_SEND_STATE + chan) == IOP_MSG_IDLE) { - iop_do_send(msg); - } - return 0; } -- 2.25.1