Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp561560rwb; Sat, 17 Sep 2022 10:04:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6qF0BTaaNaEzPpGQVwws3SARWxLOnT193LS9YOXO5zo+C+nMF7KUpjeaZ7WRkMhYm5kvjJ X-Received: by 2002:a63:90c9:0:b0:434:b578:3bb4 with SMTP id a192-20020a6390c9000000b00434b5783bb4mr8890357pge.389.1663434288638; Sat, 17 Sep 2022 10:04:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663434288; cv=none; d=google.com; s=arc-20160816; b=Cj0wl4+GkUIokRZp6uONj71r09A6AMXHi3EFdfoy6iTaAkIBc4CybWD8Uy0CloudiJ zouGUXjixMH0AbCp48siq65gTlgPC5qvOyCGVkZxXCrpdA2IZXAkYUram/uYQTvZMyH4 NfEiM7nFM0lhrhNk4mMXpfsyUfuzu9Ve4ripIFhvlFtuPvPuJ0v8FXl1csywwPrBmp5V 4zKjTSSLfUNhqC/HJk+P1SACD5LY8ykS1b7GGDQHIi4cPxcwgcxccfHJUASeYOZoy8gM eqWfJIdOpe2kCZapwc4YW0B2KHMW3X3rnd3Eu4JwI7MViyBB3bWu5+PoUQJecDo16t7e 9Y+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=4aSoCbmg9pzU5Ku0kqTPaVmysUsgo0aDXBuJx+EeP1c=; b=1Bsl011GhKNzjMbs0ZwUdirRSj/9ohrNazu203spFalieN0X4DOQ+/XyMZyhtJV60O zZb2h+JulakCW+wyE+k/1f2zaZFceK19Jj2WeAwaIQnOf48tpZjxi8SaHV0QmeJqzOQa U55+y97x/1F0XGPNKAv5HSvXFrAwO6D5vQ/HIVcrpG/2khmio6mpv4oznUy7hi8ZQ5Tk 5ypei/by9WVFFIcSFlENZZxjblPkBgiv9jC93gvdqPBEHi8rccK1I7ZZfX7L5K/tcyOL ENkagm3/rYX57cTZbE1uQHIvINdcLaBheJIDmrZrlwpQ+3sdlntQ69dD08d2AL4bFYeR 7osg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c16-20020a17090ad91000b001fd81d07d0esi5446998pjv.123.2022.09.17.10.04.39; Sat, 17 Sep 2022 10:04:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-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; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229558AbiIQQqQ (ORCPT + 64 others); Sat, 17 Sep 2022 12:46:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbiIQQqO (ORCPT ); Sat, 17 Sep 2022 12:46:14 -0400 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A4913207D for ; Sat, 17 Sep 2022 09:46:13 -0700 (PDT) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1oZaxH-0002eF-1C; Sat, 17 Sep 2022 18:46:11 +0200 Date: Sat, 17 Sep 2022 17:46:05 +0100 From: Daniel Golle To: linux-wireless@vger.kernel.org, Stanislaw Gruszka , Helmut Schaa Cc: Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Johannes Berg Subject: [PATCH v2 05/16] rt2x00: add RF self TXDC calibration for MT7620 Message-ID: <1966de8202ca74135be344acb2afd2de4b1fe058.1663431288.git.daniel@makrotopia.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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-wireless@vger.kernel.org From: Tomislav Požega Add TX self calibration based on mtk driver. Signed-off-by: Tomislav Požega Signed-off-by: Daniel Golle Acked-by: Stanislaw Gruszka --- v2: use ++i instead of i = i + 1 in loops .../net/wireless/ralink/rt2x00/rt2800lib.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index cf5463cb7b642b..ed2c6105899b8d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -8428,6 +8428,53 @@ static void rt2800_init_rfcsr_5592(struct rt2x00_dev *rt2x00dev) rt2800_led_open_drain_enable(rt2x00dev); } +static void rt2800_rf_self_txdc_cal(struct rt2x00_dev *rt2x00dev) +{ + u8 rfb5r1_org, rfb7r1_org, rfvalue; + u32 mac0518, mac051c, mac0528, mac052c; + u8 i; + + mac0518 = rt2800_register_read(rt2x00dev, RF_CONTROL0); + mac051c = rt2800_register_read(rt2x00dev, RF_BYPASS0); + mac0528 = rt2800_register_read(rt2x00dev, RF_CONTROL2); + mac052c = rt2800_register_read(rt2x00dev, RF_BYPASS2); + + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0); + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0); + + rt2800_register_write(rt2x00dev, RF_CONTROL0, 0xC); + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x3306); + rt2800_register_write(rt2x00dev, RF_CONTROL2, 0x3330); + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0xfffff); + rfb5r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1); + rfb7r1_org = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1); + + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, 0x4); + for (i = 0; i < 100; ++i) { + usleep_range(50, 100); + rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 5, 1); + if ((rfvalue & 0x04) != 0x4) + break; + } + rt2800_rfcsr_write_bank(rt2x00dev, 5, 1, rfb5r1_org); + + rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, 0x4); + for (i = 0; i < 100; ++i) { + usleep_range(50, 100); + rfvalue = rt2800_rfcsr_read_bank(rt2x00dev, 7, 1); + if ((rfvalue & 0x04) != 0x4) + break; + } + rt2800_rfcsr_write_bank(rt2x00dev, 7, 1, rfb7r1_org); + + rt2800_register_write(rt2x00dev, RF_BYPASS0, 0x0); + rt2800_register_write(rt2x00dev, RF_BYPASS2, 0x0); + rt2800_register_write(rt2x00dev, RF_CONTROL0, mac0518); + rt2800_register_write(rt2x00dev, RF_BYPASS0, mac051c); + rt2800_register_write(rt2x00dev, RF_CONTROL2, mac0528); + rt2800_register_write(rt2x00dev, RF_BYPASS2, mac052c); +} + static void rt2800_bbp_core_soft_reset(struct rt2x00_dev *rt2x00dev, bool set_bw, bool is_ht40) { @@ -9035,6 +9082,7 @@ static void rt2800_init_rfcsr_6352(struct rt2x00_dev *rt2x00dev) rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00); rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C); + rt2800_rf_self_txdc_cal(rt2x00dev); rt2800_bw_filter_calibration(rt2x00dev, true); rt2800_bw_filter_calibration(rt2x00dev, false); } -- 2.37.3