From nobody Mon Sep 28 23:50:55 2026 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (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 177443446CE for ; Sat, 15 Aug 2026 05:35:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772131; cv=none; b=IpJc0X9l3dpFRyXkl6pu2lmWiDKR80FXPpsrHg1dhNE4DOpFd70T7IAor43W8FH9L4hY0y/JDCLLQoTRGin6/P256yuyVXO6o1mk4D09EnO6CLfD8lb5uYb1Zv3G82S/YNvRGVD/ip7z0ROyy9ddL9J9319+e5TSQadsKNJduQI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772131; c=relaxed/simple; bh=Z00uPlHINFdWZ0lDkNXlfTa7IGNeSDYooOU+xbBGCgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eieVe9xs2fruYd+JBZ3ihsYjOACno69zpkBxEKhX+CkgMKFPA7lZOAV4oVLF8pWKp+127PLq/eEvVM0oC/wR1yR42JfQcP/LClzDlXZKfjNvgRZ/+P6obOcNj64zSr2T8OYPSSgtXG9OZoJANJaDfk0q5fjupvIQCBB9CqhiTsY= 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=iOOLAtHr; arc=none smtp.client-ip=209.85.208.173 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="iOOLAtHr" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-39c908d6cb6so18559811fa.1 for ; Fri, 14 Aug 2026 22:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786772126; x=1787376926; 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=A22tk3gAdpRt2mKGtYB3EhhvS9YqP63DQw1gsI+Ivpk=; b=iOOLAtHryoEExIFdct6iTPhiKp3nLdOxBP7IpKsBwwfrYANVGsX/QMUEsX2zwNUS4O IAYttLA+juxIGllmuBg+B4QJsgf9qvpy3ForvJKM8r3P++ivbjB0UTZvP8k16mwou37o afSNQI0dhrlYetLW+evE8Aa/KouO/IH87PhussD7ZG3u2ZNyhaRWddW/DAApqABeh9/C kR7ZGuXnys/vawDGGafav4rF4ejfJCAtlgoURIVTssnKWruADVb7wkcaLPNC7zaHRuJI Z2UYYnWu3aEBibOpfIRAzBsZVqxQCrrcJKVHzLNI5Olx6IplolkscGJIHu1Vmh/qFYE8 zASQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786772126; x=1787376926; 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=A22tk3gAdpRt2mKGtYB3EhhvS9YqP63DQw1gsI+Ivpk=; b=nZCTzEQJKvpy3hZmSEkZrCRM02sWCEmr6fjfR9K2fN8PI92/06AchQ9czWcQ2qvIc+ TzimDFRjEtWxKvkWtfn4bf3lb8HXNwkemX/7RdwyBtVNYBghmZoSkKO1pjIaYPcdey6z yfidfP4HJBrzV/nKD1A+4J6iQu2ISQAsxV7H0rw88N9cBuzHcuA/wqLU5RPktn4WPlSw OQ54IRaYZoMEiHVjPgMnqKNWPi9ESD9ImWTnNnZ7evhYOEScvQAMLE20Gl46W77ly0PW A73H4UPlZ5vlnjUxHPPhvPHZ9uayPFzQehjPtRe5gSCrPRxZpD/3ZkL6iTCd5kO2nI1r LNcA== X-Forwarded-Encrypted: i=1; AHgh+RqtI1H4JAmyjppON7HEqbTvfl0D3xJKgr+p8rZKsoTtyLNYmN2zZE2iuRYt4tq7CLcFRrPpUyNFQt8yANA=@vger.kernel.org X-Gm-Message-State: AOJu0YyDDGm+zIPHW+vuKTUJhBRKnz7sEvr8O/0zyUfPpSD65pHMhcT4 PAcqAB9seM+REpW/9c8dUGYY75RRorqNDcJ9VkEboQV9MwobG6FylrKu X-Gm-Gg: AR+sD113Dwt0skGXv7GlJORd7jqaqzylYH4lEbV9j3W/70Iw9hJ5wXvAONxVmp5Ofm5 yITskQyARFfwIPElZnAUWNRhiqN1o5BpyYgH+Rn4efehL/UaJ/qC3B8Fm1tLgt9t8QXlt8Mmmnx wywyOK60GR2ReMkfIgpjUMKUyG261lWxenAST4DAotJi1MF67eL8yyY9yUffBQLs46asT7LNOUO xSurhcSverfQjH1bF+AKfshra7u3smtFQKp7ufpOl4VMlwzHZVdHkS+40xODSOiEdvYl1ePItwL gVQ90VmZiMSk1aicZfffdFR3icMoePvthqFfz1AY0opWFKMoVUNcTAT2VDwBu6Vtgz0+2BfE+lw pNPyspaw3gG5ewLmFn+1Oq2LdmJRMqov8rzlz0XOeB7Fa1Zr5SeQyHpBmcLrqzLEuuRQpKLe+xa KhjTveE8MCucDFevUAd9lCllxJ9NXJG3tbdB+7+QQDZ0tqnexStph/IwlKxl9Q2jRwdREvnZQIw E8kl1wp0cURJu3nn/xAIfy1QjNwXuEqxE3NuFcz8HvSlI7KZe2wjacyppOb0w== X-Received: by 2002:a05:6512:32c1:b0:5ae:bb52:b09d with SMTP id 2adb3069b0e04-5b45918e859mr1630613e87.52.1786772125614; Fri, 14 Aug 2026 22:35:25 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458c0a033sm932577e87.67.2026.08.14.22.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 22:35:25 -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 v4 1/3] wifi: rtw88: rtw8822c: Use bitfield macros for DAC IQ sampling Date: Sat, 15 Aug 2026 12:35:17 +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" 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 --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 20 +++++++++---------- drivers/net/wireless/realtek/rtw88/rtw8822c.h | 3 +++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 244c80264..3bf9291d6 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c @@ -18,7 +18,7 @@ #include "bf.h" #include "efuse.h" =20 -#define IQK_DONE_8822C 0xaa +#define IQK_DONE_8822C 0xaa4 =20 static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path, u8 rx_path, bool is_tx2_path); @@ -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 Mon Sep 28 23:50:55 2026 Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (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 665C8345CCD for ; Sat, 15 Aug 2026 05:35:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772132; cv=none; b=MqetJ5LzRF1LgrBjlqXcNyOwsGv90tbDych5g0m4bgk0Vbbzz/TBejt/gH3gkutz8v+UMGKqxCZ+jRRbqqAUrq1N3d85aewPnC9CeyCyE+Krs3ARHdJzi1h4EB1xo8Z1ftpaPDPZ5VnF5NZDvnZ5u0tSOFAYTNbLxGrfR7sOrlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772132; c=relaxed/simple; bh=HByq9m7lBxfCNopVjZgb9eKta/j3QpPqZjE7P5Sg6po=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cnFq3ianGQQXXjfV09wXml7LlgvzRVWHfkcQvGosuPFGh/wqLhqDh33GsQQbIGYB5bdL/L0caTSxTV82jbrpquskYmCvj540Q0NVCYTFdPuuuV/Ahg4/auNR93s04t8OBl5odJDuS16MpMD9hvl4Ad4GSRrJLhiQbMBLxqdw0Yk= 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=nynrHd8E; arc=none smtp.client-ip=209.85.167.44 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="nynrHd8E" Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-5b2a3166398so1934409e87.3 for ; Fri, 14 Aug 2026 22:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786772127; x=1787376927; 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=VBjBB39CWHysKIWdHjezan94xorylFai+aoWWBeQxGI=; b=nynrHd8EadYsg7qP7IkIcyhZZoqob1QfpRQIkiHLcUtpezpHksXAz9Lg8QPnMTPooc jzkMg4j49hbNQMiVe6e6FR/Qm7UgC2YqIOl1tozO1n69WkJne8IN0awdRmGGfGdaOGDD 5Tg1rsLn4SeeNelU8Y596x4NYcFDOduJaBUCuIP12YiVLE4iiNjknwEJD+Z7wJt/i3Zp dItbQKbP3y3BX+SHEMzYEBJAPbuPh7hrSxWH4UrZ7FuVsjdyAzuo+SPq1f0dzcqvVKQH BivHcB9TJq4nj+cAjG6ffgVwrS1kueROvUCibbkgZ2c/+hcV+HWORCoSzf0lKiEEbqdk 38ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786772127; x=1787376927; 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=VBjBB39CWHysKIWdHjezan94xorylFai+aoWWBeQxGI=; b=nvuZqJwZMWMOKV7Kjq4Atv4LNQkFqWr7ugABorrtpsUjELZP52uMoDRFKzYgOB9EI3 DZUARhDlpJ334Io6P6tZn0efmTvDtZptvzETBNyBEp0l/MAWgwIjt0gFROP83njDNkXa kliyaFuwgMv+lf1Ao4talo9yHvb04X66B7vGIAyHutdThNlg1AhdqnVHUYFJYA+LokSY mwvevtNSnbnnxQ0mJScf/aQ/7ZvkyRRa2Q3ZibQOwZahXBlzA9evV9iw36+yNpgwpfla kdtKsY0BtESLQamBdWkknlZWoyr/QwDKOkfLUzbDdPQntFjcC+GnHNjOcSrEYcR5Cf2E yPJg== X-Forwarded-Encrypted: i=1; AHgh+RpRN3tt6k2TURlAt+I+341fv7N257PGL0vLAAARoNagY0xGameFfJXI1q52j/mgQxYCtlbJcCvStSuyf0c=@vger.kernel.org X-Gm-Message-State: AOJu0YyRr9YXSWD0eNa5ibm6HyA053QLFemhEYPqLLEBYM9kkeHZJLea bPFrz+kqpaJ/b+UGdbh/HJujFM9IiECc02ulrln7zMdLpKpi4tvPVJwVC/1bNAGt X-Gm-Gg: AR+sD11Cng0kRyrhKp6NLcGddc2Hc0SBbDL6et9GIXTG8CKWJ+yDOO6Roa4S2/V5h4G sHS5IRmdWs1TgEmXMLNHF5he8KreRP5EmzLPmk0b3MCWfDFjGkNhXapt+L4q7nXuzO994m5MXej qE+M7vd410Y84TyZuPSClELoSzewlQSDaQLmQ59jpRsBm1f8/DbSdAas2ceWRhcRSluYb9M+5dh YLvDvjuIqkhGoR5p1ZIP76MAy+PiBaQ36c30V/zfVL+K8f+Zi90lGOiSkLOKux7jkRMeHkUTnz/ JM1JL/0aGLbTzloPPI5K10lVwKd+KaMok7KMl8O3P/tf6NSKoTddIyLeeHFuEoBvLYLE4Ra+iOG HGz54QddexO6XRT6uC5MGCcGVDTZ9VQkg5gun+sTEWY4yAjTktwkPZ0prYzz+EmUnem6GCD8T4Z VdELfQ0P1Ia09OH/3CGSqLTtriGTN4cv7v22kTDQ7TWcPubmrtviyYUB4f/Xfqcm+xEGdwxETYz sCFdUBm8nfEjmYgrtr+xo8jfKpwO3X8JlfYLdTVz3V0nD0vKkcRe7k8yUSJpw== X-Received: by 2002:a05:6512:8358:b0:5b2:a600:e496 with SMTP id 2adb3069b0e04-5b45916c885mr1091834e87.24.1786772126410; Fri, 14 Aug 2026 22:35:26 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458c0a033sm932577e87.67.2026.08.14.22.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 22:35:26 -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 v4 2/3] fi: rtw88: rtw8822c: Convert DAC IQ calibration path to signed math Date: Sat, 15 Aug 2026 12:35:18 +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() 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. Signed-off-by: Arsenii Pashchenko --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 127 +++++------------- 1 file changed, 36 insertions(+), 91 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 3bf9291d6..6ad90d321 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,16 @@ 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; =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 (u32 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; - } + s32 avg =3D sum / (DACK_SN_8822C - 20); =20 - *val =3D t; + return avg >=3D 0 ? (u32)avg : (u32)(0x400 + avg); } =20 static u32 rtw8822c_get_path_write_addr(u8 path) @@ -271,20 +222,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 +241,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])) @@ -305,10 +254,10 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev= *rtwdev, u32 *iv, u32 *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]; @@ -316,23 +265,19 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev= *rtwdev, 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); + 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", @@ -345,24 +290,24 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev= *rtwdev, =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 Mon Sep 28 23:50:55 2026 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 CF32226C3BD for ; Sat, 15 Aug 2026 05:35:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772134; cv=none; b=nRu7rWg1ONpIjb6I25zFF/4ZX0Jql/hFNIH3Pe1i0Ac7qlBhTEMK45FMxvr1GD0aeJAK4lkLGCHrpVVGsIWTIIwA2y66xRXpcDVLhQx42yf6cQwsaxm3OtNr2fvJwWJlfLZ17bT8NWVzuLZQSdp336kf4fwLjtry97P1mIAIZHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786772134; c=relaxed/simple; bh=wFN/aEIy5u0Oqx1IU2Yf+C56vfAH7D/5v6jrUHIg8pY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pVNqDsQr6tQJm5THtrla4pZ0k2XnHFxUUbR+0yXFNnbbC6QQ4Bo/UhOATftgiYGtRdLkxqgPQ1hc8prRjD9Q6/Lg//uig/MFPIk7tfkTqcCBR5gUguAbXqbpQicjldGtChwARoevf4wDd41Sae7M758VSi++fmrJLYxamYsvNjs= 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=RouWUL6i; arc=none smtp.client-ip=209.85.167.50 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="RouWUL6i" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5b29599b81cso2090997e87.1 for ; Fri, 14 Aug 2026 22:35:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786772128; x=1787376928; 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=H+q6pnwjD32ZGoePq5J852mbrLt3kF3WnMretQXsbMQ=; b=RouWUL6iZVulP3vjNRHEakzHQUoS0yPLEjLcWKnXOjr6WhTRqWZEX99HVPqNI3fERC 2Rsv3bIKR59tktTCC95UUMHGmRBEAfakOiYkYS8jr+qTHauZCg1Tdyop3s2WNrw5f5DI vq5ZpMGkd65F6MAZO1YzSGQbCPgpOCJzDeQnzq/z+Bo/2wPBDQxflBYgm814fEGdkSW3 TpXH98v1qFGrLNEqCbUGWa+KGHz045dkkxwwbVFTqTaaKRI4b4M7+Rw0Ep2XrqAZ/2ko 8WQ9tio9ZfBitSwyagw0I1ZMUDJKIc25e5A4Mjw+WTJ+W9mQ4ymDa67T1w6C4VSQ/ERi aoWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786772128; x=1787376928; 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=H+q6pnwjD32ZGoePq5J852mbrLt3kF3WnMretQXsbMQ=; b=S2IMD6C0VO3Fr4WPK7Rr9RVVtWGvd0NeJO8hB+eV2jSrYeb2DBRVzML26oM+/SO/zK C/uLQ8Gb5D6sQHy/UO75gm7sPz1DBuDQ8wKVcqY6RstHRzM7IvRBczT60OcOagG2vUOC sy+yJ/6FgNiPOS70r68ruiEO/kakrP8+uI5hu1trqxHqz+eq0jdYQ/GhQn14OTX+hovD MfTlHb9K7u8QfcBwdOAdcamxmH8bywLl6CoHivs6sXEsBcl8tl88JqNZE127uqEIW4m3 C1iaYArXKZRs37YX2TC1HiLDIICi5LV6Kq1VsUzMHODt1BYPPHxKXUzf95PywflvNHgS k4Yw== X-Forwarded-Encrypted: i=1; AHgh+Rp+1bhteeXKk0J9g2EmnC+FblA9DUobP7JG7trM/SLK+vEjKfvlmdWd44fBJ1OpePyR9WoohpjDDXMcHu0=@vger.kernel.org X-Gm-Message-State: AOJu0YySz6mCPBciTTmktXgmhto64UDxIhDX8r37YDuqxJpTO5bOnayQ dvsKgSZyPfgmNBazN4B1Fm5db0WcOeAqScHfqrqQgwEF1T9+M0ntJCQ6BLKjUI6o X-Gm-Gg: AR+sD12U9EFQVkmU115hVZq/9V6/np3ZbeOlHsXcLz09OfCd6THAoWPDoZcr6kv+J93 RPSwMn/3LRWBWkQoNy+PuObShBTHYH/aFD6F0OakhNAtHPTCHssnUOD4v2DJ+Z3pVsBJtRRAz/H ijrrsG6WVSFdk5OVaJG8TSwbGpL/zSXMYMZaH9laNx4rD8JRznhPQXN/n0+s6OGSxu+lbhmYeLr k9cpeEqyZSSrDHJb+AlqKdrbaVP23tSCHxS0TLJ1/vg6Y6kwdOwBd2zWVrm831pNtJJs87CMe8i 9oaXj0jypggm2ytsbAAzuvf0BqN1/iZOiy4YZUsbt23QN2JT/23J1OS1woXsPvv2NRCwOr1gPNB KMCxBpaSAg0/WCaMtmTdpU08rDROxM1ZFjos+Tg2x3lSm7nCbKJeLctCD9HrbObVDXmkMYAFrcA vruCYz3zFFyKb5BjcHklAbuTBb7Jpc5XOFIgY67+QF7Xd/WuunZTjUqs0gpZABn3qlAE9XwcRiQ qXfTALfU3UjKNGr/jdmOtOZkBUOk0UL06ALY6QWEYmTHtNqqQXek6RfS6RFTQ== X-Received: by 2002:a05:6512:1111:b0:5b1:589b:3579 with SMTP id 2adb3069b0e04-5b459108b44mr1569966e87.4.1786772127851; Fri, 14 Aug 2026 22:35:27 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458c0a033sm932577e87.67.2026.08.14.22.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2026 22:35:27 -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 v4 3/3] wifi: rtw88: rtw8822c: Replace custom DAC IQ sorting with kernel sort Date: Sat, 15 Aug 2026 12:35:19 +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 --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 6ad90d321..0140f2e64 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) { @@ -251,7 +242,7 @@ static void rtw8822c_dac_cal_iq_sample(struct rtw_dev *= rtwdev, s32 *iv, s32 *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) { s32 i_max =3D 0, q_max =3D 0, i_min =3D 0, q_min =3D 0; @@ -286,7 +277,8 @@ static void rtw8822c_dac_cal_iq_search(struct rtw_dev *= rtwdev, "[DACK] q: min=3D0x%08x, max=3D0x%08x, delta=3D0x%08x\n", 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