From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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 | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.c b/drivers/net/wireless/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 @@ */ #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, } } -static void __rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *v1, s32 *v2) +static int rtw8822c_dac_iq_cmp_s32(const void *a, const void *b) { - if (*v1 > *v2) - swap(*v1, *v2); + s32 val_a = *(const s32 *)a; + s32 val_b = *(const s32 *)b; + return (val_a > val_b) - (val_a < val_b); } -static void rtw8822c_dac_iq_sort(struct rtw_dev *rtwdev, s32 *iv, s32 *qv) -{ - u32 i, j; - - for (i = 0; i < DACK_SN_8822C - 1; i++) { - for (j = 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]); - } - } -} 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=%d, max=%d, delta=%d", q_min, q_max, q_delta); - 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); if (i_delta > 5 || q_delta > 5) { temp = rtw_read32(rtwdev, 0x2dbc); -- 2.55.0