From nobody Fri Dec 19 04:00:25 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38151FA3742 for ; Mon, 24 Oct 2022 14:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235830AbiJXOCy (ORCPT ); Mon, 24 Oct 2022 10:02:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233281AbiJXOB7 (ORCPT ); Mon, 24 Oct 2022 10:01:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F1CE8FD7F; Mon, 24 Oct 2022 05:48:01 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 2477B612F3; Mon, 24 Oct 2022 12:13:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36AD6C433D6; Mon, 24 Oct 2022 12:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613616; bh=xGI2wG7CiwyktkV1VprJ5NZ4V+fFPQKZUvtJ9ivpDGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CnbzUlbzL+xwIKAy1DkM1QqKRDBe3jaJIb+4qwhWgPHUUmpXnEoSUpdtqWHFSaqUN wxvZQxbu8ugeOPs5IoZ8l+YFkEO0cOIWu8jn2oCooriVWQdNO2M8qZ7X1mzCPBlb/8 EqhyX/f/3ZZ27kNjR21lsJ0Jn+71CZX0Kg2eNv5s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Serge Vasilugin , Daniel Golle , Stanislaw Gruszka , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 205/255] wifi: rt2x00: set SoC wmac clock register Date: Mon, 24 Oct 2022 13:31:55 +0200 Message-Id: <20221024113009.855226789@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Daniel Golle [ Upstream commit cbde6ed406a51092d9e8a2df058f5f8490f27443 ] Instead of using the default value 33 (pci), set US_CYC_CNT init based on Programming guide: If available, set chipset bus clock with fallback to cpu clock/3. Reported-by: Serge Vasilugin Signed-off-by: Daniel Golle Acked-by: Stanislaw Gruszka Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/3e275d259f476f597dab91a9c395015ef3fe3284.16= 63445157.git.daniel@makrotopia.org Signed-off-by: Sasha Levin --- .../net/wireless/ralink/rt2x00/rt2800lib.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/w= ireless/ralink/rt2x00/rt2800lib.c index ab0d673253f0..c303d52b6820 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -6115,6 +6115,27 @@ static int rt2800_init_registers(struct rt2x00_dev *= rt2x00dev) reg =3D rt2800_register_read(rt2x00dev, US_CYC_CNT); rt2x00_set_field32(®, US_CYC_CNT_CLOCK_CYCLE, 125); rt2800_register_write(rt2x00dev, US_CYC_CNT, reg); + } else if (rt2x00_is_soc(rt2x00dev)) { + struct clk *clk =3D clk_get_sys("bus", NULL); + int rate; + + if (IS_ERR(clk)) { + clk =3D clk_get_sys("cpu", NULL); + + if (IS_ERR(clk)) { + rate =3D 125; + } else { + rate =3D clk_get_rate(clk) / 3000000; + clk_put(clk); + } + } else { + rate =3D clk_get_rate(clk) / 1000000; + clk_put(clk); + } + + reg =3D rt2800_register_read(rt2x00dev, US_CYC_CNT); + rt2x00_set_field32(®, US_CYC_CNT_CLOCK_CYCLE, rate); + rt2800_register_write(rt2x00dev, US_CYC_CNT, reg); } =20 reg =3D rt2800_register_read(rt2x00dev, HT_FBK_CFG0); --=20 2.35.1