From nobody Mon Sep 28 23:11:28 2026 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 0F7ED351C2E for ; Sat, 15 Aug 2026 09:39:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786786774; cv=none; b=pZFIdC2//5hy/I/uD9fi6v8WvYyIchTERRxDZteRYK9xO1Wyxct0rdCl5JHaEkeaYoZ7nc0MIaOZgZBdIGqOQ+jWTc3eg2FXiBK+pHrMyNEfW/6LFbeTAojjAtcf5ZMm+rbMqwq6hbfmDsEWSZL+J0qcWoFQ7KWA/GA+QD1uCio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786786774; c=relaxed/simple; bh=J7WWIorQALvl1TB/piLk+5x36QCOVw2Ew4N4qt78e6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hpB1bHBeeEbqbM2sLpWA6+q7F6VADE2Hu7IfTPEUpGAA7LWX7E2/pqNW1HpaqTWX1U5fIjKhNKXKndYE8QkgC21Eg5tMROm5vyIv8bGZT8R2bGkVeiEwHu9eTcOgnqHpVm1P1OuLFo/j32gIghHRdS+5d8Z4oRU0mnFczcX/xC0= 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=fuzL0rFX; arc=none smtp.client-ip=209.85.167.51 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="fuzL0rFX" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5aea0fff535so1894268e87.3 for ; Sat, 15 Aug 2026 02:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786786771; x=1787391571; 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=mTp5tt6o5viHIfZHu8ddHYkmMFpAt4nOgEqLQ0bcKso=; b=fuzL0rFXF1ZQtSNWdjtc8Fte1XIpMIiweE75ygP7c3n5uFD1NBjKjLauc+OcrQrfg/ GcJBi476SIMloCGRsxN1b8XD48te61VP5Vq4Wchncdj8LPFUW9BBOmTGkYgHoEdSgCyd dCCOW4GNe9NmLjgfA0fvJP5hTFnxfQhL2ESh/Yx2Fp2HAd+vSmQO/jaH9j1NnAQ1aQ/E soEr38uHocweQ04SpUyZCwTEZf8MZddP/hDZkDRC+t7bh62HFotA89iva9e+Szlmq+uk wpengDXB5JvfB60higZnHnIP4bmVSvTED3VF5bUznht3lCQHf1DHvZtWWGlRyHqnw1/h uzDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786786771; x=1787391571; 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=mTp5tt6o5viHIfZHu8ddHYkmMFpAt4nOgEqLQ0bcKso=; b=OefyemtrDw0XyjRytOYo3wgHE2eaZ9sSzeOPKJxaQwyzhzXxw4NUbymV59lHRNN/ww 2T2QDMh9OsraPG/ztJG++sfwXTm+qxv7BRAWlGO7wC32EPQ8d+FGKlZ2qepSh+49Psqk rKEMWL3V+YSWk212T/GqvrksE+E8ViJJcHam+fh/3p3YjrG8SzTQAtCEC+JOx+fvKikx HbTGLoikBld+1E7kBNuhyyKkCtFDyYoxOqVLqgS5M//ix2aNWhN6O5lPsjMr9mVcfske unLgLPYJChHIUzZGh+qxSVHSDArigV8aj75HbH3jVqiPwt1FXcOy0YztdLg96mHpRfs+ tbKA== X-Forwarded-Encrypted: i=1; AHgh+RrkPNxZQyuDtL3mIeGe23+l3dIEu+OJ3i9hQlxn7z8WH2QKX2Mci7+o3u5LflSjvooxulBxOcHcJFjolt0=@vger.kernel.org X-Gm-Message-State: AOJu0YxezPEFJ5xttJENF70JUstcLNb8SsLpOSvGFrS/b2nDFqlF/8Pc p1q7rk7VMQhWBEuMvWV9bA7Lkn0c/vg9UMI7Si3kFQy/EPu7LX4Xz4MU X-Gm-Gg: AR+sD10RksFl/1OnOq7J99uG5+iYPGyCIhbaAxAZlcRsqrbyUpLYFeU6570jIMKcUL1 +Cr8hvEhkivhDmu9TUVZtiO4a4TerbqH4Zsb7R7Xu6yY4bDj98oiy8H+rmRHHs3RUhlqjHGzMuS z9WtywtUBKAItgyKqIyLR775vIo+xk1IftxqHOmhEE1hPxkmU/Cqlgv03qIsK8GM5185GDbIk0F g6mspJ8gfVVzYUp7hTm6Ix32ciGJ/KU5T1vAfGw1FPrsDr8Cxwyohkd3olP4wA2otLVCTzwnDkX dNKM30c0at98y9Z5LJd5lP/nyQ20NaL5MaGQwU5NkuHb/qt+FlV5m6Me7ldj5zp19TwLc/ksp2a GnroY5cU1I5ljWttjWmAPZbLYTkEHXFOR8sfade8vswkMkZ4nU9UhqsURXjfYuLd4PTO//OUdmo xdfgP6OxTxdA2WOID+jtVAlkDYO91b2Wsxu0xLIiVNKyHNe/PGqmKIu4HGU2dspYYx+nPh3AHOA 2Ge1i19f24rVnRs7XKGM+nUB8i0Vxog82sfZjRjVuR8CsWcvvXqNh1n8SvBQw== X-Received: by 2002:a05:6512:6891:10b0:5b4:508b:de9 with SMTP id 2adb3069b0e04-5b459182ae0mr1046879e87.25.1786786770986; Sat, 15 Aug 2026 02:39:30 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458bedf9fsm1040316e87.46.2026.08.15.02.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 02:39:30 -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 v6 1/3] wifi: rtw88: rtw8822c: Use bitfield macros for DAC IQ sampling Date: Sat, 15 Aug 2026 16:39:22 +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 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 Mon Sep 28 23:11:28 2026 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 ECD8C3655D4 for ; Sat, 15 Aug 2026 09:39:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786786776; cv=none; b=shOsFkALg/k3MQh/s7eSGGWnCGf9z6sYXs/bMt/+28v35cbymr16MA/u+uTjXucd3bd4ycHCeT/m3ihZm5B9BwlcpTloLwBUocYawsnaxlFACvhc9igDeszMRV/sGm3hHY24tS9K7Vg3OKPR788c43ff6h5mr90ZTk7ryI25T08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786786776; c=relaxed/simple; bh=4qplkvBZsGER0LAMyfgo6U3buh+0dwWDdImZZtj33Dw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ugl4wGjYcLtM5l0N9tYmbuMEWRM1/873HG4pHQGxE/GiXIeHPS/rXe8RfEFlG5sqn60Sp3E7gZBr8dcP1KNKwzk5a0oZETBQFr+kZw3kd9BCMIA97QaY3ujYZ8wQxT4OtilGU+fyfRc1UmXiM1DZEPLx68N0+p9LNVtN3HUr5vo= 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=iukKQ3om; arc=none smtp.client-ip=209.85.167.41 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="iukKQ3om" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aeb2bc82ccso2114487e87.2 for ; Sat, 15 Aug 2026 02:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786786772; x=1787391572; 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=/1MG8NaRvzloJQN7VFYJKU5QXqKP1nT9wFsviKvdhxs=; b=iukKQ3omG6gTysorGqkiJfBZDNqIfQRr0UJ9pIEkeFk051YAnZPP7QADSJXshUcIps S9WAL8GRUEJp3f9TWrXOrREGAW7bKiJfJr2ajN2C7CZakK3cDcwhMwn35I1mWQYLnfgZ /HuFImGG0+VYCdHV2BpOGHlCPNxPZQm5a57YrOX0QhgqrTaLXQnaxXO2Pp2iFWRreC6B 4/LMNBE+lUBJMzYOPYxsdO80IThdRnA4Ly2sZ6J8iYcXY9mrsCOwnGPauSvjuOsVaw+P KuY7iJ1wlkMtK+kUtS/B3WJ/7U811ziIeJvrqQ/Y6rcrbvAYMmjaqWcxtUeJan/M94pE jDjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786786772; x=1787391572; 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=/1MG8NaRvzloJQN7VFYJKU5QXqKP1nT9wFsviKvdhxs=; b=ZfDoUqsuTui34WJKEUlNZ5GP2LcXl1acUaeEUOKkrFu4cUKeGUOLn1lfThKewWAXo0 MhV8nhtwuhnvsGaKEJd/YR0tl4Bo9RnWgxYwrdB577YF4tQX2eiOVnch1+Qi7r2FusUO UQKL7hXVT51eC7FxFSFtSYcahBMPE1BwKkJepr2TYDK8gGXg2QkoDcwGgjaP+gt7qVxK aGGCu832+wkl8TwOdLMHVEl59Mz8h3Ws/RiTxp6JRKvcf/+N/Jtu9lgi3QCMm5phbILm SfOSYPUrWhE56xqkjJwCI42r/i2lX8p27g5QpMZvZXNlcUqXDCKxlh4RDJ/+JJgCk8pZ DUMw== X-Forwarded-Encrypted: i=1; AHgh+RrxqWpeMH+Zjb3CrgVahe8Gg9mRYUIPCa779zlhl5x4cQZJOqyabQ6JYiKf/ktFTqaFHsdMMMPOTyCydA4=@vger.kernel.org X-Gm-Message-State: AOJu0YyEC2BCc4cb4AZANereDiLhDKOD2Tc9ysfuRbAVYUKP51Ptn8Dh p6nBS2IbY9E3G5BlgeDmwpwH6s3GKaNU1MM8DlsaSCoxWA0eErBUMf5z X-Gm-Gg: AR+sD138q318kRjl5upqnyVMGLvkFwyaCFxCS/hr3H9UumOk2GGCa8KEuHfST7w8VOG k8x/yuYnnnCSS1JxFvf6wRMLuiemT/rHlVBu6DJ0b/LuCKCWsn4Mi3bKS/hpyhod0pKr8YWOUnV 05WRUHTd7NyZ/QqwOO+swoZZ9r5DJ5CZ6RW7vPa/iUk6NGqGUIl+g0caJW4AbcT/BlcVeXeB6i0 bYJYj33soXmQ1jEUhjw1T32QXzyMIpF4nUZyRjELSeBlcVC+hJ1KmqePXQPPgGAq5J22S8LBSiH 8WIOdRA5pm/LFChLsQUygOgjG4saBfxVKEJBsv3sfECIx6IoBGKpaz+LMOQrdwkF+eC8ARrdfDr ja8B5APqTvCrcemK1wWkH3x9SSJO/nGKTNu04fK7FMw9a+Wpa1G1+NiWntAl4/wELnhWlUC6qBc iJEwJNea0qr/qXAlY9hJ1Y8JFwheaD5E7vm0obOVRgUxBegj8RmGROsYltPnO8L8iVUIp9q8K2j c6/PJWGR5kwR3rZsBJfPt6UD1mURrAYQuDOyefH6URH90lhz33UfxJGgXxyyw== X-Received: by 2002:a05:6512:1310:b0:5b2:b004:ab9b with SMTP id 2adb3069b0e04-5b45913c3bcmr1772424e87.33.1786786771987; Sat, 15 Aug 2026 02:39:31 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458bedf9fsm1040316e87.46.2026.08.15.02.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 02:39:31 -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 v6 2/3] wifi: rtw88: rtw8822c: Convert DAC IQ calibration path to signed math Date: Sat, 15 Aug 2026 16:39:23 +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 | 135 ++++++------------ 1 file changed, 40 insertions(+), 95 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 137544649..a10e87d6e 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])) @@ -302,67 +251,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 Mon Sep 28 23:11:28 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 637453AD527 for ; Sat, 15 Aug 2026 09:39:35 +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=1786786777; cv=none; b=T5MZ2632QKz+3biXWpWkxwLJK6mIksJEIFhont/aSKBRydH2kswPIqmFM7tp+f2jJ0/0jJTsm9guyEcr4OQS/jWFi8brb6UXctvXqFrdaGYrZj2XV4VlKmCPGToQ28Mx010T1GPQDUSD++yfNJEGxXSZjZKxNooCJvtKDuOXf7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786786777; c=relaxed/simple; bh=U3SUEsxdYjHql721PjnvBB214zaTsETImm0CrT+KHrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JokLZm4uXj1qxa3HhFDwIkrk0pEPRRfJA6MwN/iVfDMexV9FCo0LvUCibjVJ0+tf4o4G5Qve++ZLw44TSXmqfR/wLPZIOufyPCaXtzNtUlccxXyjRoCz2KzWlE9/R8HZLYgRTikPO2jtIAcWmvX1wNaqcHM9WSHcZot+y0msAyA= 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=Gy/Lu682; 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="Gy/Lu682" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5b021916bd3so2362752e87.3 for ; Sat, 15 Aug 2026 02:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786786773; x=1787391573; 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=pEZUcKNKIrK7fREGvv3quxTQpifEJYJafeD8ki/VuhA=; b=Gy/Lu682j5tkIP8Cv2l1bFb2BpUjeb+BMvfLu8MtNONI2WvdpPGc5ID8gjfoLL40WG 1D1AqxirjPLvLqz968hmw3q1UXs0vkpKLiaAZLlqQzlzquHPHbbbSxYoZvdnZx9Qup/b XYwtuQ3zd47krI86Rfg7rQIqgHSumGQE/BHBhAWmawfNWHJ3PfCoy0l4ElVreazd8HIn hLLuD/YTDEU6noq4pKd52l9ykFRsHl5jv7DkDfgXN6AESZgMG8uQ9pJUIy3B1CPoUYb/ WPNuJC32lp87BtgclWxOaItQt0tncqcR7B4TALTMQ2xX0sBUwKgTw9fubdfI1ySFK141 ADvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786786773; x=1787391573; 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=pEZUcKNKIrK7fREGvv3quxTQpifEJYJafeD8ki/VuhA=; b=YK3r0a54dFlKI/D64/fLCjD2XupbcN6Bik7krAgFtWqeVxa/4bWRxBH1ZwIohXmj8z lVeiMpQK5vZbIricPpXSN1DefhwVcWhmcvIfua27ZcyjoPr5xTExD/iUw3TucXN8/0za 8uFIkpeZAuf3yfgDcq2uyNBC/QZNewCHd/+oEwURredjFFbMqR5hnYqL3bpfmSfEb8Re 1r4hfWazT0JWTgEtWx608LvRt9kNaWZ+Zy/iaAbbqKGSPv30uTTFRXXEb+ch2y1WigOT Acs5mT1Pernd8eIwyYAcvt8shZZf5f1r4muw+cQL1iij/UtDBMpMwVqOfzKMGqrhwJpP mBMA== X-Forwarded-Encrypted: i=1; AHgh+Rqn/mN9KtKkV9ZBcbFl2Q8O03W1r+Xc9NGYbAf+1JZWxo/hZrL0JHRLQcsn+MktpJk4tS5XGNQmHB+sW2o=@vger.kernel.org X-Gm-Message-State: AOJu0YyShBJmh6aQZjn00f2CNzK4hJy2/RJAZuFuCGXEWbrtredBmfcr 3ukC5ockJlNECFT6T9A9L9a1x9BaydV/172K/J9Sj2QClNwEKVjbyUvg X-Gm-Gg: AR+sD10rvQXhi8peE1An1dVA7uHWjEikOUQgY9xyozvEdX7AtTTLogtPgWOqTr6uohR 0c0ZlN1uPyZyzv2b5OTg6M+sDRJZECh8Nn/FIITBVjn/lVwCSxY+R8+TmvN6wAYy4Qe63p3YoRY Bp/g2kGLOHy8zovmOFvGSOkkYzMm+WjPJutSnmNWouAKSyxDqtLuq94wRWLxrvZ43AT3f98AhT8 J58CqKYFIB6+D1FgPR/BoOg+Zzat4evOadeJAySnzsC7vIuED6eoFpKW47VqND01c+ZU9+Vi3Ri 6Jm/GLaJVZr8X8rZisX6An4K5GRVWQ8idEQV5ikz+a6QhAD093ImzrRReof2zE5us8FCrRIymna suwITKGP9IJjAN27vrrsC5NORtrHOcf2Qy0iiCw9tVtnL5pnIUz1BtflQpXcjEEsTw9cp0G2J4p C65c4M5H0qC6ARUOj6Xelx7Um9Y4JQUkGKZyLnpg9CF/gTNdT6S8USdkOTppGRC2XL0+O/6bCgb huyOGZPQt744N/UxKxBsI3Ov/11qw7sFKXs5ygXRmHWQwJeY/odrMGrew1jZA== X-Received: by 2002:a05:6512:10c5:b0:5b2:a967:c0bf with SMTP id 2adb3069b0e04-5b459102923mr1731795e87.10.1786786773221; Sat, 15 Aug 2026 02:39:33 -0700 (PDT) Received: from archlinux ([94.180.44.22]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b458bedf9fsm1040316e87.46.2026.08.15.02.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 02:39:32 -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 v6 3/3] wifi: rtw88: rtw8822c: Replace custom DAC IQ sorting with kernel sort Date: Sat, 15 Aug 2026 16:39:24 +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 a10e87d6e..8a6a8bbf9 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) { @@ -286,7 +277,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