From patchwork Sat Oct 22 07:21:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1093471wrr; Sat, 22 Oct 2022 00:57:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5gBId2qYEOt9ZhWoAMW9oQCoEk17M/SMdM65/j/sA8LRHivINKiFOPu4YhL4SjFlVAdC3X X-Received: by 2002:a17:90b:1e0c:b0:20f:bcbf:ab5 with SMTP id pg12-20020a17090b1e0c00b0020fbcbf0ab5mr25047511pjb.187.1666425444716; Sat, 22 Oct 2022 00:57:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425444; cv=none; d=google.com; s=arc-20160816; b=AkqWnmKY7LRNRiKMT/GAg7Jzc0aZcg2ICIcHw26vlaD//wfTs9hj21XI2yOoRNDT6b Sh1vAguisCBA6aHclDaUgiJlbRYZnw3jKO0AVoiIb9XnFWPv6g+mac3yRIPJBk9wJ+4K rGhDTyJMQZrBleBX5NaZ0nLO+pBwrz9YBaiLc4r/EqsaclPlhg5Yv0H7oNv4Q4p9GYui I/BkaKXCWBF6ZrIdytUGIDTDyizGtfWuu0SAFmkRtVDs7FfA+7sJNWy5H2SkopsOACi/ B7amrmHI93hhE+7YFSadGH1EJaec1JQpc9JkOhgZWzgZdtY4+TW7DTEmZIokjnoYuOyS 40Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bJmKRR/q+kBCiK96k8O/LhdQvMvn+L/FTaOJGRjEInI=; b=wS4syIVESQMI3zcHBT/cq9IeEKX9NhiCisKweQ8F2DEQjwUX29Non3zYF3ado4dR/G IJa8oIdIH9RU1d705TPDCfhr81z5xBtDbhwl3cWrMEGYpLUSPLao36STbbrnxIK/FsuY 77SjCTaTjq9XIvfKxOyIcgEi3v1SNLgwnqkX9TOGPApL5QOsk4A+vuPa/ODnH+LnH8G0 vZnNbO86L6Tj3Bs7W/Cx3PYiHwQZcqyh6GkCedWQ0aotrCbsUFiM06hBcOFTYpuxt5jU 5sLNMSvJjSL3EEC4Ab33iqYHxbFfEND2KmPuCnanOZZUOndEH4KBo/Pdna62nwK3E0t8 Fpkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AQAxoj8E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a056a00164600b0055fe250267dsi23846456pfc.124.2022.10.22.00.57.12; Sat, 22 Oct 2022 00:57:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AQAxoj8E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232278AbiJVH4z (ORCPT + 99 others); Sat, 22 Oct 2022 03:56:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231929AbiJVHxA (ORCPT ); Sat, 22 Oct 2022 03:53:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89DD02CA7C9; Sat, 22 Oct 2022 00:46:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 23727B82E2F; Sat, 22 Oct 2022 07:45:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73C8BC433D6; Sat, 22 Oct 2022 07:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424750; bh=t3dMiH4XJXVQqT24zBIQwudtQaBoBJjPnA3eH7aaObo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AQAxoj8EHAKM8y3d9b3lLpGlKiVvs6AS36+UrwWxd6HFtg/CQnvHW73DShojrMPlz ByCynyhChNYAUviT6tzgq1dr1wOTDNpT3bjAk2R9j7fT77b/5xSr0cPuIq7QALKq/f y31YUEuMl7L7DvHYCeqNZSoz4RiXpRI3C0MTd1UM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Markus Schneider-Pargmann , Neil Armstrong , Mark Brown , Sasha Levin Subject: [PATCH 5.19 233/717] spi: meson-spicc: do not rely on busy flag in pow2 clk ops Date: Sat, 22 Oct 2022 09:21:52 +0200 Message-Id: <20221022072456.269812870@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747373727024847132?= X-GMAIL-MSGID: =?utf-8?q?1747373727024847132?= From: Neil Armstrong [ Upstream commit 36acf80fc0c4b5ebe6fa010b524d442ee7f08fd3 ] Since [1], controller's busy flag isn't set anymore when the __spi_transfer_message_noqueue() is used instead of the __spi_pump_transfer_message() logic for spi_sync transfers. Since the pow2 clock ops were limited to only be available when a transfer is ongoing (between prepare_transfer_hardware and unprepare_transfer_hardware callbacks), the only way to track this down is to check for the controller cur_msg. [1] ae7d2346dc89 ("spi: Don't use the message queue if possible in spi_sync") Fixes: 09992025dacd ("spi: meson-spicc: add local pow2 clock ops to preserve rate between messages") Fixes: ae7d2346dc89 ("spi: Don't use the message queue if possible in spi_sync") Reported-by: Markus Schneider-Pargmann Signed-off-by: Neil Armstrong Tested-by: Markus Schneider-Pargmann Link: https://lore.kernel.org/r/20220908121803.919943-1-narmstrong@baylibre.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-meson-spicc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index e4cb52e1fe26..6974a1c947aa 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -537,7 +537,7 @@ static unsigned long meson_spicc_pow2_recalc_rate(struct clk_hw *hw, struct clk_divider *divider = to_clk_divider(hw); struct meson_spicc_device *spicc = pow2_clk_to_spicc(divider); - if (!spicc->master->cur_msg || !spicc->master->busy) + if (!spicc->master->cur_msg) return 0; return clk_divider_ops.recalc_rate(hw, parent_rate); @@ -549,7 +549,7 @@ static int meson_spicc_pow2_determine_rate(struct clk_hw *hw, struct clk_divider *divider = to_clk_divider(hw); struct meson_spicc_device *spicc = pow2_clk_to_spicc(divider); - if (!spicc->master->cur_msg || !spicc->master->busy) + if (!spicc->master->cur_msg) return -EINVAL; return clk_divider_ops.determine_rate(hw, req); @@ -561,7 +561,7 @@ static int meson_spicc_pow2_set_rate(struct clk_hw *hw, unsigned long rate, struct clk_divider *divider = to_clk_divider(hw); struct meson_spicc_device *spicc = pow2_clk_to_spicc(divider); - if (!spicc->master->cur_msg || !spicc->master->busy) + if (!spicc->master->cur_msg) return -EINVAL; return clk_divider_ops.set_rate(hw, rate, parent_rate);