From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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 | 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/wireless/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) while (i < DACK_SN_8822C && cnt < 10000) { cnt++; - temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[i] = (temp & 0x3ff000) >> 12; - qv[i] = temp & 0x3ff; + temp = rtw_read32(rtwdev, 0x2dbc); + iv[i] = FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[i] = FIELD_GET(RTW8822C_DAC_QV_MASK, temp); 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); if (i_delta > 5 || q_delta > 5) { - temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[0] = (temp & 0x3ff000) >> 12; - qv[0] = temp & 0x3ff; - temp = rtw_read32_mask(rtwdev, 0x2dbc, 0x3fffff); - iv[DACK_SN_8822C - 1] = (temp & 0x3ff000) >> 12; - qv[DACK_SN_8822C - 1] = temp & 0x3ff; + temp = rtw_read32(rtwdev, 0x2dbc); + iv[0] = FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[0] = FIELD_GET(RTW8822C_DAC_QV_MASK, temp); + temp = rtw_read32(rtwdev, 0x2dbc); + iv[DACK_SN_8822C - 1] = FIELD_GET(RTW8822C_DAC_IV_MASK, temp); + qv[DACK_SN_8822C - 1] = FIELD_GET(RTW8822C_DAC_QV_MASK, temp); } else { break; } diff --git a/drivers/net/wireless/realtek/rtw88/rtw8822c.h b/drivers/net/wireless/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 = { \ #define DACK_RF_8822C 1 #define DACK_SN_8822C 100 +#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)) -- 2.55.0