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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8DB6DC433FE for ; Sat, 5 Nov 2022 19:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Iplsi0Kpj0uL3hhIi0D5zoxVfpGhCwwj3cyFY5qWHPw=; b=dEEov81EuOhrBV 3kZ0emh5Z34TP7jgFNuLxxjtiMZOXCn5dQ7/TPcNIQOh5QBHysNvQ/As8jz1CiNeDETtVQpbaI/vR Grd79oqSvfq2pJ9/anoYs0rnH0M/eIsoqEgUOxY+C68JTWpzl8cLWB6L3fZm85XLME+AlxlHGXAwx gh5Ot9o+3o7AOGTwGmYqQC94bdMXzgtcDn6QqWyjKjHFjyk9EdDSCdNWQS8giueiUDCk+GepnwFQq TEOgHNr1/zaD4oDRknySKDkrjccaKMVYgDfbSEAVZvycZsQFI/1saMcsZ/bU53i6nghmalX9hkpAV 9evd4v5xa8h9BPyi1lmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1orOiI-0077sp-1a; Sat, 05 Nov 2022 19:20:18 +0000 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1orOi1-0077qC-00 for linux-arm-kernel@lists.infradead.org; Sat, 05 Nov 2022 19:20:02 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 0DBA432005C1; Sat, 5 Nov 2022 15:19:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 05 Nov 2022 15:20:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1667675999; x=1667762399; bh=Tp wv+c2F2PU8VoJszCGDvaTbihLFPEmYX1Wb7G6Djbg=; b=Y6fGLWrmfRddnjem6R Smpi3ED14bBqTQQpAKwrbY1YIc1X1eXN+Mixmjm+zD+/1W3A9uFbkme5LH/R4H0Y szwKF364j/976o7TgvJ/7NE2hfh/EAOeA2+KCgulsVfIlduQH3m3wRi5LbqYwWHA U3vjRDtuaQWloa3Su1QwbYvw4XUERmjey58qr3/MXzmPDGIYdFuplOUSHkqYjg+y r7meIIgxsAvxrMPUMf75C75gIO7bi0LyCGKWMD7/zfY6gIpHbVTegZ0fIyuoHnre JXDz/mn/jjAUi7KFXnzw3aGjh9RMufkKJu2iahQ8RB7qC3ARp5/sSpoijHNmfmM1 3A9A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1667675999; x=1667762399; bh=Tpwv+c2F2PU8V oJszCGDvaTbihLFPEmYX1Wb7G6Djbg=; b=otS9uMteT5hsdxH2QCGs+j+EvEdm7 fxoCVGiYhX8SqtNwZvQB0tSx/19y+lwkI5DdxfCoV2nUwuRK3co4LyJXP7U0O8pe R9Zo7DsVmQYAd4OVi6Qyyr8nMTW7+GqWS9R0RkN/tOth49apiZEqcN+JDEC76CUn tBwtJfuioAxaUPcuWOy9KsqS+d+AM5kLmBPYOFewIka7412zeFxa6GdaYTblc9Rj X+XoM5xyXrX+bnig4APlQ+zPhq0INJehvoXsE3rRAikTUYBU/n6HOwhcdP+ROw+N cuUIXnTNqOJN288m8KNjNnGApqBGgL7fc7Nu+Ju9By8Zn6u7ZawLSDg2w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdeggddtjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpedukeetueduhedtleetvefguddvvdejhfefudelgfduveeggeehgfdu feeitdevteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 5 Nov 2022 15:19:59 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Ivaylo Dimitrov , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, Samuel Holland Subject: [PATCH 2/2] bus: sunxi-rsb: Support atomic transfers Date: Sat, 5 Nov 2022 14:19:53 -0500 Message-Id: <20221105191954.14360-3-samuel@sholland.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221105191954.14360-1-samuel@sholland.org> References: <20221105191954.14360-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221105_122001_085387_122858B6 X-CRM114-Status: GOOD ( 10.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When communicating with a PMIC during system poweroff (pm_power_off()), IRQs are disabled and we are in a RCU read-side critical section, so we cannot use wait_for_completion_io_timeout(). Instead, poll the status register for transfer completion. Signed-off-by: Samuel Holland --- drivers/bus/sunxi-rsb.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index 17343cd75338..0f0e498d4379 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c @@ -267,6 +267,9 @@ EXPORT_SYMBOL_GPL(sunxi_rsb_driver_register); /* common code that starts a transfer */ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) { + bool timeout; + u32 status; + if (readl(rsb->regs + RSB_CTRL) & RSB_CTRL_START_TRANS) { dev_dbg(rsb->dev, "RSB transfer still in progress\n"); return -EBUSY; @@ -279,8 +282,16 @@ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) writel(RSB_CTRL_START_TRANS | RSB_CTRL_GLOBAL_INT_ENB, rsb->regs + RSB_CTRL); - if (!wait_for_completion_io_timeout(&rsb->complete, - msecs_to_jiffies(100))) { + if (irqs_disabled()) { + timeout = readl_poll_timeout_atomic(rsb->regs + RSB_INTS, + status, status, 10, 100000); + } else { + timeout = !wait_for_completion_io_timeout(&rsb->complete, + msecs_to_jiffies(100)); + status = rsb->status; + } + + if (timeout) { dev_dbg(rsb->dev, "RSB timeout\n"); /* abort the transfer */ @@ -292,18 +303,18 @@ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) return -ETIMEDOUT; } - if (rsb->status & RSB_INTS_LOAD_BSY) { + if (status & RSB_INTS_LOAD_BSY) { dev_dbg(rsb->dev, "RSB busy\n"); return -EBUSY; } - if (rsb->status & RSB_INTS_TRANS_ERR) { - if (rsb->status & RSB_INTS_TRANS_ERR_ACK) { + if (status & RSB_INTS_TRANS_ERR) { + if (status & RSB_INTS_TRANS_ERR_ACK) { dev_dbg(rsb->dev, "RSB slave nack\n"); return -EINVAL; } - if (rsb->status & RSB_INTS_TRANS_ERR_DATA) { + if (status & RSB_INTS_TRANS_ERR_DATA) { dev_dbg(rsb->dev, "RSB transfer data error\n"); return -EIO; } -- 2.37.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel