Skip to content

jaguar3: honour rx.keep_corrupted in the monitor RCR (ACRC32|AICV) #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gilankpam wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −5
Open

jaguar3: honour rx.keep_corrupted in the monitor RCR (ACRC32|AICV) #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/DeviceConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ struct DeviceConfig {
struct Rx {
/* env: DEVOURER_RX_KEEP_CORRUPTED — pass frames that fail the 802.11 FCS
* (CRC32) or decryption-ICV check up to the host instead of dropping them
* at the WMAC filter (sets RCR ACRC32|AICV). Jaguar1 + Jaguar2. */
* at the WMAC filter (sets RCR ACRC32|AICV). Jaguar1, Jaguar2, Jaguar3 and
* the RTL8733B; not ported on Kestrel, where it is silently inert. */
bool keep_corrupted = false;
/* env: DEVOURER_TX_WITH_RX — Jaguar3 only: keep the RX filters open and
* enable the RX path during a TX (InitWrite) bring-up so StartRxLoop can
Expand Down
22 changes: 18 additions & 4 deletions src/jaguar3/HalJaguar3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,13 @@ void HalJaguar3::rtw_hal_deinit() {
}

/* Monitor-mode RX configuration (devourer-specific; the vendor driver has no
* pure-monitor path). Accept all frames incl. CRC/ICV errors, append PHY status
* drvinfo (so parse_rx_8822c's drvinfo_size is consistent), all RX filter maps
* open. RCR bits: AAP/APM/AM/AB/ACF/AICV/ACRC32 + APP_PHYSTS. */
* pure-monitor path). Accept all frames, append PHY status drvinfo (so
* parse_rx_8822c's drvinfo_size is consistent), all RX filter maps open.
* RCR base 0xF410400F = AAP/APM/AM/AB + HTC_LOC_CTRL + PKTCTL_DLEN + VHT_DACK
* + APP_FCS/APP_MIC/APP_ICV/APP_PHYSTS (halmac_bit_8822c.h). ACRC32 (BIT8)
* and AICV (BIT9) are NOT in the base — the WMAC drops FCS/ICV-failed frames
* — and are added only under rx.keep_corrupted, same as Jaguar1/2 and the
* RTL8733B. */
void HalJaguar3::monitor_rx_cfg() {
constexpr uint16_t REG_RCR_8822C = 0x0608;
constexpr uint16_t REG_RXFLTMAP0_8822C = 0x06A0;
Expand All @@ -481,7 +485,17 @@ void HalJaguar3::monitor_rx_cfg() {
* control frames and VHT beamforming reports, which is why the beamformee
* (whose arm programs the self-MAC to the NDPA RA) saw sounding frames while
* a plain monitor did not. */
_device.rtw_write32(REG_RCR_8822C, 0xF410400F | (1u << 28));
uint32_t rcr = 0xF410400F | (1u << 28);

@josephnef josephnef Sep 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

| (1u << 28) is redundant — bit 28 is already in the leading 0xF nibble of 0xF410400F, which is exactly what the new comment above now spells out (... + APP_FCS/APP_MIC/APP_ICV/APP_PHYSTS). Pre-existing, but now that the base is decoded in the comment the separate OR reads as if APP_PHYSTS were being added on top. Drop one or the other.

/* DEVOURER_RX_KEEP_CORRUPTED: also pass FCS/ICV-failed frames (ACRC32 BIT8,
* AICV BIT9). The vendor 8822E driver clears both in init_misc and on every
* opmode change except monitor; the RX descriptor's crc_err/icv_err bits
* (parse_rx_8822c) mark the frames so a FEC consumer can salvage them.
* Verified on one 8812EU unit: with the bits set, FCS-failed frames reach
* the host; without them the count is zero regardless of channel
* conditions. */
if (_cfg.rx.keep_corrupted)
rcr |= (1u << 8) | (1u << 9);
_device.rtw_write32(REG_RCR_8822C, rcr);
_device.rtw_write8(REG_RX_DRVINFO_SZ_8822C, 0x04);
_device.rtw_write16(REG_RXFLTMAP0_8822C, 0xFFFF);
_device.rtw_write16(REG_RXFLTMAP1_8822C, 0xFFFF);
Expand Down