From nobody Fri May 13 17:58:45 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2F5641AE9062; Fri, 13 May 2022 17:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0Gbp22lKz4Wys; Fri, 13 May 2022 17:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsFpSW39xRtZAJwAG8lmi64WMW9Q0+xgLed2QGs2IhA=; b=byh/Iir2/NB+5ST9vLwptu+vcDxRispxBBPHC51bSy880GcHAizL3JuqBw4WvveLwz4sRI VHLaDNezycMLJNdQ9Ikcs9onXiQqpFHYHp3ovX8KFZHJ7z+RJEtkDpu8tg+WxduFeXR5Pj I198oj+h5xwQya5XilJqCtoQ1+R+OXb/PdocXMU9LbUYzhZ+O11vkjR1xZuaQaJBDHNkl1 NpNRB1ClwA5c7PnHUH0p6lKT8uqlqn7+uc2hLSL38J1UMUkaCtmTicSMWWazopRVzMNkfN ysLE4GZWgGDG/ib9ccD1FVf63GQ2R/VNOCsWj/FP5axQoR0hSBtgLUq/liPeQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E97E8275A4; Fri, 13 May 2022 17:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24DHwjv7069497; Fri, 13 May 2022 17:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DHwj0f069496; Fri, 13 May 2022 17:58:45 GMT (envelope-from git) Date: Fri, 13 May 2022 17:58:45 GMT Message-Id: <202205131758.24DHwj0f069496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6aca4e6127e3 - stable/13 - rtwn: Restore RF_ENV control type after initializing RF. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6aca4e6127e34b0994d3c945af8634fba3aaee40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652464726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HsFpSW39xRtZAJwAG8lmi64WMW9Q0+xgLed2QGs2IhA=; b=ShIgE6pNdAGmQJwshJIRznb+dIwy4SYECgaArgt77UORPJoQe7/f69tlbuoBKcZKeEZoA4 E8T66ER9AH+rnK6xjpXH4NHpfwaIdVFVKqexwYNi21fKSMW0J+T2WZfc0F7aUfd1M1q9AW qEiQjUpVnCbop3a8/sh1DWhyAsQvVwbnIenRp4sDleAb2c4UUTJcaLOr2fZBfcIAWF9Cbi +SFyyiwrfaj88GNrqnORXGJu8G3nLa6e+iiQ6s7qa27EOTHmOibJoSd0glNk5izR7MASUa WSCcU8mjbaMyfBwJW44+sA6bPntiJw1cKKa2R632GvmJvEkX1Okb9eURxhRjpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652464726; a=rsa-sha256; cv=none; b=js1paPCy/MfCt1aR0xOB9DNh3Rj7VaOLq8mNuMbJPFjBy/skdeeFJR4TFqDPrF09uYJ0XF yxSCvujxnNBfJrL+Kl1wst7oeyKhLit+g1dEonCqDuUEnyA71In8Z00v32CNQ9ZF7/1Hxx 53Eml9uPhMkt36MJUj7eYQj/kCOnao6ipsavhqQh+WY+U/oUVTicDpSMAyNQlQY+ZNMXDL jhY8DA3hothP8P0SPUMYSIzsX/Mgo+PHaMDTVqD9dsBsxl4OmIskM+pZGxvFy1He2NywK8 JRkFqwGPJn5IRW5p3lFnO5mhPUc5o9MzrTp5/mRVG61kObppxV0kArKLh2GkkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6aca4e6127e34b0994d3c945af8634fba3aaee40 commit 6aca4e6127e34b0994d3c945af8634fba3aaee40 Author: John Baldwin AuthorDate: 2022-04-08 00:01:28 +0000 Commit: John Baldwin CommitDate: 2022-05-13 17:44:10 +0000 rtwn: Restore RF_ENV control type after initializing RF. Both rwlwifi in Linux and rtwn in OpenBSD restore this register, and the existing code was saving the value and not using it. Reported by: -Wunused-but-set-variable Reviewed by: imp Obtained from: OpenBSD Differential Revision: https://reviews.freebsd.org/D34838 (cherry picked from commit 50e3b6aa480b34e6eb87530d307db7ceba591a17) --- sys/dev/rtwn/rtl8192e/r92e_init.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/rtwn/rtl8192e/r92e_init.c b/sys/dev/rtwn/rtl8192e/r92e_init.c index b38a9661567d..48a87e6ae98c 100644 --- a/sys/dev/rtwn/rtl8192e/r92e_init.c +++ b/sys/dev/rtwn/rtl8192e/r92e_init.c @@ -195,6 +195,11 @@ r92e_init_rf(struct rtwn_softc *sc) /* Write RF initialization values for this chain. */ i += r92c_init_rf_chain(sc, &sc->rf_prog[i], chain); + /* Restore RF_ENV control type. */ + reg = rtwn_bb_read(sc, R92C_FPGA0_RFIFACESW(idx)); + reg &= ~(0x10 << off) | (type << off); + rtwn_bb_write(sc, R92C_FPGA0_RFIFACESW(idx), reg); + /* Cache RF register CHNLBW. */ rs->rf_chnlbw[chain] = rtwn_rf_read(sc, chain, R92C_RF_CHNLBW); }