From nobody Sat Sep 26 02:29:47 2026 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3912E3DD85C for ; Sat, 5 Sep 2026 10:05:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602759; cv=none; b=TScmPZUpmDTsVgAXzBH4BoF4guNqnFTRMJiXCS/W7PHyYSG9L3MNxPN6S/tsh/LxMIVVyDYipCQA4h7q6hrxsYEiz6kqv3VGkpaZ1KvaxH5eKzy1UEcj+9lj4md0tyP5PuwlNpIAkUoNRlb6R24+SdyVjcKWndu8DyrKiJZJWi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602759; c=relaxed/simple; bh=IpBe6QMdFYojPCd3r7iZwbZIV3JLrSuhGwUg6VBmvF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gx39Vea1KkvKnX5xEsPfus+ct3PND1fZ5xFUkVAptaQEQwAvEAu0715XbG74B8oQdTi5yEwMDZlkQrNoAdo+SxkTdsDeNEy1nd9cnI5418E0NQ8Wkwgo2bYktJNt1+dQpcF4zcYOmTF4LV/XW50hU8JuYyX0A4jGl2Ut4H/bwsY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=stdXOfHD; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="stdXOfHD" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-3a20f06cce6so19264831fa.1 for ; Sat, 05 Sep 2026 03:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788602756; x=1789207556; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZihC6gdFyAtWT1MYgYEnu+8RGKM23e/TuDS3snfY308=; b=stdXOfHDBp34JXGT9Fwm2mVPufrMaiJaXhwyZoqIRDKiOrvQ0D+upCJ2zs7t/wS23T 0g+J4R7r0oY3y4SOlcvfyJ83N9sP3BnLt+ldcg3SAvLHQT5eHLXhauPtAVFqq8td6iGa 2KO1uztNAwXjYa4xknG8+85lST7krWreoJVrcmK+o0AgjXaBj5mBPeM8OkdQNymqcPjA LU0PULXq6/wvlTgVkdVkt2s1yHMaVmVdEOSTtIx/X6wnLPQN7JB01M6/dnVJgNtuWP6k oKuwyWitKoSh3bpfb4M8uPVbQ3YWMSpd6w7C0Cgy5t2IGddzfQv10UVmYYW4y62az9NR Tr2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788602756; x=1789207556; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZihC6gdFyAtWT1MYgYEnu+8RGKM23e/TuDS3snfY308=; b=FJZTWpYmPHpyoQZI9WaMIw62N1DO1RzvE/oyYHQREqL8HHDcrHlbS28aboXLEh6P/m 1Bz+Wb0en3wI7ZuHloPNq5OsGVQ4AYCXQKRCD6MtCUyHXQFI9yw3nrC4KPLK4Buen8kO MCX3e18hSBam16rSr+feJ5dwSdfpYevQQGy069SqPcAUpU6dvQKuCNWAVUvpLdgA1Z1t 86JFLzSHTPTVCR6yp0Irtv++ouZEEHNvBiIKPk//cyxP5bu/wiYhPPGWItvVbG5tMXMG yGOy1+wtB5IDKGEDUJ8WpHI1GDx9lUfW+2e2vs+jgTw7V0NLVYt1sx5j0ouqkkOSZCk1 Fylw== X-Forwarded-Encrypted: i=1; AKwUvByeFY7TdwOzmJ940Jwz6DdB+rcpjA+1W7Sul86WCV+WRPUpim6bLonhrCGmtGNfMTOMVTZQCukkzTuhjI4=@vger.kernel.org X-Gm-Message-State: AFuF++nT1M+TaHlEzAeb9DK/st/PjRma6Ez3ZwdbmEaYFZn9hZz0AUFz mH6GNEpC5XzDMhOIQ5d4sXXsdaxI27xC9Zp+ApzMWJycU0RyT8vdFFcL X-Gm-Gg: AYBFou013nJMhx8W0X0epjIrhN2sAVueVZu7h3R09O86Iyr9lwwxEv/KtEC9UDVpuuK btbIIBbr2R/uyDG1S98rs4GK7EX3o9h9iE0UNyGHJMNJRfHIvt9BUHb74TwGA52mUJxXvDhX5Gx +Ee2f+mFjAgLxXkHb+PYX8kDeZqDaor8wnroj6TxFMN4S6r3Z2EpnnsD2F8H7PMJlFNdxn5wapb 5In6FwRodP2uNCVoy7A8yOu2w8AJw1AROio35Gd1EH0Ef4lq/6m5HReiKw2Qw+7hasNZnRF+wZg +bjmCbuRCuSw+fRpLy8a7Z2nwwVA33sofxBSQSkeYeUH5DYDTnbfpYdeFqkrmEv1S5O4TEamwU2 UxNz81YucGek7FCTd5nUm9EHc90xGzre+5Cg/8vua+jJ9cudttAIjgZ5mtnXv8mTeXNTRO8ViQk VKxBXDT6m2fZeS7RqkQzUeJiDC8rmTuMQRPHU1V+Vt5R8it+G0KnnCyLNua3eZSGsgnMlb9xy18 iYn4o+VBBadFGwN22HnEm8PslI+a5e/9f7ffjKBXRhfDMk5R5e/JBBr2/SrGg== X-Received: by 2002:a05:651c:31cf:b0:3a3:61ec:7db7 with SMTP id 38308e7fff4ca-3a372e08c5fmr10761191fa.13.1788602755470; Sat, 05 Sep 2026 03:05:55 -0700 (PDT) Received: from archlinux ([94.180.80.42]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a3705868a0sm13107741fa.19.2026.09.05.03.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2026 03:05:55 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH rtw-next v8 1/3] wifi: rtw88: rtw8822c: Use bitfield macros for DAC IQ sampling Date: Sat, 5 Sep 2026 17:05:46 +0700 Message-ID: <064626e2b0a0e415ddd53afbf908c000524e0e58.1788601784.git.ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Define proper GENMASK constants for the In-phase (I) and Quadrature (Q) components of the DAC IQ data register in the header file. Replace manual bit shifting, masking, and rtw_read32_mask() with standard rtw_read32() and the FIELD_GET() macro to improve code readability. Signed-off-by: Arsenii Pashchenko Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 18 +++++++++--------- drivers/net/wireless/realtek/rtw88/rtw8822c.h | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 244c80264..137544649 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -291,9 +291,9 @@ static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *= rtwdev, u32 *iv, u32 *qv) =20 while (i < DACK_SN_8822C && cnt < 10000) { cnt++; - temp =3D rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[i] =3D (temp & 0x3ff000) >> 12; - qv[i] =3D temp & 0x3ff; + temp =3D rtw_read32(rtwdev, 0x2dbc); + iv[i] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[i] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); =20 if (rtw8822c_dac_iq_check(rtwdev, iv[i]) && rtw8822c_dac_iq_check(rtwdev, qv[i])) @@ -344,12 +344,12 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev= *rtwdev, rtw8822c_dac_iq_sort(rtwdev, iv, qv); =20 if (i_delta > 5 || q_delta > 5) { - temp =3D rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[0] =3D (temp & 0x3ff000) >> 12; - qv[0] =3D temp & 0x3ff; - temp =3D rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[DACK_SN_8822C - 1] =3D (temp & 0x3ff000) >> 12; - qv[DACK_SN_8822C - 1] =3D temp & 0x3ff; + temp =3D rtw_read32(rtwdev, 0x2dbc); + iv[0] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[0] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); + temp =3D rtw_read32(rtwdev, 0x2dbc); + iv[DACK_SN_8822C - 1] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[DACK_SN_8822C - 1] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); } else { break; } diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.h index fc62b67a1..7bea99614 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h @@ -141,6 +141,9 @@ const struct rtw_table name ## _tbl =3D { \ #define DACK_RF_8822C 1 #define DACK_SN_8822C 100 =20 +#define RTW8822C_DAC_IV_MASK GENMASK(21, 12) +#define RTW8822C_DAC_QV_MASK GENMASK(9, 0) + /* phy status page0 */ #define GET_PHY_STAT_P0_PWDB_A(phy_stat) = \ le32_get_bits(*((__le32 *)(phy_stat) + 0x00), GENMASK(15, 8)) --=20 2.55.0 From nobody Sat Sep 26 02:29:47 2026 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AD6143FD0B for ; Sat, 5 Sep 2026 10:05:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602761; cv=none; b=S8wrxJ+P/TLTZxzHmEBAlzJhPtC3X1N0oc/rPxqAmPDXksDMQvb0BMilMhfFcoUzWcyN5K/19qZIcyUjJgCELGjkwkuZjyeQauEKi8qHeQ762uWkhLIAvABD4eIvXwHdXbBTCdSNgcDannvRg3PVfKLgeVbEeu/ek7vxxhYTLLM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602761; c=relaxed/simple; bh=Whe7LKSU7peul1T6lvFdN+CuWYm1rV468che/7NJ/GA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OS1M5PE3Vxp+fiVfjGxSxmiTMplCTBv6sGjtMTb9YRqDRgNOKpWXQu4hk02FdS/8tSGYH4DnU9bEUaEws+TF5mg61zMxSCrdSjA9l+Gjf5QFBGV1Vylnx8RhyJtlKBarhTAzBaoORxkgw2HaJ3hdA/GkxxUwjQrW0+8IJcxh0Nk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eAfw8dIh; arc=none smtp.client-ip=209.85.208.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eAfw8dIh" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-39f20d19895so15055141fa.2 for ; Sat, 05 Sep 2026 03:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788602757; x=1789207557; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=UVZO7xqLMmMI/VAYMXFHUsaCZa1hDMcAPBs6DtMLFLo=; b=eAfw8dIhGw8bftvcNa8mnM8sc2anksqW3+rs1HfRs47Y78SJ6TKB8AEc3Rb7fUr2s2 ooAwRGbxwe4CeAvDJkfAFlzehcu9S09MJGoEWChm/GpB/aUIKlUZLgvCvQFOV5FbZPHu s3LWdgSXYSlu/GQCsjYtu/p2fOn+KDYI59iTcbPAbc7UuC/5d627VB7ddYx4ycHIY5d3 V7jZ0smtBGa1frq6wdSQ+hccynRPWZWfK/S2eB83cIFEpdgF0xzUlH9R+gzLPF/UFuIt 0qqUfV0eSo8vXm8/U6lIQZGedFAhBFMYPsnxvW1tm9b76Lqmd58xAtmfuL/pjXoWrEPb MICA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788602757; x=1789207557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=UVZO7xqLMmMI/VAYMXFHUsaCZa1hDMcAPBs6DtMLFLo=; b=QP1FK8/sNnG8SscQEkFQpbkQhKMTV5CpafDSJW7PJxg1Mfj4Y+wh28j6bNXYagOvCj 05nkeG7lfAyavOh1rMcrLmgoT/itCnOideapai+gL4fMwBeZaqcENwGQBzcjs99zIzyz Bb9JPxn0TCsme4pZMBNlaEeKM7UtwkA9qxp/zzuhp/jDCMjWIqQRq0VN3gKFTxBKaSrH 6QqgJwWFmNWrye1Ubx2vNULASGMPz3r8bpznY9raWely3Ih86MxmnsGK3SR6z8HhZFt9 Waru9TANajp4pyiI5loowc7emg3xVR6aJ3SLu3lD5UBO4ZqLxeF8JWKtnFqZe1JAfYdk Jzig== X-Forwarded-Encrypted: i=1; AKwUvByG8Bg1r2gMr37n8v21XGODe3cH42V8Lq9GHWa5VQnznd0vd/9rleQKsVnP4hwsqP+K19AIZ73zKoLIDx8=@vger.kernel.org X-Gm-Message-State: AFuF++k9EgTGo48MtulLIXSfr2uybqlBuUNN7bdaMIqHZH/TD6VTxzYG hcAKumfuALoFtQ4Wtvxz0WseaUonk9LfPVgbMhrJz169f425MtayeIpY X-Gm-Gg: AYBFou01225sigerA53UFKQ/QUnEMghMuWZUTkv8slj0tSa8aimGXeR/72xpFahbsu/ B9AgdfDqovRAVtc29xKwWJ7jnyBujLHEMqHfSJeh0nHp1TrYa4jlpHS5NcfAydEiLvLPegBNz0G 1h3zfcr/VWKK+2ajiOQ8BvxsYoQHiOFSdU5XWBVXwmSiEmf+tn56GIf+xR8bBDu/en1kIxLMnxi eAzFf2SgxURb5Gja+ZlVPMF8LmnqdGYn8QKAv9EGQ4vdbcJEllGwHQAr0kkpI/TFF7wjGDl7BhY +ATjN0FizwFjwo0OFbe7M8UnrA+kv3uI+3j0Ax82nthXnj6WG9FDs168pGXmGuljUXc5trwi4cr jvXLRJBI7WtIEaNcwY/PtgeUj0EF9hHp90HCbH9X0D6xSjI5n22nXJPRI4m/kmlmcDyU3h2uS9m h5l4YFMkfiGe0dU9XPgrwUWA1ABu2kAVqf1/drac0GY6ZXVemcNgI2fqGECcrkFSrUczbMERtt9 3AjYiunbRpYkW7sp04/iYie+XFZ5zNd4QolApSzD/7T6J/2nSC97K4Y7GgGzg== X-Received: by 2002:a05:651c:1543:b0:3a3:4997:ec3c with SMTP id 38308e7fff4ca-3a375b328cbmr9829791fa.2.1788602756438; Sat, 05 Sep 2026 03:05:56 -0700 (PDT) Received: from archlinux ([94.180.80.42]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a3705868a0sm13107741fa.19.2026.09.05.03.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2026 03:05:56 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH rtw-next v8 2/3] wifi: rtw88: rtw8822c: Convert DAC IQ calibration path to signed math Date: Sat, 5 Sep 2026 17:05:47 +0700 Message-ID: X-Mailer: git-send-email 2.55.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert the temporary stack arrays 'iv' and 'qv' from u32 to s32. Update all internal function signatures to accept s32 pointers and handle signed values natively. Use sign_extend32() combined with FIELD_GET_SIGNED() to properly interpret the 10-bit hardware values as signed integers. This allows flattening the complex nested unsigned boundary conditions in rtw8822c_dac_iq_check() into a simple amplitude boundary check. Ensure rtw8822c_dac_iq_offset() properly maps the signed average back to a 10-bit unsigned format expected by the hardware registers via GENMASK(). Signed-off-by: Arsenii Pashchenko Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 141 ++++++------------ 1 file changed, 46 insertions(+), 95 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 137544649..4b8a7e777 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -153,49 +153,14 @@ static void rtw8822c_dac_restore_reg(struct rtw_dev *= rtwdev, } } =20 -static void rtw8822c_rf_minmax_cmp(struct rtw_dev *rtwdev, u32 value, - u32 *min, u32 *max) +static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *v1, s32 *v= 2) { - if (value >=3D 0x200) { - if (*min >=3D 0x200) { - if (*min > value) - *min =3D value; - } else { - *min =3D value; - } - if (*max >=3D 0x200) { - if (*max < value) - *max =3D value; - } - } else { - if (*min < 0x200) { - if (*min > value) - *min =3D value; - } - - if (*max >=3D 0x200) { - *max =3D value; - } else { - if (*max < value) - *max =3D value; - } - } -} - -static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, u32 *v1, u32 *v= 2) -{ - if (*v1 >=3D 0x200 && *v2 >=3D 0x200) { - if (*v1 > *v2) - swap(*v1, *v2); - } else if (*v1 < 0x200 && *v2 < 0x200) { - if (*v1 > *v2) - swap(*v1, *v2); - } else if (*v1 < 0x200 && *v2 >=3D 0x200) { + if (*v1 > *v2) swap(*v1, *v2); - } + } =20 -static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, u32 *iv, u32 *qv) +static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *iv, s32 *qv) { u32 i, j; =20 @@ -207,30 +172,22 @@ static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwd= ev, u32 *iv, u32 *qv) } } =20 -static void rtw8822c_dac_iq_offset(struct rtw_dev *rtwdev, u32 *vec, u32 *= val) +static u32 rtw8822c_dac_iq_offset(struct rtw_dev *rtwdev, s32 *vec) { - u32 p, m, t, i; + s32 sum =3D 0; + s32 avg; + u32 i; =20 - m =3D 0; - p =3D 0; - for (i =3D 10; i < DACK_SN_8822C - 10; i++) { - if (vec[i] > 0x200) - m =3D (0x400 - vec[i]) + m; - else - p =3D vec[i] + p; - } + for (i =3D 10; i < DACK_SN_8822C - 10; i++) + sum +=3D vec[i]; =20 - if (p > m) { - t =3D p - m; - t =3D t / (DACK_SN_8822C - 20); - } else { - t =3D m - p; - t =3D t / (DACK_SN_8822C - 20); - if (t !=3D 0x0) - t =3D 0x400 - t; - } + avg =3D sum / (DACK_SN_8822C - 20); =20 - *val =3D t; + /* + * Map the signed average back to a 10-bit hardware format. + * Example: avg =3D -1, returns 0x3FF (signed 10-bit value) + */ + return avg & GENMASK(9, 0); } =20 static u32 rtw8822c_get_path_write_addr(u8 path) @@ -271,20 +228,18 @@ static u32 rtw8822c_get_path_read_addr(u8 path) return base_addr; } =20 -static bool rtw8822c_dac_iq_check(struct rtw_dev *rtwdev, u32 value) +static bool rtw8822c_dac_iq_check(struct rtw_dev *rtwdev, s32 value) { - bool ret =3D true; =20 - if ((value >=3D 0x200 && (0x400 - value) > 0x64) || - (value < 0x200 && value > 0x64)) { - ret =3D false; + if (value > 100 || value < -100) { rtw_dbg(rtwdev, RTW_DBG_RFK, "[DACK] Error overflow\n"); + return false; } =20 - return ret; + return true; } =20 -static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *rtwdev, u32 *iv, u3= 2 *qv) +static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *rtwdev, s32 *iv, s3= 2 *qv) { u32 temp; int i =3D 0, cnt =3D 0; @@ -292,8 +247,8 @@ static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *= rtwdev, u32 *iv, u32 *qv) while (i < DACK_SN_8822C && cnt < 10000) { cnt++; temp =3D rtw_read32(rtwdev, 0x2dbc); - iv[i] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); - qv[i] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); + iv[i] =3D FIELD_GET_SIGNED(RTW8822C_DAC_IV_MASK, temp); + qv[i] =3D FIELD_GET_SIGNED(RTW8822C_DAC_QV_MASK, temp); =20 if (rtw8822c_dac_iq_check(rtwdev, iv[i]) && rtw8822c_dac_iq_check(rtwdev, qv[i])) @@ -302,67 +257,63 @@ static void rtw8822c_dac_cal_iq_sample(struct rtw_dev= *rtwdev, u32 *iv, u32 *qv) } =20 static void rtw8822c_dac_cal_iq_search(struct rtw_dev *rtwdev, - u32 *iv, u32 *qv, + s32 *iv, s32 *qv, u32 *i_value, u32 *q_value) { - u32 i_max =3D 0, q_max =3D 0, i_min =3D 0, q_min =3D 0; + s32 i_max =3D 0, q_max =3D 0, i_min =3D 0, q_min =3D 0; u32 i_delta, q_delta; u32 temp; - int i, cnt =3D 0; + u32 i, cnt =3D 0; =20 do { i_min =3D iv[0]; i_max =3D iv[0]; q_min =3D qv[0]; q_max =3D qv[0]; - for (i =3D 0; i < DACK_SN_8822C; i++) { - rtw8822c_rf_minmax_cmp(rtwdev, iv[i], &i_min, &i_max); - rtw8822c_rf_minmax_cmp(rtwdev, qv[i], &q_min, &q_max); + for (i =3D 1; i < DACK_SN_8822C; i++) { + if (iv[i] < i_min) + i_min =3D iv[i]; + if (iv[i] > i_max) + i_max =3D iv[i]; + if (qv[i] < q_min) + q_min =3D qv[i]; + if (qv[i] > q_max) + q_max =3D qv[i]; } =20 - if (i_max < 0x200 && i_min < 0x200) - i_delta =3D i_max - i_min; - else if (i_max >=3D 0x200 && i_min >=3D 0x200) - i_delta =3D i_max - i_min; - else - i_delta =3D i_max + (0x400 - i_min); + i_delta =3D i_max - i_min; + q_delta =3D q_max - q_min; =20 - if (q_max < 0x200 && q_min < 0x200) - q_delta =3D q_max - q_min; - else if (q_max >=3D 0x200 && q_min >=3D 0x200) - q_delta =3D q_max - q_min; - else - q_delta =3D q_max + (0x400 - q_min); =20 rtw_dbg(rtwdev, RTW_DBG_RFK, - "[DACK] i: min=3D0x%08x, max=3D0x%08x, delta=3D0x%08x\n", + "[DACK] i: min=3D%d, max=3D%d, delta=3D%d\n", i_min, i_max, i_delta); rtw_dbg(rtwdev, RTW_DBG_RFK, - "[DACK] q: min=3D0x%08x, max=3D0x%08x, delta=3D0x%08x\n", + "[DACK] q: min=3D%d, max=3D%d, delta=3D%d", q_min, q_max, q_delta); =20 rtw8822c_dac_iq_sort(rtwdev, iv, qv); =20 if (i_delta > 5 || q_delta > 5) { temp =3D rtw_read32(rtwdev, 0x2dbc); - iv[0] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); - qv[0] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); + iv[0] =3D FIELD_GET_SIGNED(RTW8822C_DAC_IV_MASK, temp); + qv[0] =3D FIELD_GET_SIGNED(RTW8822C_DAC_QV_MASK, temp); temp =3D rtw_read32(rtwdev, 0x2dbc); - iv[DACK_SN_8822C - 1] =3D FIELD_GET(RTW8822C_DAC_IV_MASK, temp); - qv[DACK_SN_8822C - 1] =3D FIELD_GET(RTW8822C_DAC_QV_MASK, temp); + iv[DACK_SN_8822C - 1] =3D FIELD_GET_SIGNED(RTW8822C_DAC_IV_MASK, temp); + qv[DACK_SN_8822C - 1] =3D FIELD_GET_SIGNED(RTW8822C_DAC_QV_MASK, temp); } else { break; } } while (cnt++ < 100); =20 - rtw8822c_dac_iq_offset(rtwdev, iv, i_value); - rtw8822c_dac_iq_offset(rtwdev, qv, q_value); + *i_value =3D rtw8822c_dac_iq_offset(rtwdev, iv); + *q_value =3D rtw8822c_dac_iq_offset(rtwdev, qv); } =20 static void rtw8822c_dac_cal_rf_mode(struct rtw_dev *rtwdev, u32 *i_value, u32 *q_value) { - u32 iv[DACK_SN_8822C], qv[DACK_SN_8822C]; + s32 iv[DACK_SN_8822C], qv[DACK_SN_8822C]; u32 rf_a, rf_b; =20 rf_a =3D rtw_read_rf(rtwdev, RF_PATH_A, 0x0, RFREG_MASK); --=20 2.55.0 From nobody Sat Sep 26 02:29:47 2026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00206443A98 for ; Sat, 5 Sep 2026 10:05:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602761; cv=none; b=r4hfseWdJ5Eyrb66WSzRRUFpXeLwatEie+VZ/6JHMxjqMbSbyjHy3+Ilx4ysQgLzaETdbQ6PMmhXGCj9nRj1g6FIk7iluYF1EiCHiiBI2TodIwScexBunQ0K/JaPUgTuVwK6fkvkn801+N7KzdeJUOwvyO+POFytAM6IeooQCk8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788602761; c=relaxed/simple; bh=1qqyq4Syl2WaF6Tg7xUtShvZMNjFH6XqF77gDveVmmU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RkfQBHHm+Nd6yMJQkpufhG9ITc9GgSBtmtv2PqwQafhmtY3KM42dkLQh7r1Y0rzQiKEG78kCSvOiXN8g4wP4ipxgfCzbGySdADVyKJLMQ9sFffMOI9VEIzsUhDg6bQ7VSlW97sYfkZtyFxgVRuFRU+3KacLRYIrM4llAO3pYfcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=rW0BryfE; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rW0BryfE" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-3a20d12211bso19305511fa.0 for ; Sat, 05 Sep 2026 03:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788602757; x=1789207557; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kBt74xlcxwFLAYYvZBtsSvm1+fx1WiBkga842ECzmFY=; b=rW0BryfEH0fs5b76hf0dnTZN9krzoW/8sL/LYmBS0FnOVzI0VMjAiyD9haU2JeyXiO 14MTRsavsWdXxWzMT7NNpsz4uiB8RYK0VSseVYzMv1vFR0JbyRZ4ElhH6KTS9HRHYBkQ tpol+akswe3/iw+z2FC898dJI1DqVqjysyUeoIH7kt5lOMgK9Pkpy0ImFtmWsq+8ke6K F7dEeLfhJ5gJfWB+uqVOC8NK9te5E5D0g+sMHeYezB1szMHlulCDmZHHOv8qpgke1/ys xeua3o+77m8u6gm/cRt0ISmRyCu1QmIV1bnDdAvk1jnKIpgiVqyDSNUVtOhzlUJl0xMW GR7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788602757; x=1789207557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=kBt74xlcxwFLAYYvZBtsSvm1+fx1WiBkga842ECzmFY=; b=BiyafSBnXg/hFk1CYWPeEXutHGTSIA4enxlYc47rMIWdo/VqEnsRG6GI8fNGdAfZEC iEOMKnALd7OhQVrf1pTYPhsUJCzlb266tF42vWvIEItTQZz39CuMyaaBBE6iRkUpQv6z 8BGwAhfwy616DKaXce4BiH8+qZ7Do2dngu2gb+91ClgwLsPf+KoRhb5iam5GfT8x2EX+ N9sn9jFDQYOmudem5Wy96fetZB9mjMxf3jwfv52mfuz0uWMiMfhad4qLv38w5O3zWFcv Xao1webBTAn9D/YN71RPqOlkiVSiuk6cdJiSaHE3f+ui55AiVw9DKErLU92zXfl3hoz8 LnaQ== X-Forwarded-Encrypted: i=1; AKwUvBw90Cmbh85T0EYVTtYEvGp2C60O33EPBbkO7fQS1x0fco3l8h+OhX4sQc+q/w8xEVQ/8r/o+4kpkJs45ks=@vger.kernel.org X-Gm-Message-State: AFuF++k3uMzZbfnhgi+pSmzxtwdmDzhiOmJPLQM3v2N+P249RUgkNFxt 80A6yOwEFRNbfGLjGa3pz26qgRQFRkcG9EYsbgJYaOENvitFs+VR1Klc X-Gm-Gg: AYBFou1HEOjgH+NrAF2cHepA0M9IsSeRMOremNbQsHTjy2wALZ6Ys9VCMeKEWJ0M+G3 s3GnvMTvOBFFCSsX3wE9Iqq2bZhClQKKQJrMFV9VTGQXZrSS6buEJRR3QLt91ZhtIh3v5wUKLVk WYm4PrVEUACOC0r/vc5dlJaTCvxmAjhhLK2Ywr+a4S04hLDa7LDd/h0yTm4RSRSDKPyeBHJWu1H HPPtgNqiFkIWjMSLaspRq+uqiCN08J3z5L9sOlS+JFkOL+DqYtaweRVJasPHOBe+FY++Kjd1msw AznitHEnc5iV+mbA0g+HoIswXoqn5f/IQH8ch3aEW0eqGliyFeqaUr4T2gkDbTB+nQ/HC6DVVlO U+80T5bKw+cGhA7CtXMOq6+KmCqrzLZrXV5hK7/+6iiYRrUZXwoX1v93cGySzgq1AjmeeDBF0wq tepwk12U+6dEPXVU22BQSGuFlBQ4n1HMyvQgT3S54keJg7F8C//9tiICYFMgKNkGBK/aX7T1w4S huHCGkNlHRGgbLwH8oXp8ZX1ActxwMh0pJGdhn0rNw5AeotavGztgVMuWXoEA== X-Received: by 2002:a05:651c:a342:b0:3a1:6a25:1780 with SMTP id 38308e7fff4ca-3a35b58a443mr16719631fa.9.1788602757354; Sat, 05 Sep 2026 03:05:57 -0700 (PDT) Received: from archlinux ([94.180.80.42]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a3705868a0sm13107741fa.19.2026.09.05.03.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Sep 2026 03:05:56 -0700 (PDT) From: Arsenii Pashchenko To: pkshih@realtek.com Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Arsenii Pashchenko Subject: [PATCH rtw-next v8 3/3] wifi: rtw88: rtw8822c: Replace custom DAC IQ sorting with kernel sort Date: Sat, 5 Sep 2026 17:05:48 +0700 Message-ID: X-Mailer: git-send-email 2.55.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace the custom, nested bubble-sort logic in the calibration loop with direct calls to the kernel's optimized heapsort implementation inside rtw8822c_dac_cal_iq_search(). Implement a safe, overflow-proof s32 comparator using the subtraction of relationals pattern. Since the input values are already properly sign-extended into signed arrays, the custom circular index sorting rules and helper functions completely disappear, reducing lines of code. Signed-off-by: Arsenii Pashchenko Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 4b8a7e777..4b98e815b 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -3,6 +3,7 @@ */ =20 #include +#include #include "main.h" #include "coex.h" #include "fw.h" @@ -153,24 +154,14 @@ static void rtw8822c_dac_restore_reg(struct rtw_dev *= rtwdev, } } =20 -static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *v1, s32 *v= 2) +static int rtw8822c_dac_iq_cmp_s32(const void *a, const void *b) { - if (*v1 > *v2) - swap(*v1, *v2); + s32 val_a =3D *(const s32 *)a; + s32 val_b =3D *(const s32 *)b; =20 + return (val_a > val_b) - (val_a < val_b); } =20 -static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *iv, s32 *qv) -{ - u32 i, j; - - for (i =3D 0; i < DACK_SN_8822C - 1; i++) { - for (j =3D 0; j < (DACK_SN_8822C - 1 - i) ; j++) { - __rtw8822c_dac_iq_sort(rtwdev, &iv[j], &iv[j + 1]); - __rtw8822c_dac_iq_sort(rtwdev, &qv[j], &qv[j + 1]); - } - } -} =20 static u32 rtw8822c_dac_iq_offset(struct rtw_dev *rtwdev, s32 *vec) { @@ -292,7 +283,8 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev *= rtwdev, "[DACK] q: min=3D%d, max=3D%d, delta=3D%d", q_min, q_max, q_delta); =20 - rtw8822c_dac_iq_sort(rtwdev, iv, qv); + sort(iv, DACK_SN_8822C, sizeof(s32), rtw8822c_dac_iq_cmp_s32, NULL); + sort(qv, DACK_SN_8822C, sizeof(s32), rtw8822c_dac_iq_cmp_s32, NULL); =20 if (i_delta > 5 || q_delta > 5) { temp =3D rtw_read32(rtwdev, 0x2dbc); --=20 2.55.0