From nobody Sat Sep 26 23:50:52 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 8F8063C109A for ; Fri, 28 Aug 2026 05:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787895635; cv=none; b=iEVPkOKDHkVPA6RQTeBHsYcQgnD4HCOK1BLYuz0ZTcivK3XIBgfKnuwCK05ikUmK+UauH2/UA50lP0+X5GtgNokBiZR/szK3fUnjyOJ6aZZ8oohpnq67Z63o7FpaUweDtoBRDi2m5RHG5nYZokM7K8FWDlmoqxU7xHNPKetaMh8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787895635; c=relaxed/simple; bh=J7WWIorQALvl1TB/piLk+5x36QCOVw2Ew4N4qt78e6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pInjiQRRcc7CpvPP6Q18g4pJKGWJb7/Ux8URusLDN5wu/ydhkrmOW36YzrHcpBDtjYhkF/UzS8iNc+MP0RI3+kYK0Aa/KvTEg8TdFS2HZ+EVB+m5Wb9Tl0lTZyBkt7SsQb2uWqJpmmHRD2iG2vRyk0P0pk1PHUPjakMQRCpIi/Y= 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=qN9XEaZr; arc=none smtp.client-ip=209.85.167.43 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="qN9XEaZr" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b0115b9e17so618757e87.0 for ; Thu, 27 Aug 2026 22:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787895631; x=1788500431; 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=qN9XEaZr918s1Lm6OD3BWnYKekJX3w6tjeMQvBnW2Pw6tu8Nzi4tbai4pYrouCQflC W4DBWC4C6yiTNYd+0SX1WRGo4h/q3g3wOIawknHJ7yeOLwzKKjAZY+Bco0hjoImCw+V2 dhWjLKPr2mZ5lovi7niYYZV0Izurq5eUsSUkj+quk4m3+P4+H8au0iqXjzclcM0+y0D+ NfX6J1APKnZLTFvZlwCjjag201z/v/hrN3O/9Q99pHQTxz16BDx0QFc78z357G4RLpj5 lFBpeZrXXzTxetN3QHGCL8i8ifSGzY2nL18ncgSnVIsiLExJ5hpCnWj1Foh3S6aLzuFm isWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787895631; x=1788500431; 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=Snrc7j4kGx/viRemhKmrzcu2OVciw22OddiiDWot2USr32J7E1TDZaWpJHlg8yZClw spXxJAeCfHqYK4XVInqrZ3jej90kE4pMBgQB6r+Xjg6jQv/A6ZnuHxUmBLy6QEMpdL2i sjde94ODLOtmONxdQZ5pwq4x10glgBDdCj1iMOOVMKu8FpdDUJ26Pei0Mf8NFW8zxgAo f71NEA6em88Vw3XXB/+v8E8ejQDMLfHLvDmjeUaYy/5VfzthF3GS4E/kHZUIOSp/yz4U LPZPFQmsw0k4WYC+xQ4Pb3UutyBdrYc0//TS5jJfuP+T0YL6zpg6RzN3eu6HZfPylh+C MTKQ== X-Forwarded-Encrypted: i=1; AHgh+RpgMDzWJYtK7JhYbVdKbvwBAdABAUwY3Q1zQ922URJqEZhj3qODGwc3WycFE8aZRZCrNz0ZvKl1y3Pe6YA=@vger.kernel.org X-Gm-Message-State: AFuF++k75bNPYhs6mOBzqgw0pD0osPFVuk5HILoyfGS4ETaSrDv75iyM qiE25aPHYbV2GXy2sZoFklEk+D/8ptjo10OfsSoz7ThfEFgUKrwXL9g2 X-Gm-Gg: AR+sD13/QNmX5AcPQoQfZ+i6FxH3o6zmfK6048aHdUUAR9Q0n853zmUylzCDuE6dbnJ 6z+vEJPHgmM2qRjCzwkj6tSkw6/ZKNbI0PyhRcdbstdroei+4K7kG6jbjRlAQCZuA2pQDg6fK/2 KLGUFeLq6jVA6Ymkl+4q3irlFL1rL061ZSHBK2ENUQtgsAyi5HMptYd1NcuwPVvQJeXnfM+XpsD riWn7k0xZMC2Cper5Grr8klXTYlfoqBpztAy81runK7ERcZ5rLxmoPPdv+Z2/ohc2U5meD/K+pu 39By/UZlnp3yC5xtELCeHfVudJbYS2dYolJLmikxlwkW9P69Db2PjN8FqPPS/HbJsfledOeLRUC pZGmj1UBzzX41zxBd/5nNz/GHmxKQIQqQ6ZZok5+ZE2PvOTgYzFiJAnFIgMtxsgkx/yGpgD3wLp tFPuENi4uom/zW3svuRPsWXVOMDIwSnNFHEKW0xmAUu9rE75UEyK0uwWKJzN7GR3RmGT4d/Obi/ t3LAmHLnek7pq1XQf4jD72uTG6a6MznzUgcCu0UmvRKrgD5vk4WXPAUX+t+Mg== X-Received: by 2002:a05:6512:3ba4:b0:5ad:5c4a:8221 with SMTP id 2adb3069b0e04-5b5e684b888mr974450e87.0.1787895631255; Thu, 27 Aug 2026 22:40:31 -0700 (PDT) Received: from archlinux ([94.180.48.0]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b5e8a1a8edsm166172e87.79.2026.08.27.22.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 22:40: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 v7 1/3] wifi: rtw88: rtw8822c: Use bitfield macros for DAC IQ sampling Date: Fri, 28 Aug 2026 12:40:21 +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 Sat Sep 26 23:50:52 2026 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (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 A78F43AE713 for ; Fri, 28 Aug 2026 05:40:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787895638; cv=none; b=uDKi7jF077VCWhhT2tEbLCJJCdcJ9rHulVwx+uQt7Sk/Mpv8+pzPWy3TUObmHXl4niXNddFw6oM5jUkz+3DIroRABIMrpVC2JObkq0BTROSodRad0fnSal4vlu/2sKFmd8UGwzEwGYcfM1wEeNfHL3Lh+bXMbC0TTEPGtkgG10A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787895638; c=relaxed/simple; bh=WFXr7ZsgrCcpgJCvdkcA6+OvapKYowHM11dQQTeDjko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=golfXnPHZ453ss9jX8j1iVx14g+LywOLXlVg4I0QVxo+yEmw3qsL70jpVdNyHlBusBcpqbYPGs9Nrd6ps4Z09tD5w8dpvGC38Ie1PBtImaKwqA/Nj5LDFSLYPQgQ/XC61srIr8kfiVgJ32FbXou9ZF/HRVcbyReDPTd6y1B5uYI= 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=ItnT//fP; arc=none smtp.client-ip=209.85.167.43 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="ItnT//fP" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-5b523efb0bfso432742e87.3 for ; Thu, 27 Aug 2026 22:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787895633; x=1788500433; 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=Gz2/HZ3jIrnlU0ErxVb8NXWvR+9S7JqXinG7AEu3Ys0=; b=ItnT//fPcuJTho/NjVAFrDdZ1ZvcDR0op0ebZxxNPo3ZV69Z5UgVPeYT1GjsKRv/9c OoCwqyQyiuZqyVnvEH0janG9xBnxkhxFNrBHm0/u7LG12y3IPRVbrXjV7LJB58Ol/eiq wkuUHvChULXEhaBsNsMapdE4mnOC/sUurUQZP+wCDa6Z7FICrlLzpHRYUz8NW3LtVRe6 8YEwTAZKu28JzlCvsD/YBMsBYMELRlt82yzP6bvzBA4mXJUocll8rT2eSYU5CKPeFwJc yzyh+Woljrt9YSWkg4o0/jr90+mQnbNaCXE+El0wppOmCzj8lokKeVPb/glKCGH5CJ5q CDbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787895633; x=1788500433; 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=Gz2/HZ3jIrnlU0ErxVb8NXWvR+9S7JqXinG7AEu3Ys0=; b=Tqu7exPj9WrOFkYshWYC9DRT1oXVRtZ55sqsqKdBWndyPUDZE3gJ+8pjM0ZbPoqWro YSBgSIDdJPGqXB/6Bi1cgPudo7J85YXEmI/qx+0G2llBmF+Jo8anYU4sctdj24etFZOX o1qD+xCRECqJSZnqJVzGtIkFQMCAmAUViWZ6cdLSsk7odjYAlE1ChWdlofcoQG2ug7Fx ViCP0OWwtpM63XMVxu3VwZXb0dLVDyHukacfIyUwNKHZ4TDQSVPVQxNx9tlsroABjX58 IaSZ7zkPaN7XAyrCXBVH7BiTHqwsoro1zKNaNChOWKp9ljt1ItVlAtZv9XiBcQ/p3HNQ AN3w== X-Forwarded-Encrypted: i=1; AHgh+RpzpIJuKEFgZpIaTZodA8K8ynAOkrv0mVIkdKzDDnO7FCjM54Mz93uRAE5fCYIYh8F6+4G3Pex0k0G7Pb0=@vger.kernel.org X-Gm-Message-State: AFuF++kb+pLKEyAINygCNoh2SJVlpxZrY/Xq/Xlg0WGBgm7YVoF39S95 LRH4z1dgXkL4sFCFNxq7RZgOJnqr6S2aL/YfHtvwE9N3kQL0X2eoqTGA X-Gm-Gg: AR+sD12916egJtDPBWKOgfbPc0O8dGO2Z9bwD9wN2qjxvJ8bXRcLwe8uPO16ztryETW ouEbC9dJ96JYdwRr/8FXLmyIi0PIloKtnq05cSg3BuCGO8Cooa08j4GQAptm0esMFS/7KiAf/cC eyLOkvlyPtIqkF3FzNFC9tpx36Znd6F9pJEu5zti0hj8bCffDPEk9L++n9SaPZeL7dNdVKw15nt eQ3y/stLMx46yKilqWC64OSUXPV0lIETA9c58Kd8U2snqF3xcAMgtGql5xyeI5Vyn5AKro5NLoB jxhhlKWtKNXa0mjpdMGFflIpjmqOx91G9wvIwFQtUask98R8Ax5EWduc3EMPpMVGGwE+2kvvwfN 0PM6bOeqmBrJSC4pm1fOilbXZP272AsRkt4mv0SGVVwXxMgk/Zr/QxOsqnqM43i20gJnmOioZWS 76K4Oc9eU20fssjc2AWSTafotz6T1/+NkEiMKMHGbKW+p/q3Pwelq5gylVdqHwYknkRapfw/32G /mwLWzQaflIU8OHtZMKirmx3OQY9htwKqFyFAvB2xzOOg6Ug+TGyJTrIyD5Yw== X-Received: by 2002:a05:6512:10c5:b0:5b4:7d9d:16d7 with SMTP id 2adb3069b0e04-5b5e68bd188mr1077785e87.11.1787895632359; Thu, 27 Aug 2026 22:40:32 -0700 (PDT) Received: from archlinux ([94.180.48.0]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b5e8a1a8edsm166172e87.79.2026.08.27.22.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 22:40: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 v7 2/3] wifi: rtw88: rtw8822c: Convert DAC IQ calibration path to signed math Date: Fri, 28 Aug 2026 12:40:22 +0700 Message-ID: <86bde9882c56a1245a4c903b607e23d551dde1b9.1787895379.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" 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 --- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 140 ++++++------------ 1 file changed, 45 insertions(+), 95 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wi= reless/realtek/rtw88/rtw8822c.c index 137544649..b010e17c9 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,21 @@ 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 +227,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 +246,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 +256,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 23:50:52 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 875D13C4572 for ; Fri, 28 Aug 2026 05:40:35 +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=1787895641; cv=none; b=YcykDaaLCjz0KaRQc9jhmEjtmxsire/4H1veVscxKvu0J0upL4+pwhMeURuF3/fUQ/M4hNBdhNF0/JFcDx9u15FQFci1jJN4oi8fTxGS/ZohQKfSezZ3JJp087THv9u/v532CkK3ywCaB5rdVBPYL/EP+PRKDfAMt0e4MBYNMqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787895641; c=relaxed/simple; bh=CrsK0MwXr7Oe9+IYQCl8a58FC1Uiv/HYB/SAmXC3HSg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n8vyRUITgLF9RORnvA//7rsBd1QKuZnboTz2k1dxmLarO/KNcaxIcJxVvFpAaG8Nquz7waEEHRssEcfaTWACjY6yYgmcZc0Z5v1TA1OAxN7OOz9LRTbz1KQAHUI7pWvkLtXqLjdRxihYwWY1LpjTxXc1Eo9+809O6Y8eJPxYHWM= 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=g6svmCd4; 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="g6svmCd4" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5b4ab4b4179so727258e87.0 for ; Thu, 27 Aug 2026 22:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787895633; x=1788500433; 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=tQKVsIuuwigFUQGx9DU71mFvKHQtdN6YB39hyzuIzIM=; b=g6svmCd4WirSEJ4WLK0kMUUn8yXLs6DwPia/9ewY6Edre3WC8yfUhbosLFmTq6ZBX+ CxGN6sqbkS6W0J/+omTltH9lyzsyHFzZvedRkHJncEugL3ztbU+e82STLJVMe9W/AFWz dNGPiQrKOwJLeDJxZXp9ThmIbYBtJR7W+jcN6dwcr7NDGgK4np9fj88dxzLIb5P5sdo2 HmCKioqaHhPqgYrEKc58XDFUR+NZRInSnPFcA0A8EmKl1bdU2xKSTSh9gFkKC7mZa86P cqFJSC6ZxiGxm2QcqlR5j90Tss9KwwJxNZOBilro9704D4GcpnO2CxpRGXM71O1reP/e mvtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787895633; x=1788500433; 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=tQKVsIuuwigFUQGx9DU71mFvKHQtdN6YB39hyzuIzIM=; b=ltf3VL7Lf0XLcbv0wX1c/bKg3oaDkBn4Wvm+/TZ5HA7hVGgVjUUsAViq6u/Sog5bh9 MII3jZwM856OEJ/Ze+TCuQsz6x3HPxFxDpLDXYKDf1YP0TmOB1ssLO8ukqcIR5455LhT d/x92RuM1ci0q8oNBc0Wdn486blD/XUd8QgBNMMPED4f/iNP8bQznWcQ+peddTDutTSJ 35tPFn9RVJ9wsLLFavxYYL2xqGd0WlgeH5SE+MBjoMNpUPE1oMfTcdEu/K1Zi7+P837D dXpKXj4O8O/W+9O/00SDgiPW9vojTsVvkPMD0sK+/RZukM0eWk/B84/aT83gLAdpJULa TJ1w== X-Forwarded-Encrypted: i=1; AHgh+RopFOBTYdq0dKCfSGZaNQZ8Q2aT4QygG8gbWro5LRFHfSD8HjeCwy58kQPyytnpe7VLO+GWlW76art8LRw=@vger.kernel.org X-Gm-Message-State: AFuF++n2rDQxzog+d2HzBDY6O5hTH8IOYXJci8z9PugYstNK2zeCGlpG ELfPAw5m9L5MQFqqqI/qjEcr5d3hpOJ//23D15u1SaSJ3ENEK17tAp2c X-Gm-Gg: AR+sD110kiynNvs6pC1WL4aGMqOssxllTSj5UG7HOS3iDz5V8E7EQJqLHW8radLey8q RxvY3khUARDjqBb7tsJn7iWgFAgFd/aiRBq+TSgqJzeUP+xcxxTCdZ6qyYK+VmXbSBHSla4vkBx DLqaO2cC3buZuqFOPaHBKH8mHhH5COGNwvM2/RMUqPxDrRr4Yb++ahDiifPNYJX8EUsT8b1FYCn ldvo8sZ4zq4i//tk4eSn/kexxPElK+NF6wlEWEeKPqxBtCbiEa7z38DCekN/J9xEMoyjW1l9avK PZfgb4kpZXDY89fXm2xYLe2+HRsZ+hn9xCPYltXaqkN9yT3impIvEAdJgEqgGM5NqRGOdiB3aQN wQLBOhQHp+QSKXoGzhwkowbT3oVe/6NwEQVf/CtOgSrUW74udAN8IVIZaEBd3jOB02/WrsoyS8u nnv5FdRzNYSr80xrVGbcmy/6irr4BBcq7jcY0YyAP+Y04Q+mvQvUzvhRhuwx4bRCYPw3j7dnkNQ eQ0YyAoqOX5CbACCaAMt6hC1mqJMCD6AYFTkcq17OY8w0rWHgF0IvT+yk5d+w== X-Received: by 2002:a05:6512:6190:b0:5b4:5880:b50b with SMTP id 2adb3069b0e04-5b5e68af4camr1038303e87.4.1787895633169; Thu, 27 Aug 2026 22:40:33 -0700 (PDT) Received: from archlinux ([94.180.48.0]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b5e8a1a8edsm166172e87.79.2026.08.27.22.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 22:40: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 v7 3/3] wifi: rtw88: rtw8822c: Replace custom DAC IQ sorting with kernel sort Date: Fri, 28 Aug 2026 12:40:23 +0700 Message-ID: <7d0ab2352317b81df10dca7ddb3e855a303b8be7.1787895379.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" 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 b010e17c9..bec1bb376 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) { @@ -291,7 +282,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