Skip to content

mt76x02: fix sign_extend() sign inversion #5

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

Merged
HiGarfield merged 5 commits into from
Mar 25, 2026
Merged

mt76x02: fix sign_extend() sign inversion #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd1526b
mt76x02: fix sign_extend() sign inversion logic
Copilot Mar 25, 2026
b2815bd
mt76x02: use ARRAY_SIZE() instead of sizeof() for rate power iteration
Copilot Mar 25, 2026
a56481d
mt76x02: fix watchdog reset retry count and coding style issues
Copilot Mar 25, 2026
b4b15bc
mt76x02: return -EINVAL instead of -1 in eeprom_copy()
Copilot Mar 25, 2026
1f3dcd4
mt7603: fix coding style in wtbl_set_smps()
Copilot Mar 25, 2026
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
5 changes: 2 additions & 3 deletions mt7603/mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,10 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta,
return;

num_retries = 3;
do
{
do {
mt76_rmw_field(dev, addr, MT_WTBL1_W2_SMPS, enabled);
successful = mt76_poll(dev, addr, MT_WTBL1_W2_SMPS,
enabled, 15000);
enabled, 15000);
} while (!successful && --num_retries);

if (successful)
Expand Down
2 changes: 1 addition & 1 deletion mt76x02_eeprom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ int mt76x02_eeprom_copy(struct mt76x02_dev *dev,
void *dest, int len)
{
if (field + len > dev->mt76.eeprom.size)
return -1;
return -EINVAL;

memcpy(dest, dev->mt76.eeprom.data + field, len);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion mt76x02_eeprom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ mt76x02_sign_extend(u32 val, unsigned int size)

val &= BIT(size - 1) - 1;

return sign ? val : -val;
return sign ? -val : val;
}

static inline int
Expand Down
7 changes: 4 additions & 3 deletions mt76x02_mmio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,9 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)
static bool dma_is_busy(struct mt76x02_dev *dev)
{
u32 dma_status = mt76_rr(dev, MT_WPDMA_GLO_CFG);
return dma_status & (MT_WPDMA_GLO_CFG_TX_DMA_EN |
MT_WPDMA_GLO_CFG_RX_DMA_EN);

return dma_status & (MT_WPDMA_GLO_CFG_TX_DMA_EN |
MT_WPDMA_GLO_CFG_RX_DMA_EN);
}

static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
Expand Down Expand Up @@ -519,7 +520,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)

if (restart) {
int retry = 5;
while (--retry != 0 && dma_is_busy(dev)) {
while (retry-- > 0 && dma_is_busy(dev)) {
usleep_range(5000, 10000);
}
mt76_mcu_restart(dev);
Expand Down
6 changes: 3 additions & 3 deletions mt76x02_phy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int mt76x02_get_max_rate_power(struct mt76x02_rate_power *r)
s8 ret = 0;
int i;

for (i = 0; i < sizeof(r->all); i++)
for (i = 0; i < ARRAY_SIZE(r->all); i++)
ret = max(ret, r->all[i]);

return ret;
Expand All @@ -75,7 +75,7 @@ void mt76x02_limit_rate_power(struct mt76x02_rate_power *r, int limit)
{
int i;

for (i = 0; i < sizeof(r->all); i++)
for (i = 0; i < ARRAY_SIZE(r->all); i++)
if (r->all[i] > limit)
r->all[i] = limit;
}
Expand All @@ -85,7 +85,7 @@ void mt76x02_add_rate_power_offset(struct mt76x02_rate_power *r, int offset)
{
int i;

for (i = 0; i < sizeof(r->all); i++)
for (i = 0; i < ARRAY_SIZE(r->all); i++)
r->all[i] += offset;
}
EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);
Expand Down
6 changes: 3 additions & 3 deletions mt76x02_txrx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,

nss = ieee80211_rate_get_vht_nss(rate);
idx = ((nss - 1) << 3) + mcs;
max_txpwr =dev->rate_power.ht[idx & 0xf];
max_txpwr = dev->rate_power.ht[idx & 0xf];
}
} else if (rate->flags & IEEE80211_TX_RC_MCS) {
max_txpwr =dev->rate_power.ht[rate->idx & 0xf];
max_txpwr = dev->rate_power.ht[rate->idx & 0xf];
} else {
enum nl80211_band band = dev->mphy.chandef.chan->band;

Expand All @@ -86,7 +86,7 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76x02_dev *dev,
else
max_txpwr = rp->ofdm[r->hw_value & 0x7];
} else {
max_txpwr =dev->rate_power.ofdm[rate->idx & 0x7];
max_txpwr = dev->rate_power.ofdm[rate->idx & 0x7];
}
}

Expand Down
Loading