From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.176 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794460327; b=deUzZK1lZpLVVqMMt+MUn7veWBYQ6AFlUUD4QpM4Or3/l0DmLM3CZMEOXjszfGV26z8K 8Q3z0qneNCIuN8+7gHaVOtk4Bu9xu+VFZODzjfOP/T94bZwohgbDUSEtx1C8cYIrN0CS3 s33CYA5RK3zzuRBWfXZnav+9xrlJmGdQ/mu2nfKzvEUC8hO7srMPrko3uJFYqXlckH+x0 nlOPdxGBVWAuYKh40MZTFstYtLzWLZhaP21FAWYdflQCmJHTpAruWgsGOFHJqDiFB0XrC uFNhLYOKrwMHV+3CrORcq3OsS5HFaKCdyW6AiUmx01LnDI5D3Bvi+ZRARd1niyeCe6A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794460327; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=S6s5EG8cJ/T3odvc7pqRCLvrVKTXrFbJQqMyd2LrHmA=; b=Xvt31sYY7/BzamMBJ5IOT02kZggFZ0qOgB075Z6jojMQR77/l2i+drrxmWlNXtcSzZ2O xxU6Tl5Z4fSxy1U0KB43NY1nKR1BjPoMEM74aCKWfuJE2S9/lOdv3cn4X/drnnCf/LR90 dglYCrzLt7s7i6Dv3kw+U6bVEDc8Ww9hOxoV1oYn2aM9Iq/mjQnvZu9VXgojrDKGoYdWV r6CqKjnjhFD0hhVYJKvb/b6nWzURsKjMXTMgRn3xmSPl0Zz/zHwE0EUb/PKu/0AubTnZB +NYynGzYeumucISbNT7xvc7oVRD7d8FGPvOpR7oEtniw28yTxxXYZHep6KQdTdwFmdw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=f7VsY7Pe; arc=none smtp.remote-ip=74.125.82.176 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80DE3606A896 for ; Thu, 12 Nov 2026 05:12:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 80DE3606A896 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.a=rsa-sha256 header.s=20260707 header.b=f7VsY7Pe Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-36fc0a3fe93so7660421eec.0 for ; Wed, 11 Nov 2026 21:12:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794460327; x=1795065127; 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=S6s5EG8cJ/T3odvc7pqRCLvrVKTXrFbJQqMyd2LrHmA=; b=f7VsY7Pelz/eXl3TcfKcjkAaCYErc2Xfl2NqSNMxAyO9DngYBpdpeDkhPhI/V9Ksbo w7bF8MJ/P1a9btuycvhzP3tw3xEXr2qZ6I/IiwA9uiOSsrYvZLIbSLrI260CUFBn3ngR 51b5Q38U+b5TbQtZWFjZlimjPrzvDJuDrNC4a2+kGz7CiGY7SAu6CMyXaVOwYwHZza0m C4gIQsUqDZZGdx3EjKDlHjyUkxSVdKvaf4ZxSznPkTCA9xDMQEImKlYJk30RmgBHA6CD 77SHbKLnWAZSS5LnvyRV1qtOiih+qq1r1oe55O6dguWnr7ontCJn8MLbIKNnf7haVMC1 H2Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794460327; x=1795065127; 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=S6s5EG8cJ/T3odvc7pqRCLvrVKTXrFbJQqMyd2LrHmA=; b=Q4uoGL0JBRR5OHMOHMSTQt9+ExGPqsN8sfKOGyXcORRmTfXmEnVp4jcqn7gqF70wwH 1xtkg6/t4hd1Y9DAqTA8T+vzIjfiisupUylx+GFtKPsOd+g3ApaW8+awC+g8gTCFsHXP NpU6Zaec/EFqUNrXXG6SUg28LhZGUycyJ8dysYFmGwisM2k5jbAl2ZNIFKdUEIo4kUOd S+qJHnCLjTIllgaeUHGVYIwEgjrTAiTY1SMJ7GaNlWc3P1j6AnBpwSmHR5UzAR3jXovU K9f82uMQ+7XmivYTwzb8P2NHot6TRTO0gtc1145MOLnZIuyH9otlL2OEdLuNDUtDTbju bb3w== X-Forwarded-Encrypted: i=1; AL+hErGPPZURpR0ge5slesWg7AgYEhOvCxEJ5+x/51XtDyPS3dDV3bYYGyZW+jI32huRpekUtaac/HobZg1vkzo=@vger.kernel.org X-Gm-Message-State: APuU4Z8Jo645D7yVJLwUUIaVib/bwHv5q6uPX/2eoRU1IWn4r9j+0wtA B8z0DrUg4hAiPZjuXSwRACOFXPN71tir1ogWeiIdNweKOYkqeHYvoqZQ X-Gm-Gg: AYBFou0py77mvevIzdcYsrat+DWNXITntqylO0VzcxoGZgaI36STxiYAAaLuw1DSbJN sbwez4jKFuhbczYj4TPoGnglnQ960VC5uklc3pbd+Zxy2T/kRDsvbiWvYNqNR7GQwVvBl3xKKLY m/RySjfslcPG6PCZj5gGmxYCNUdwyiL2cxGHjqi4Qc3zyVyOg/d1ychOoANN+rrRvGGDjSRm37B MIdl5znym8W+wyhnOqPYz/d9iOeSncgXSfdOk7YeIE1PD+ieTjzvAfj06pQllmrCbniNeEmxN2b eU7wH8uq18IN2Loq29EOdHr2zs79r3fOlH78QrDcYiora++AsSH6gVjdiWd3SXKG64NYr1+lCjh Qc6EvHVi/ETlTK8VXlCZJZHMVmGTtQiXZlZYy6Ui3r9AsVQhin1lBIxoXpqMG4a5nK0ko0y7V/b AFsJtfnQG7HGkKfk75PSB7y5MJZVDN43Ltz2NrMaIQA9V2ndmUM74eDcPKg8NU8Bxbm0BUsHOqs u9/gh+vtBExosEb8N6+VLivDrQdR4VFQ34cMNhyu4Lu/3laCwfU86I5Gcqg5k56ZQcM5sHusaM/ dM/hViAUuZJwH1KT+ODleA7cjKMcD0/3QklMdiY1X7R/OlBPzYolhebbkZz9kopRrm5fE2OJT2s s X-Received: by 2002:a05:693c:4081:b0:377:678:231b with SMTP id 5a478bee46e88-37706782701mr3839735eec.25.1794460326598; Wed, 11 Nov 2026 21:12:06 -0800 (PST) Received: from acemagic-m1.tail4fb79.ts.net ([2401:7400:c804:b668:37ea:9b2d:3d7a:8379]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-37520cfdfadsm26095228eec.19.2026.11.11.21.12.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2026 21:12:06 -0800 (PST) From: Ragul Balaji To: linux-wireless@vger.kernel.org Cc: hjf3108@gmail.com, Ragul Balaji , Arend van Spriel , brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] wifi: brcmsmac: look up OFDM rates in rate.c Date: Thu, 12 Nov 2026 13:11:30 +0800 Message-ID: <20261112051142.2797529-4-ragulbaby@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261112051142.2797529-1-ragulbaby@gmail.com> References: <20261112051142.2797529-1-ragulbaby@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the OFDM rate table next to its only user, ofdm_phy2mac_rate(), which leaves rate.c independent of the PHY code. No functional change. Signed-off-by: Ragul Balaji Signed-off-by: Ho Jie Feng --- .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 17 ----------------- .../broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 2 -- .../broadcom/brcm80211/brcmsmac/rate.c | 19 +++++++++++++++++++ .../broadcom/brcm80211/brcmsmac/rate.h | 7 ------- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c index 7eae73ef7e..d519e950ca 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c @@ -101,18 +101,6 @@ static const struct chan_info_basic chan_info_all[] = { {216, 5080} }; -static const u8 ofdm_rate_lookup[] = { - - BRCM_RATE_48M, - BRCM_RATE_24M, - BRCM_RATE_12M, - BRCM_RATE_6M, - BRCM_RATE_54M, - BRCM_RATE_36M, - BRCM_RATE_18M, - BRCM_RATE_9M -}; - #define PHY_WREG_LIMIT 24 void wlc_phyreg_enter(struct brcms_phy_pub *pih) @@ -2486,11 +2474,6 @@ u8 wlc_phy_stf_chain_active_get(struct brcms_phy_pub *pih) return active_bitmap; } -const u8 *wlc_phy_get_ofdm_rate_lookup(void) -{ - return ofdm_rate_lookup; -} - void wlc_phy_ldpc_override_set(struct brcms_phy_pub *ppi, bool ldpc) { return; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h index 7ffff7f519..c5aaaec434 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h @@ -234,8 +234,6 @@ void wlc_phy_ofdm_rateset_war(struct brcms_phy_pub *pih, bool war); void wlc_phy_bf_preempt_enable(struct brcms_phy_pub *pih, bool bf_preempt); void wlc_phy_machwcap_set(struct brcms_phy_pub *ppi, u32 machwcap); -const u8 *wlc_phy_get_ofdm_rate_lookup(void); - s8 wlc_phy_get_tx_power_offset_by_mcs(struct brcms_phy_pub *ppi, u8 mcs_offset); s8 wlc_phy_get_tx_power_offset(struct brcms_phy_pub *ppi, u8 tbl_offset); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c index 6841bc0052..ac577c8e85 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c @@ -266,6 +266,25 @@ const struct brcms_c_rateset cck_rates = { 0x00, 0x00, 0x00, 0x00, 0x00} }; +static const u8 ofdm_rate_lookup[] = { + + BRCM_RATE_48M, + BRCM_RATE_24M, + BRCM_RATE_12M, + BRCM_RATE_6M, + BRCM_RATE_54M, + BRCM_RATE_36M, + BRCM_RATE_18M, + BRCM_RATE_9M +}; + +/* Convert encoded rate value in plcp header to numerical rates in 500 KHz + * increments */ +static inline u8 ofdm_phy2mac_rate(u8 rlpt) +{ + return ofdm_rate_lookup[rlpt & 0x7]; +} + /* check if rateset is valid. * if check_brate is true, rateset without a basic rate is considered NOT valid. */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h index e178b1a0e2..7c1d43323a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h @@ -198,13 +198,6 @@ static inline u8 cck_rspec(u8 cck) return cck & RSPEC_RATE_MASK; } -/* Convert encoded rate value in plcp header to numerical rates in 500 KHz - * increments */ -static inline u8 ofdm_phy2mac_rate(u8 rlpt) -{ - return wlc_phy_get_ofdm_rate_lookup()[rlpt & 0x7]; -} - static inline u8 cck_phy2mac_rate(u8 signal) { return signal/5; -- 2.53.0