Message ID | 14b7b24fbe0029cac43d2c0c9e471b118419ad8e.1696039301.git.deren.wu@mediatek.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Felix Fietkau |
Headers | show |
Series | wifi: mt76: mt7921: support per-device regulatory settings | expand |
Il 30/09/23 04:25, Deren Wu ha scritto: > From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> > > The 5.9/6GHz channel license of a certain platform device has been > regulated in various countries. That may be difference with standard > Liunx regulatory domain settings. In this case, when .reg_notifier() > called for regulatory change, mt792x chipset should update the channel > usage based on clc or dts configurations. > > Channel would be disabled by following cases. > * clc report the particular UNII-x is disabled. > * dts enabled and the channel is not configured. > > Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> > Co-developed-by: Deren Wu <deren.wu@mediatek.com> > Signed-off-by: Deren Wu <deren.wu@mediatek.com> Hello, this patch is giving a kernel panic on the MT8195 Acer Tomato Chromebook. Please refer to this stacktrace: <1>[ 19.442078] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000014 <1>[ 19.457535] Mem abort info: <1>[ 19.465329] ESR = 0x0000000096000004 <1>[ 19.473295] EC = 0x25: DABT (current EL), IL = 32 bits <1>[ 19.482354] SET = 0, FnV = 0 <1>[ 19.489143] EA = 0, S1PTW = 0 <1>[ 19.495991] FSC = 0x04: level 0 translation fault <1>[ 19.504554] Data abort info: <1>[ 19.511111] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 <1>[ 19.520269] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 <1>[ 19.528988] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 <1>[ 19.537960] user pgtable: 4k pages, 48-bit VAs, pgdp=00000001027a9000 <1>[ 19.548014] [0000000000000014] pgd=0000000000000000, p4d=0000000000000000 <0>[ 19.558429] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP <4>[ 19.568270] Modules linked in: mt7921e mt7921_common mt792x_lib mt76_connac_lib mt76 mac80211 btusb btintel cfg80211 btmtk snd_sof_ipc_msg_injector btrtl snd_sof_ipc_flood_test btbcm bluetooth snd_sof_mt8195 uvcvideo mtk_adsp_common snd_sof_xtensa_dsp uvc snd_sof_of snd_sof videobuf2_vmalloc ecdh_generic ecc snd_sof_utils cros_ec_lid_angle cros_ec_sensors crct10dif_ce cros_ec_sensors_core cros_usbpd_logger crypto_user fuse ip_tables ipv6 <4>[ 19.614237] CPU: 1 PID: 105 Comm: kworker/1:1 Not tainted 6.6.0-rc6-next-20231017+ #324 <4>[ 19.625957] Hardware name: Acer Tomato (rev2) board (DT) <4>[ 19.634970] Workqueue: events mt7921_init_work [mt7921_common] <4>[ 19.644522] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) <4>[ 19.655182] pc : mt7921_regd_notifier+0x180/0x290 [mt7921_common] <4>[ 19.664983] lr : mt7921_regd_notifier+0xd4/0x290 [mt7921_common] <4>[ 19.674679] sp : ffff800080acba80 <4>[ 19.681649] x29: ffff800080acba80 x28: 0000000000000000 x27: ffff4faf16032148 <4>[ 19.692483] x26: 0000000000000000 x25: 0000000000000000 x24: ffff4faf1603afa0 <4>[ 19.703294] x23: 00000000ffffe926 x22: ffff4faf16031fa0 x21: 0000000000000023 <4>[ 19.714108] x20: 000000000000001c x19: ffff4faf16ba6f40 x18: 00000000ff1d6000 <4>[ 19.724928] x17: 0000000000000000 x16: ffffac6b891c2750 x15: ffff800081051000 <4>[ 19.735722] x14: 0000000000000180 x13: 0000000000000000 x12: 0000000000000002 <4>[ 19.746478] x11: 0000000000000002 x10: ffff4faf01c21780 x9 : ffffac6b891c282c <4>[ 19.757214] x8 : 00000000006c0000 x7 : ffffac6b6b020cf0 x6 : ffffac6b6b020ce8 <4>[ 19.767945] x5 : ffffac6b6b020d00 x4 : ffffac6b6b020cf8 x3 : ffff4faf16035fa0 <4>[ 19.778648] x2 : 0000000000000000 x1 : 000000000000001c x0 : 0000000000000031 <4>[ 19.789366] Call trace: <4>[ 19.795381] mt7921_regd_notifier+0x180/0x290 [mt7921_common] <4>[ 19.804675] wiphy_update_regulatory+0x2bc/0xa08 [cfg80211] <4>[ 19.813864] wiphy_regulatory_register+0x4c/0x88 [cfg80211] <4>[ 19.823029] wiphy_register+0x75c/0x8d0 [cfg80211] <4>[ 19.831446] ieee80211_register_hw+0x70c/0xc10 [mac80211] <4>[ 19.840479] mt76_register_device+0x168/0x2e8 [mt76] <4>[ 19.849008] mt7921_init_work+0xdc/0x250 [mt7921_common] <4>[ 19.857817] process_one_work+0x148/0x3c0 <4>[ 19.865292] worker_thread+0x32c/0x450 <4>[ 19.872489] kthread+0x11c/0x128 <4>[ 19.879173] ret_from_fork+0x10/0x20 <0>[ 19.886153] Code: f0000041 9100a021 94000aef aa0003f9 (b9401780) <4>[ 19.895634] ---[ end trace 0000000000000000 ]--- Regards, Angelo
Hi Angelo, On Tue, 2023-10-17 at 12:32 +0200, AngeloGioacchino Del Regno wrote: > Il 30/09/23 04:25, Deren Wu ha scritto: > > From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> > > > > The 5.9/6GHz channel license of a certain platform device has been > > regulated in various countries. That may be difference with > > standard > > Liunx regulatory domain settings. In this case, when > > .reg_notifier() > > called for regulatory change, mt792x chipset should update the > > channel > > usage based on clc or dts configurations. > > > > Channel would be disabled by following cases. > > * clc report the particular UNII-x is disabled. > > * dts enabled and the channel is not configured. > > > > Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com> > > Co-developed-by: Deren Wu <deren.wu@mediatek.com> > > Signed-off-by: Deren Wu <deren.wu@mediatek.com> > > Hello, > this patch is giving a kernel panic on the MT8195 Acer Tomato > Chromebook. > Thanks for the report. We provide a patch for this case and complete the test with mt7921/mt7922. Could you please help to check the new patch? https://lore.kernel.org/all/b3c45980a230f17af186d4004107ed27ee952cc9.1697547461.git.deren.wu@mediatek.com/ Thanks, Deren > > Please refer to this stacktrace: > > <1>[ 19.442078] Unable to handle kernel NULL pointer dereference at > virtual > address 0000000000000014 > <1>[ 19.457535] Mem abort info: > <1>[ 19.465329] ESR = 0x0000000096000004 > <1>[ 19.473295] EC = 0x25: DABT (current EL), IL = 32 bits > <1>[ 19.482354] SET = 0, FnV = 0 > <1>[ 19.489143] EA = 0, S1PTW = 0 > <1>[ 19.495991] FSC = 0x04: level 0 translation fault > <1>[ 19.504554] Data abort info: > <1>[ 19.511111] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 > <1>[ 19.520269] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 > <1>[ 19.528988] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 > <1>[ 19.537960] user pgtable: 4k pages, 48-bit VAs, > pgdp=00000001027a9000 > <1>[ 19.548014] [0000000000000014] pgd=0000000000000000, > p4d=0000000000000000 > <0>[ 19.558429] Internal error: Oops: 0000000096000004 [#1] PREEMPT > SMP > <4>[ 19.568270] Modules linked in: mt7921e mt7921_common > mt792x_lib > mt76_connac_lib mt76 mac80211 btusb btintel cfg80211 btmtk > snd_sof_ipc_msg_injector > btrtl snd_sof_ipc_flood_test btbcm bluetooth snd_sof_mt8195 uvcvideo > mtk_adsp_common snd_sof_xtensa_dsp uvc snd_sof_of snd_sof > videobuf2_vmalloc > ecdh_generic ecc snd_sof_utils cros_ec_lid_angle cros_ec_sensors > crct10dif_ce > cros_ec_sensors_core cros_usbpd_logger crypto_user fuse ip_tables > ipv6 > <4>[ 19.614237] CPU: 1 PID: 105 Comm: kworker/1:1 Not tainted > 6.6.0-rc6-next-20231017+ #324 > <4>[ 19.625957] Hardware name: Acer Tomato (rev2) board (DT) > <4>[ 19.634970] Workqueue: events mt7921_init_work [mt7921_common] > <4>[ 19.644522] pstate: 60400009 (nZCv daif +PAN -UAO -TCO -DIT > -SSBS BTYPE=--) > <4>[ 19.655182] pc : mt7921_regd_notifier+0x180/0x290 > [mt7921_common] > <4>[ 19.664983] lr : mt7921_regd_notifier+0xd4/0x290 > [mt7921_common] > <4>[ 19.674679] sp : ffff800080acba80 > <4>[ 19.681649] x29: ffff800080acba80 x28: 0000000000000000 x27: > ffff4faf16032148 > <4>[ 19.692483] x26: 0000000000000000 x25: 0000000000000000 x24: > ffff4faf1603afa0 > <4>[ 19.703294] x23: 00000000ffffe926 x22: ffff4faf16031fa0 x21: > 0000000000000023 > <4>[ 19.714108] x20: 000000000000001c x19: ffff4faf16ba6f40 x18: > 00000000ff1d6000 > <4>[ 19.724928] x17: 0000000000000000 x16: ffffac6b891c2750 x15: > ffff800081051000 > <4>[ 19.735722] x14: 0000000000000180 x13: 0000000000000000 x12: > 0000000000000002 > <4>[ 19.746478] x11: 0000000000000002 x10: ffff4faf01c21780 x9 : > ffffac6b891c282c > <4>[ 19.757214] x8 : 00000000006c0000 x7 : ffffac6b6b020cf0 x6 : > ffffac6b6b020ce8 > <4>[ 19.767945] x5 : ffffac6b6b020d00 x4 : ffffac6b6b020cf8 x3 : > ffff4faf16035fa0 > <4>[ 19.778648] x2 : 0000000000000000 x1 : 000000000000001c x0 : > 0000000000000031 > <4>[ 19.789366] Call trace: > <4>[ 19.795381] mt7921_regd_notifier+0x180/0x290 [mt7921_common] > <4>[ 19.804675] wiphy_update_regulatory+0x2bc/0xa08 [cfg80211] > <4>[ 19.813864] wiphy_regulatory_register+0x4c/0x88 [cfg80211] > <4>[ 19.823029] wiphy_register+0x75c/0x8d0 [cfg80211] > <4>[ 19.831446] ieee80211_register_hw+0x70c/0xc10 [mac80211] > <4>[ 19.840479] mt76_register_device+0x168/0x2e8 [mt76] > <4>[ 19.849008] mt7921_init_work+0xdc/0x250 [mt7921_common] > <4>[ 19.857817] process_one_work+0x148/0x3c0 > <4>[ 19.865292] worker_thread+0x32c/0x450 > <4>[ 19.872489] kthread+0x11c/0x128 > <4>[ 19.879173] ret_from_fork+0x10/0x20 > <0>[ 19.886153] Code: f0000041 9100a021 94000aef aa0003f9 > (b9401780) > <4>[ 19.895634] ---[ end trace 0000000000000000 ]--- > > Regards, > Angelo >
diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c index 36564930aef1..7725dd6763ef 100644 --- a/drivers/net/wireless/mediatek/mt76/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c @@ -188,7 +188,7 @@ static bool mt76_string_prop_find(struct property *prop, const char *str) return false; } -static struct device_node * +struct device_node * mt76_find_power_limits_node(struct mt76_dev *dev) { struct device_node *np = dev->dev->of_node; @@ -227,6 +227,7 @@ mt76_find_power_limits_node(struct mt76_dev *dev) of_node_put(np); return fallback; } +EXPORT_SYMBOL_GPL(mt76_find_power_limits_node); static const __be32 * mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min) @@ -241,7 +242,7 @@ mt76_get_of_array(struct device_node *np, char *name, size_t *len, int min) return prop->value; } -static struct device_node * +struct device_node * mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan) { struct device_node *cur; @@ -265,6 +266,8 @@ mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan) return NULL; } +EXPORT_SYMBOL_GPL(mt76_find_channel_node); + static s8 mt76_get_txs_delta(struct device_node *np, u8 nss) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index fede40cf86b7..3730c5e7d702 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -1537,6 +1537,11 @@ mt76_mcu_skb_send_msg(struct mt76_dev *dev, struct sk_buff *skb, int cmd, void mt76_set_irq_mask(struct mt76_dev *dev, u32 addr, u32 clear, u32 set); +struct device_node * +mt76_find_power_limits_node(struct mt76_dev *dev); +struct device_node * +mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan); + s8 mt76_get_rate_power_limits(struct mt76_phy *phy, struct ieee80211_channel *chan, struct mt76_power_limits *dest, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c index 534c7bee5ef1..55baac70860b 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c @@ -58,6 +58,55 @@ static int mt7921_thermal_init(struct mt792x_phy *phy) return PTR_ERR_OR_ZERO(hwmon); } +static void +mt7921_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev) +{ +#define IS_UNII_INVALID(idx, sfreq, efreq) \ + (!(dev->phy.clc_chan_conf & BIT(idx)) && (cfreq) >= (sfreq) && (cfreq) <= (efreq)) + struct ieee80211_supported_band *sband; + struct mt76_dev *mdev = &dev->mt76; + struct device_node *np, *band_np; + struct ieee80211_channel *ch; + int i, cfreq; + + np = mt76_find_power_limits_node(mdev); + + sband = wiphy->bands[NL80211_BAND_5GHZ]; + band_np = np ? of_get_child_by_name(np, "txpower-5g") : NULL; + for (i = 0; i < sband->n_channels; i++) { + ch = &sband->channels[i]; + cfreq = ch->center_freq; + + if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) { + ch->flags |= IEEE80211_CHAN_DISABLED; + continue; + } + + /* UNII-4 */ + if (IS_UNII_INVALID(0, 5850, 5925)) + ch->flags |= IEEE80211_CHAN_DISABLED; + } + + sband = wiphy->bands[NL80211_BAND_6GHZ]; + band_np = np ? of_get_child_by_name(np, "txpower-6g") : NULL; + for (i = 0; i < sband->n_channels; i++) { + ch = &sband->channels[i]; + cfreq = ch->center_freq; + + if (np && (!band_np || !mt76_find_channel_node(band_np, ch))) { + ch->flags |= IEEE80211_CHAN_DISABLED; + continue; + } + + /* UNII-5/6/7/8 */ + if (IS_UNII_INVALID(1, 5925, 6425) || + IS_UNII_INVALID(2, 6425, 6525) || + IS_UNII_INVALID(3, 6525, 6875) || + IS_UNII_INVALID(4, 6875, 7125)) + ch->flags |= IEEE80211_CHAN_DISABLED; + } +} + static void mt7921_regd_notifier(struct wiphy *wiphy, struct regulatory_request *request) @@ -74,6 +123,8 @@ mt7921_regd_notifier(struct wiphy *wiphy, mt76_connac_mcu_set_channel_domain(hw->priv); mt7921_set_tx_sar_pwr(hw, NULL); mt792x_mutex_release(dev); + + mt7921_regd_channel_update(wiphy, dev); } int mt7921_mac_init(struct mt792x_dev *dev) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index 4f66e27aa43a..63f3d4a5c9aa 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1247,6 +1247,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2, u8 idx) { #define CLC_CAP_EVT_EN BIT(0) +#define CLC_CAP_DTS_EN BIT(1) struct sk_buff *skb, *ret_skb = NULL; struct { u8 ver; @@ -1274,6 +1275,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2, if (dev->phy.chip_cap & MT792x_CHIP_CAP_CLC_EVT_EN) req.cap |= CLC_CAP_EVT_EN; + if (mt76_find_power_limits_node(&dev->mt76)) + req.cap |= CLC_CAP_DTS_EN; pos = clc->data; for (i = 0; i < clc->nr_country; i++) {