wifi: rtw89: add crystal_cap check to avoid setting as overflow value
Subsystems (16)
Sasha Levin
maintainerPATCH 1/29 wifi: rtw89: add crystal_cap check to avoid setting as overflow value
From: Chih-Kang Chang <[email protected]>
[ Upstream commit 7b98caea39676561f22db58752551161bb36462b ]
In the original flow, the crystal_cap might be calculated as a negative value and set as an overflow value. Therefore, we added a check to limit the calculated crystal_cap value. Additionally, we shrank the crystal_cap adjustment according to specific CFO.
--- drivers/net/wireless/realtek/rtw89/phy.c | 11 ++++++----- drivers/net/wireless/realtek/rtw89/phy.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/phy.c +6 -5
@@ -3892,7 +3892,6 @@ static void rtw89_phy_cfo_set_crystal_cap(struct rtw89_dev *rtwdev,if (!force && cfo->crystal_cap == crystal_cap)return ; - crystal_cap =clamp_t (u8, crystal_cap,0 ,127 );if (chip->chip_id ==RTL8852A || chip->chip_id ==RTL8851B ) {rtw89_phy_cfo_set_xcap_reg (rtwdev, true, crystal_cap);rtw89_phy_cfo_set_xcap_reg (rtwdev, false, crystal_cap);
@@ -4015,7 +4014,7 @@ static void rtw89_phy_cfo_crystal_cap_adjust(struct rtw89_dev *rtwdev, s32 curr_cfo) {struct rtw89_cfo_tracking_info *cfo = &rtwdev->cfo_tracking; -s8 crystal_cap = cfo->crystal_cap; +int crystal_cap = cfo->crystal_cap;s32 cfo_abs =abs (curr_cfo);int sign;
@@ -4036,15 +4035,17 @@ static void rtw89_phy_cfo_crystal_cap_adjust(struct rtw89_dev *rtwdev, } sign = curr_cfo >0 ?1 :-1 ;if (cfo_abs >CFO_TRK_STOP_TH_4 ) - crystal_cap +=7 * sign; + crystal_cap +=3 * sign;else if (cfo_abs >CFO_TRK_STOP_TH_3 ) - crystal_cap +=5 * sign; -else if (cfo_abs >CFO_TRK_STOP_TH_2 ) crystal_cap +=3 * sign; +else if (cfo_abs >CFO_TRK_STOP_TH_2 ) + crystal_cap +=1 * sign;else if (cfo_abs >CFO_TRK_STOP_TH_1 ) crystal_cap +=1 * sign;else return ; + + crystal_cap =clamp (crystal_cap,0 ,127 );rtw89_phy_cfo_set_crystal_cap (rtwdev, (u8 )crystal_cap, false); rtw89_debug(rtwdev, RTW89_DBG_CFO, "X_cap{Curr,Default}={0x%x,0x%x}\n",
drivers/net/wireless/realtek/rtw89/phy.h +1 -1
@@ -57,7 +57,7 @@#define CFO_TRK_STOP_TH_4 (30 << 2)#define CFO_TRK_STOP_TH_3 (20 << 2)#define CFO_TRK_STOP_TH_2 (10 << 2) -#define CFO_TRK_STOP_TH_1 (00 << 2) +#define CFO_TRK_STOP_TH_1 (03 << 2)#define CFO_TRK_STOP_TH (2 << 2)#define CFO_SW_COMP_FINE_TUNE (2 << 2)#define CFO_PERIOD_CNT 15
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/29 tun: fix group permission check
From: Stas Sergeev <[email protected]>
[ Upstream commit 3ca459eaba1bf96a8c7878de84fa8872259a01e3 ]
Currently tun checks the group permission even if the user have matched. Besides going against the usual permission semantic, this has a very interesting implication: if the tun group is not among the supplementary groups of the tun user, then effectively no one can access the tun device. CAP_SYS_ADMIN still can, but its the same as not setting the tun ownership.
This patch relaxes the group checking so that either the user match or the group match is enough. This avoids the situation when no one can access the device even though the ownership is properly set.
Also I simplified the logic by removing the redundant inversions:tun_not_capable() --> !tun_capable()
--- drivers/net/tun.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/net/tun.c +9 -5
@@ -574,14 +574,18 @@ static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,return ret; } -static inline bool tun_not_capable (struct tun_struct *tun) +static inline bool tun_capable (struct tun_struct *tun) {const struct cred *cred =current_cred ();struct net *net =dev_net (tun->dev); -return ((uid_valid (tun->owner) && !uid_eq (cred->euid, tun->owner)) || - (gid_valid (tun->group) && !in_egroup_p (tun->group))) && - !ns_capable (net->user_ns,CAP_NET_ADMIN ); +if (ns_capable (net->user_ns,CAP_NET_ADMIN )) +return 1 ; +if (uid_valid (tun->owner) &&uid_eq (cred->euid, tun->owner)) +return 1 ; +if (gid_valid (tun->group) &&in_egroup_p (tun->group)) +return 1 ; +return 0 ; }static void tun_set_real_num_queues (struct tun_struct *tun)
@@ -2778,7 +2782,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) !!(tun->flags & IFF_MULTI_QUEUE))return -EINVAL ; -if (tun_not_capable (tun)) +if (!tun_capable (tun))return -EPERM ; err =security_tun_dev_open (tun->security);if (err <0 )
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 3/29 mmc: core: Respect quirk_max_rate for non-UHS SDIO card
In reply to Sasha LevinFrom: Shawn Lin <[email protected]>
[ Upstream commit a2a44f8da29352f76c99c6904ee652911b8dc7dd ]
The card-quirk was added to limit the clock-rate for a card with UHS-mode support, although let's respect the quirk for non-UHS mode too, to make the behaviour consistent.
Message-ID: <[email protected]>
--- drivers/mmc/core/sdio.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/mmc/core/sdio.c +2 -0
@@ -458,6 +458,8 @@ static unsigned mmc_sdio_get_max_clock(struct mmc_card *card)if (mmc_card_sd_combo (card)) max_dtr =min (max_dtr,mmc_sd_get_max_clock (card)); + max_dtr =min_not_zero (max_dtr, card->quirk_max_rate); +return max_dtr; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 4/29 mmc: sdhci-esdhc-imx: enable 'SDHCI_QUIRK_NO_LED' quirk for S32G
In reply to Sasha LevinFrom: Ciprian Marian Costea <[email protected]>
[ Upstream commit 0202dfbdc5dea70e213205aa42ab49a1a08aad3a ]
Enable SDHCI_QUIRK_NO_LED quirk for S32G2/S32G3 variants as the controller does not have a LED signal line.
Message-ID: <[email protected]>
--- drivers/mmc/host/sdhci-esdhc-imx.c | 1 + 1 file changed, 1 insertion(+)
drivers/mmc/host/sdhci-esdhc-imx.c +1 -0
@@ -303,6 +303,7 @@ static struct esdhc_soc_data usdhc_s32g2_data = { | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200 | ESDHC_FLAG_HS400 | ESDHC_FLAG_HS400_ES | ESDHC_FLAG_SKIP_ERR004536 | ESDHC_FLAG_SKIP_CD_WAKE, + .quirks = SDHCI_QUIRK_NO_LED, };static struct esdhc_soc_data usdhc_imx7ulp_data = {
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 5/29 Revert "HID: multitouch: Add support for lenovo Y9000P Touchpad"
In reply to Sasha LevinFrom: Jiri Kosina <[email protected]>
[ Upstream commit 3d88ba86ba6f35a0467f25a88c38aa5639190d04 ]
This reverts commit 251efae73bd46b097deec4f9986d926813aed744.
Quoting Wang Yuli:
"The 27C6:01E0 touchpad doesn't require the workaround and applying it would actually break functionality.
The initial report came from a BBS forum, but we suspect the information provided by the forum user may be incorrect which could happen sometimes. [1]
Further investigation showed that the Lenovo Y9000P 2024 doesn't even use a Goodix touchpad. [2]
For the broader issue of 27c6:01e0 being unusable on some devices, it just need to address it with a libinput quirk.
In conclusion, we should revert this commit, which is the best solution."
--- drivers/hid/hid-ids.h | 1 - drivers/hid/hid-multitouch.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/hid/hid-ids.h +0 -1
@@ -506,7 +506,6 @@#define USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PIT_E100 0xe100#define I2C_VENDOR_ID_GOODIX 0x27c6 -#define I2C_DEVICE_ID_GOODIX_01E0 0x01e0#define I2C_DEVICE_ID_GOODIX_01E8 0x01e8#define I2C_DEVICE_ID_GOODIX_01E9 0x01e9#define I2C_DEVICE_ID_GOODIX_01F0 0x01f0
drivers/hid/hid-multitouch.c +2 -6
@@ -1452,8 +1452,7 @@ static const __u8 *mt_report_fixup(struct hid_device *hdev, __u8 *rdesc, {if (hdev->vendor ==I2C_VENDOR_ID_GOODIX && (hdev->product ==I2C_DEVICE_ID_GOODIX_01E8 || - hdev->product ==I2C_DEVICE_ID_GOODIX_01E9 || - hdev->product ==I2C_DEVICE_ID_GOODIX_01E0 )) { + hdev->product ==I2C_DEVICE_ID_GOODIX_01E9 )) {if (rdesc[607 ] ==0x15 ) { rdesc[607 ] =0x25 ; dev_info(
@@ -2079,10 +2078,7 @@ static const struct hid_device_id mt_devices[] = { I2C_DEVICE_ID_GOODIX_01E8) }, { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU,HID_DEVICE (BUS_I2C ,HID_GROUP_ANY ,I2C_VENDOR_ID_GOODIX , - I2C_DEVICE_ID_GOODIX_01E9) }, - { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT_NSMU, -HID_DEVICE (BUS_I2C ,HID_GROUP_ANY ,I2C_VENDOR_ID_GOODIX , - I2C_DEVICE_ID_GOODIX_01E0) }, + I2C_DEVICE_ID_GOODIX_01E8) }, /* GoodTouch panels */ { .driver_data = MT_CLS_NSMU,
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 6/29 wifi: brcmsmac: add gain range check to wlc_phy_iqcal_gainparams_nphy()
In reply to Sasha LevinFrom: Dmitry Antipov <[email protected]>
[ Upstream commit 3f4a0948c3524ae50f166dbc6572a3296b014e62 ]
In 'wlc_phy_iqcal_gainparams_nphy()', add gain range check to WARN() instead of possible out-of-bounds 'tbl_iqcal_gainparams_nphy' access. Compile tested only.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c +3 -0
@@ -23423,6 +23423,9 @@ wlc_phy_iqcal_gainparams_nphy(struct brcms_phy *pi, u16 core_no,break ; } +if (WARN_ON (k ==NPHY_IQCAL_NUMGAINS )) +return ; + params->txgm = tbl_iqcal_gainparams_nphy[band_idx][k][1 ]; params->pga = tbl_iqcal_gainparams_nphy[band_idx][k][2 ]; params->pad = tbl_iqcal_gainparams_nphy[band_idx][k][3 ];
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 7/29 tomoyo: don't emit warning in tomoyo_write_control()
In reply to Sasha LevinFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 3df7546fc03b8f004eee0b9e3256369f7d096685 ]
syzbot is reporting too large allocation warning at tomoyo_write_control(), for one can write a very very long line without new line character. To fix this warning, I use __GFP_NOWARN rather than checking for KMALLOC_MAX_SIZE, for practically a valid line should be always shorter than 32KB where the "too small to fail" memory-allocation rule applies.
One might try to write a valid line that is longer than 32KB, but such request will likely fail with -ENOMEM. Therefore, I feel that separately returning -EINVAL when a line is longer than KMALLOC_MAX_SIZE is redundant. There is no need to distinguish over-32KB and over-KMALLOC_MAX_SIZE.
--- security/tomoyo/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/tomoyo/common.c +1 -1
@@ -2665,7 +2665,7 @@ ssize_t tomoyo_write_control(struct tomoyo_io_buffer *head,if (head->w.avail >= head->writebuf_size -1 ) {const int len = head->writebuf_size *2 ; -char *cp =kzalloc (len,GFP_NOFS ); +char *cp =kzalloc (len,GFP_NOFS | __GFP_NOWARN);if (!cp) { error = -ENOMEM ;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 8/29 mfd: lpc_ich: Add another Gemini Lake ISA bridge PCI device-id
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 1e89d21f8189d286f80b900e1b7cf57cb1f3037e ]
On N4100 / N4120 Gemini Lake SoCs the ISA bridge PCI device-id is 31e8 rather the 3197 found on e.g. the N4000 / N4020.
While at fix the existing GLK PCI-id table entry breaking the table being sorted by device-id.
--- drivers/mfd/lpc_ich.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/lpc_ich.c +2 -1
@@ -834,8 +834,9 @@ static const struct pci_device_id lpc_ich_ids[] = { { PCI_VDEVICE(INTEL, 0x2917), LPC_ICH9ME}, { PCI_VDEVICE(INTEL, 0x2918), LPC_ICH9}, { PCI_VDEVICE(INTEL, 0x2919), LPC_ICH9M}, - { PCI_VDEVICE(INTEL, 0x3197), LPC_GLK}, { PCI_VDEVICE(INTEL, 0x2b9c), LPC_COUGARMOUNTAIN}, + { PCI_VDEVICE(INTEL, 0x3197), LPC_GLK}, + { PCI_VDEVICE(INTEL, 0x31e8), LPC_GLK}, { PCI_VDEVICE(INTEL, 0x3a14), LPC_ICH10DO}, { PCI_VDEVICE(INTEL, 0x3a16), LPC_ICH10R}, { PCI_VDEVICE(INTEL, 0x3a18), LPC_ICH10},
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 9/29 wifi: rtw88: add __packed attribute to efuse layout struct
In reply to Sasha LevinFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 0daa521a1c8c29ffbefe6530f0d276e74e2749d0 ]
The layout struct of efuse should not do address alignment by compiler. Otherwise it leads unexpected layout and size for certain arch suc as arm. In x86-64, the results are identical before and after this patch.
Also adjust bit-field to prevent over adjacent byte to avoid warning:
rtw88/rtw8822b.h:66:1: note: offset of packed bit-field res2 has changed in GCC 4.4
66 | } __packed;
| ^--- drivers/net/wireless/realtek/rtw88/main.h | 4 ++-- drivers/net/wireless/realtek/rtw88/rtw8723x.h | 8 ++++---- drivers/net/wireless/realtek/rtw88/rtw8821c.h | 9 +++++---- drivers/net/wireless/realtek/rtw88/rtw8822b.h | 9 +++++---- drivers/net/wireless/realtek/rtw88/rtw8822c.h | 9 +++++---- 5 files changed, 21 insertions(+), 18 deletions(-)
drivers/net/wireless/realtek/rtw88/main.h +2 -2
@@ -508,12 +508,12 @@ struct rtw_5g_txpwr_idx {struct rtw_5g_vht_ns_pwr_idx_diff vht_2s_diff;struct rtw_5g_vht_ns_pwr_idx_diff vht_3s_diff;struct rtw_5g_vht_ns_pwr_idx_diff vht_4s_diff; -}; +} __packed;struct rtw_txpwr_idx {struct rtw_2g_txpwr_idx pwr_idx_2g;struct rtw_5g_txpwr_idx pwr_idx_5g; -}; +} __packed;struct rtw_channel_params {u8 center_chan;
drivers/net/wireless/realtek/rtw88/rtw8723x.h +4 -4
@@ -47,7 +47,7 @@ struct rtw8723xe_efuse {u8 device_id[2 ];u8 sub_vendor_id[2 ];u8 sub_device_id[2 ]; -}; +} __packed;struct rtw8723xu_efuse {u8 res4[48 ];/* 0xd0 */
@@ -56,12 +56,12 @@ struct rtw8723xu_efuse {u8 usb_option;/* 0x104 */ u8 res5[2 ];/* 0x105 */ u8 mac_addr[ETH_ALEN ];/* 0x107 */ -}; +} __packed;struct rtw8723xs_efuse {u8 res4[0x4a ];/* 0xd0 */ u8 mac_addr[ETH_ALEN ];/* 0x11a */ -}; +} __packed;struct rtw8723x_efuse {__le16 rtl_id;
@@ -96,7 +96,7 @@ struct rtw8723x_efuse {struct rtw8723xu_efuse u;struct rtw8723xs_efuse s; }; -}; +} __packed;#define RTW8723X_IQK_ADDA_REG_NUM 16#define RTW8723X_IQK_MAC8_REG_NUM 3
drivers/net/wireless/realtek/rtw88/rtw8821c.h +5 -4
@@ -27,7 +27,7 @@ struct rtw8821cu_efuse {u8 res11[0xcf ];u8 package_type;/* 0x1fb */ u8 res12[0x4 ]; -}; +} __packed;struct rtw8821ce_efuse {u8 mac_addr[ETH_ALEN ];/* 0xd0 */
@@ -47,7 +47,8 @@ struct rtw8821ce_efuse { u8 ltr_en:1; u8 res1:2; u8 obff:2; - u8 res2:3; + u8 res2_1:1; + u8 res2_2:2; u8 obff_cap:2; u8 res3:4;u8 res4[3 ];
@@ -63,7 +64,7 @@ struct rtw8821ce_efuse { u8 res6:1; u8 port_t_power_on_value:5;u8 res7; -}; +} __packed;struct rtw8821cs_efuse {u8 res4[0x4a ];/* 0xd0 */
@@ -101,7 +102,7 @@ struct rtw8821c_efuse {struct rtw8821cu_efuse u;struct rtw8821cs_efuse s; }; -}; +} __packed;static inline void _rtw_write32s_mask (struct rtw_dev *rtwdev,u32 addr,u32 mask,u32 data)
drivers/net/wireless/realtek/rtw88/rtw8822b.h +5 -4
@@ -27,7 +27,7 @@ struct rtw8822bu_efuse {u8 res11[0xcf ];u8 package_type;/* 0x1fb */ u8 res12[0x4 ]; -}; +} __packed;struct rtw8822be_efuse {u8 mac_addr[ETH_ALEN ];/* 0xd0 */
@@ -47,7 +47,8 @@ struct rtw8822be_efuse { u8 ltr_en:1; u8 res1:2; u8 obff:2; - u8 res2:3; + u8 res2_1:1; + u8 res2_2:2; u8 obff_cap:2; u8 res3:4;u8 res4[3 ];
@@ -63,7 +64,7 @@ struct rtw8822be_efuse { u8 res6:1; u8 port_t_power_on_value:5;u8 res7; -}; +} __packed;struct rtw8822bs_efuse {u8 res4[0x4a ];/* 0xd0 */
@@ -103,7 +104,7 @@ struct rtw8822b_efuse {struct rtw8822bu_efuse u;struct rtw8822bs_efuse s; }; -}; +} __packed;static inline void _rtw_write32s_mask (struct rtw_dev *rtwdev,u32 addr,u32 mask,u32 data)
drivers/net/wireless/realtek/rtw88/rtw8822c.h +5 -4
@@ -14,7 +14,7 @@ struct rtw8822cu_efuse {u8 res1[3 ];u8 mac_addr[ETH_ALEN ];/* 0x157 */ u8 res2[0x3d ]; -}; +} __packed;struct rtw8822cs_efuse {u8 res0[0x4a ];/* 0x120 */
@@ -39,7 +39,8 @@ struct rtw8822ce_efuse { u8 ltr_en:1; u8 res1:2; u8 obff:2; - u8 res2:3; + u8 res2_1:1; + u8 res2_2:2; u8 obff_cap:2; u8 res3:4;u8 class_code[3 ];
@@ -55,7 +56,7 @@ struct rtw8822ce_efuse { u8 res6:1; u8 port_t_power_on_value:5;u8 res7; -}; +} __packed;struct rtw8822c_efuse {__le16 rtl_id;
@@ -102,7 +103,7 @@ struct rtw8822c_efuse {struct rtw8822cu_efuse u;struct rtw8822cs_efuse s; }; -}; +} __packed;enum rtw8822c_dpk_agc_phase {RTW_DPK_GAIN_CHECK ,
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 10/29 clk: qcom: Make GCC_8150 depend on QCOM_GDSC
In reply to Sasha LevinFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 1474149c4209943b37a2c01b82f07ba39465e5fe ]
Like all other non-ancient Qualcomm clock drivers, QCOM_GDSC is required, as the GCC driver defines and instantiates a bunch of GDSCs.
Add the missing dependency.
--- drivers/clk/qcom/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clk/qcom/Kconfig +1 -0
@@ -1022,6 +1022,7 @@ config SM_GCC_7150 config SM_GCC_8150 tristate "SM8150 Global Clock Controller" depends on ARM64 || COMPILE_TEST + select QCOM_GDSC help Support for the global clock controller on SM8150 devices. Say Y if you want to use peripheral devices such as UART,
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 11/29 HID: multitouch: Add quirk for Hantick 5288 touchpad
In reply to Sasha LevinFrom: Youwan Wang <[email protected]>
[ Upstream commit b5e65ae557da9fd17b08482ee44ee108ba636182 ]
This device sometimes doesn't send touch release signals when moving from >=2 fingers to <2 fingers. Using MT_QUIRK_NOT_SEEN_MEANS_UP instead of MT_QUIRK_ALWAYS_VALID makes sure that no touches become stuck.
--- drivers/hid/hid-multitouch.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/hid-multitouch.c +5 -0
@@ -2308,6 +2308,11 @@ static const struct hid_device_id mt_devices[] = {HID_DEVICE (HID_BUS_ANY ,HID_GROUP_ANY ,USB_VENDOR_ID_SIS_TOUCH , HID_ANY_ID) }, + /* Hantick */ + { .driver_data = MT_CLS_NSMU, +HID_DEVICE (BUS_I2C ,HID_GROUP_MULTITOUCH_WIN_8 , + I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288) }, +/* Generic MT device */ { HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH, HID_ANY_ID, HID_ANY_ID) },
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 12/29 HID: Wacom: Add PCI Wacom device support
In reply to Sasha LevinFrom: Even Xu <[email protected]>
[ Upstream commit c4c123504a65583e3689b3de04a61dc5272e453a ]
Add PCI device ID of wacom device into driver support list.
--- drivers/hid/wacom_wac.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/wacom_wac.c +5 -0
@@ -4943,6 +4943,10 @@ static const struct wacom_features wacom_features_0x94 = HID_DEVICE(BUS_I2C, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ .driver_data = (kernel_ulong_t)&wacom_features_##prod +#define PCI_DEVICE_WACOM (prod) \ + HID_DEVICE(BUS_PCI, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ + .driver_data = (kernel_ulong_t)&wacom_features_##prod +#define USB_DEVICE_LENOVO (prod) \ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, prod), \ .driver_data = (kernel_ulong_t)&wacom_features_##prod
@@ -5112,6 +5116,7 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(HID_ANY_ID) }, { I2C_DEVICE_WACOM(HID_ANY_ID) }, + { PCI_DEVICE_WACOM(HID_ANY_ID) }, { BT_DEVICE_WACOM(HID_ANY_ID) }, { } };
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 13/29 net/mlx5: use do_aux_work for PHC overflow checks
In reply to Sasha LevinFrom: Vadim Fedorenko <[email protected]>
[ Upstream commit e61e6c415ba9ff2b32bb6780ce1b17d1d76238f1 ]
The overflow_work is using system wq to do overflow checks and updates for PHC device timecounter, which might be overhelmed by other tasks. But there is dedicated kthread in PTP subsystem designed for such things. This patch changes the work queue to proper align with PTP subsystem and to avoid overloading system work queue.
The adjfine() function acts the same way as overflow check worker, we can postpone ptp aux worker till the next overflow period after adjfine() was called.
--- .../ethernet/mellanox/mlx5/core/lib/clock.c | 24 ++++++++++--------- include/linux/mlx5/driver.h | 1 - 2 files changed, 13 insertions(+), 12 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +13 -11
@@ -322,17 +322,16 @@ static void mlx5_pps_out(struct work_struct *work) } } -static void mlx5_timestamp_overflow (struct work_struct *work) +static long mlx5_timestamp_overflow (struct ptp_clock_info *ptp_info) { -struct delayed_work *dwork =to_delayed_work (work);struct mlx5_core_dev *mdev;struct mlx5_timer *timer;struct mlx5_clock *clock;unsigned long flags; - timer = container_of(dwork, struct mlx5_timer, overflow_work); - clock = container_of(timer, struct mlx5_clock, timer); + clock = container_of(ptp_info, struct mlx5_clock, ptp_info); mdev = container_of(clock, struct mlx5_core_dev, clock); + timer = &clock->timer;if (mdev->state ==MLX5_DEVICE_STATE_INTERNAL_ERROR ) goto out;
@@ -343,7 +342,7 @@ static void mlx5_timestamp_overflow(struct work_struct *work)write_sequnlock_irqrestore (&clock->lock, flags); out: -schedule_delayed_work (&timer->overflow_work, timer->overflow_period); +return timer->overflow_period; } static int mlx5_ptp_settime_real_time(struct mlx5_core_dev *mdev,
@@ -521,6 +520,7 @@ static int mlx5_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm) timer->cycles.mult = mult;mlx5_update_clock_info_page (mdev);write_sequnlock_irqrestore (&clock->lock, flags); +ptp_schedule_worker (clock->ptp, timer->overflow_period);return 0 ; }
@@ -856,6 +856,7 @@ static const struct ptp_clock_info mlx5_ptp_clock_info = { .settime64 = mlx5_ptp_settime, .enable = NULL, .verify = NULL, + .do_aux_work = mlx5_timestamp_overflow, }; static int mlx5_query_mtpps_pin_mode(struct mlx5_core_dev *mdev, u8 pin,
@@ -1056,12 +1057,11 @@ static void mlx5_init_overflow_period(struct mlx5_clock *clock)do_div (ns,NSEC_PER_SEC /HZ ); timer->overflow_period = ns; -INIT_DELAYED_WORK (&timer->overflow_work, mlx5_timestamp_overflow); -if (timer->overflow_period) -schedule_delayed_work (&timer->overflow_work,0 ); -else +if (!timer->overflow_period) { + timer->overflow_period =HZ ;mlx5_core_warn (mdev, -"invalid overflow period, overflow_work is not scheduled\n" ); +"invalid overflow period, overflow_work is scheduled once per second\n" ); + }if (clock_info) clock_info->overflow_period = timer->overflow_period;
@@ -1176,6 +1176,9 @@ void mlx5_init_clock(struct mlx5_core_dev *mdev)MLX5_NB_INIT (&clock->pps_nb, mlx5_pps_event,PPS_EVENT );mlx5_eq_notifier_register (mdev, &clock->pps_nb); + +if (clock->ptp) +ptp_schedule_worker (clock->ptp,0 ); }void mlx5_cleanup_clock (struct mlx5_core_dev *mdev)
@@ -1192,7 +1195,6 @@ void mlx5_cleanup_clock(struct mlx5_core_dev *mdev) }cancel_work_sync (&clock->pps_info.out_work); -cancel_delayed_work_sync (&clock->timer.overflow_work);if (mdev->clock_info) {free_page ((unsigned long )mdev->clock_info);
include/linux/mlx5/driver.h +0 -1
@@ -722,7 +722,6 @@ struct mlx5_timer {struct timecounter tc;u32 nominal_c_mult;unsigned long overflow_period; -struct delayed_work overflow_work; };struct mlx5_clock {
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 14/29 wifi: brcmfmac: Check the return value of of_property_read_string_index()
In reply to Sasha LevinFrom: Stefan Dösinger <[email protected]>
[ Upstream commit 082d9e263af8de68f0c34f67b251818205160f6e ]
Somewhen between 6.10 and 6.11 the driver started to crash on my MacBookPro14,3. The property doesn't exist and 'tmp' remains uninitialized, so we pass a random pointer to devm_kstrdup().
The crash I am getting looks like this:
BUG: unable to handle page fault for address: 00007f033c669379 PF: supervisor read access in kernel mode PF: error_code(0x0001) - permissions violation PGD 8000000101341067 P4D 8000000101341067 PUD 101340067 PMD 1013bb067 PTE 800000010aee9025 Oops: Oops: 0001 [#1] SMP PTI CPU: 4 UID: 0 PID: 827 Comm: (udev-worker) Not tainted 6.11.8-gentoo #1 Hardware name: Apple Inc. MacBookPro14,3/Mac-551B86E5744E2388, BIOS 529.140.2.0.0 06/23/2024 RIP: 0010:strlen+0x4/0x30 Code: f7 75 ec 31 c0 c3 cc cc cc cc 48 89 f8 c3 cc cc cc cc 0f 1f 40 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 f3 0f 1e fa <80> 3f 00 74 14 48 89 f8 48 83 c0 01 80 38 00 75 f7 48 29 f8 c3 cc RSP: 0018:ffffb4aac0683ad8 EFLAGS: 00010202 RAX: 00000000ffffffea RBX: 00007f033c669379 RCX: 0000000000000001 RDX: 0000000000000cc0 RSI: 00007f033c669379 RDI: 00007f033c669379 RBP: 00000000ffffffea R08: 0000000000000000 R09: 00000000c0ba916a R10: ffffffffffffffff R11: ffffffffb61ea260 R12: ffff91f7815b50c8 R13: 0000000000000cc0 R14: ffff91fafefffe30 R15: ffffb4aac0683b30 FS: 00007f033ccbe8c0(0000) GS:ffff91faeed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f033c669379 CR3: 0000000107b1e004 CR4: 00000000003706f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> ? __die+0x23/0x70 ? page_fault_oops+0x149/0x4c0 ? raw_spin_rq_lock_nested+0xe/0x20 ? sched_balance_newidle+0x22b/0x3c0 ? update_load_avg+0x78/0x770 ? exc_page_fault+0x6f/0x150 ? asm_exc_page_fault+0x26/0x30 ? __pfx_pci_conf1_write+0x10/0x10 ? strlen+0x4/0x30 devm_kstrdup+0x25/0x70 brcmf_of_probe+0x273/0x350 [brcmfmac]
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c +4 -4
@@ -97,13 +97,13 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type,/* Set board-type to the first string of the machine compatible prop */ root =of_find_node_by_path ("/" );if (root && err) { -char *board_type; +char *board_type =NULL ;const char *tmp; -of_property_read_string_index (root,"compatible" ,0 , &tmp); -/* get rid of '/' in the compatible string to be able to find the FW */ - board_type =devm_kstrdup (dev, tmp,GFP_KERNEL ); +if (!of_property_read_string_index (root,"compatible" ,0 , &tmp)) + board_type =devm_kstrdup (dev, tmp,GFP_KERNEL ); +if (!board_type) {of_node_put (root);return ;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 15/29 wifi: iwlwifi: pcie: Add support for new device ids
In reply to Sasha LevinFrom: "Somashekhar(Som)" <[email protected]>
[ Upstream commit 9b45ba3976945e8d53f2dd40541a66c690f12286 ]
Add support for new device-ids 0x2730 and 0x272F.
--- drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 167 ++++++++++++++++++ .../net/wireless/intel/iwlwifi/iwl-config.h | 10 ++ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 16 ++ 4 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 drivers/net/wireless/intel/iwlwifi/cfg/dr.c
drivers/net/wireless/intel/iwlwifi/Makefile +1 -1
@@ -11,7 +11,7 @@ iwlwifi-objs += pcie/ctxt-info.o pcie/ctxt-info-gen3.o iwlwifi-objs += pcie/trans-gen2.o pcie/tx-gen2.o iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o -iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o cfg/bz.o cfg/sc.o +iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o cfg/bz.o cfg/sc.o cfg/dr.o iwlwifi-objs += iwl-dbg-tlv.o iwlwifi-objs += iwl-trans.o
drivers/net/wireless/intel/iwlwifi/cfg/dr.c new file +167 -0
167 lines not on this page · raw message
drivers/net/wireless/intel/iwlwifi/iwl-config.h +10 -0
@@ -38,6 +38,7 @@ enum iwl_device_family {IWL_DEVICE_FAMILY_AX210 ,IWL_DEVICE_FAMILY_BZ ,IWL_DEVICE_FAMILY_SC , + IWL_DEVICE_FAMILY_DR, };/*
@@ -424,6 +425,8 @@ struct iwl_cfg {#define IWL_CFG_MAC_TYPE_SC2 0x49#define IWL_CFG_MAC_TYPE_SC2F 0x4A#define IWL_CFG_MAC_TYPE_BZ_W 0x4B +#define IWL_CFG_MAC_TYPE_BR 0x4C +#define IWL_CFG_MAC_TYPE_DR 0x4D#define IWL_CFG_RF_TYPE_TH 0x105#define IWL_CFG_RF_TYPE_TH1 0x108
@@ -434,6 +437,7 @@ struct iwl_cfg {#define IWL_CFG_RF_TYPE_GF 0x10D#define IWL_CFG_RF_TYPE_FM 0x112#define IWL_CFG_RF_TYPE_WH 0x113 +#define IWL_CFG_RF_TYPE_PE 0x114#define IWL_CFG_RF_ID_TH 0x1#define IWL_CFG_RF_ID_TH1 0x1
@@ -506,6 +510,8 @@ extern const struct iwl_cfg_trans_params iwl_ma_trans_cfg;extern const struct iwl_cfg_trans_params iwl_bz_trans_cfg;extern const struct iwl_cfg_trans_params iwl_gl_trans_cfg;extern const struct iwl_cfg_trans_params iwl_sc_trans_cfg; +extern const struct iwl_cfg_trans_params iwl_dr_trans_cfg; +extern const struct iwl_cfg_trans_params iwl_br_trans_cfg;extern const char iwl9162_name[];extern const char iwl9260_name[];extern const char iwl9260_1_name[];
@@ -551,6 +557,8 @@ extern const char iwl_mtp_name[];extern const char iwl_sc_name[];extern const char iwl_sc2_name[];extern const char iwl_sc2f_name[]; +extern const char iwl_dr_name[]; +extern const char iwl_br_name[];#if IS_ENABLED (CONFIG_IWLDVM )extern const struct iwl_cfg iwl5300_agn_cfg;extern const struct iwl_cfg iwl5100_agn_cfg;
@@ -658,6 +666,8 @@ extern const struct iwl_cfg iwl_cfg_gl;extern const struct iwl_cfg iwl_cfg_sc;extern const struct iwl_cfg iwl_cfg_sc2;extern const struct iwl_cfg iwl_cfg_sc2f; +extern const struct iwl_cfg iwl_cfg_dr; +extern const struct iwl_cfg iwl_cfg_br;#endif /* CONFIG_IWLMVM */ #endif /* __IWL_CONFIG_H__ */
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +16 -0
@@ -540,6 +540,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0xE340, PCI_ANY_ID, iwl_sc_trans_cfg)}, {IWL_PCI_DEVICE(0xD340, PCI_ANY_ID, iwl_sc_trans_cfg)}, {IWL_PCI_DEVICE(0x6E70, PCI_ANY_ID, iwl_sc_trans_cfg)}, + +/* Dr devices */ + {IWL_PCI_DEVICE(0x272F, PCI_ANY_ID, iwl_dr_trans_cfg)}, #endif /* CONFIG_IWLMVM */ {0}
@@ -1182,6 +1185,19 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY, iwl_cfg_sc2f, iwl_sc2f_name), +/* Dr */ +_IWL_DEV_INFO (IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_MAC_TYPE_DR ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY ,IWL_CFG_ANY , + iwl_cfg_dr, iwl_dr_name), + +/* Br */ +_IWL_DEV_INFO (IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_MAC_TYPE_BR ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY ,IWL_CFG_ANY , +IWL_CFG_ANY ,IWL_CFG_ANY ,IWL_CFG_ANY , + iwl_cfg_br, iwl_br_name), #endif /* CONFIG_IWLMVM */ };EXPORT_SYMBOL_IF_IWLWIFI_KUNIT (iwl_dev_info_table);
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 16/29 wifi: iwlwifi: avoid memory leak
In reply to Sasha LevinFrom: Miri Korenblit <[email protected]>
[ Upstream commit 80e96206a3ef348fbd658d98f2f43149c36df8bc ]
A caller of iwl_acpi_get_dsm_object must free the returned object. iwl_acpi_get_dsm_integer returns immediately without freeing it if the expected size is more than 8 bytes. Fix that.
Note that with the current code this will never happen, since the caller of iwl_acpi_get_dsm_integer already checks that the expected size if either 1 or 4 bytes, so it can't exceed 8 bytes.
While at it, print the DSM value instead of the return value, as this was the intention in the first place.
--- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/acpi.c +8 -5
@@ -108,7 +108,7 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, size_t expected_size) {union acpi_object *obj; -int ret =0 ; +int ret; obj =iwl_acpi_get_dsm_object (dev, rev, func,NULL , guid);if (IS_ERR (obj)) {
@@ -123,8 +123,10 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, }else if (obj->type ==ACPI_TYPE_BUFFER ) {__le64 le_value =0 ; -if (WARN_ON_ONCE (expected_size >sizeof (le_value))) -return -EINVAL ; +if (WARN_ON_ONCE (expected_size >sizeof (le_value))) { + ret = -EINVAL ; + goto out; + }/* if the buffer size doesn't match the expected size */ if (obj->buffer.length != expected_size)
@@ -145,8 +147,9 @@ static int iwl_acpi_get_dsm_integer(struct device *dev, int rev, int func, }IWL_DEBUG_DEV_RADIO (dev, -"ACPI: DSM method evaluated: func=%d, ret=%d\n" , - func, ret); +"ACPI: DSM method evaluated: func=%d, value=%lld\n" , + func, *value); + ret =0 ; out:ACPI_FREE (obj);return ret;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 17/29 i2c: Force ELAN06FA touchpad I2C bus freq to 100KHz
In reply to Sasha LevinFrom: Randolph Ha <[email protected]>
[ Upstream commit bfd74cd1fbc026f04446e67d6915c7e199c2bffd ]
When a 400KHz freq is used on this model of ELAN touchpad in Linux, excessive smoothing (similar to when the touchpad's firmware detects a noisy signal) is sometimes applied. As some devices' (e.g, Lenovo V15 G4) ACPI tables specify a 400KHz frequency for this device and some I2C busses (e.g, Designware I2C) default to a 400KHz freq, force the speed to 100KHz as a workaround.
For future investigation: This problem may be related to the default HCNT/LCNT values given by some busses' drivers, because they are not specified in the aforementioned devices' ACPI tables, and because the device works without issues on Windows at what is expected to be a 400KHz frequency. The root cause of the issue is not known.
--- drivers/i2c/i2c-core-acpi.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/i2c/i2c-core-acpi.c +22 -0
@@ -355,6 +355,25 @@ static const struct acpi_device_id i2c_acpi_force_400khz_device_ids[] = { {} }; +static const struct acpi_device_id i2c_acpi_force_100khz_device_ids[] = { +/* +* When a 400KHz freq is used on this model of ELAN touchpad in Linux, +* excessive smoothing (similar to when the touchpad's firmware detects +* a noisy signal) is sometimes applied. As some devices' (e.g, Lenovo +* V15 G4) ACPI tables specify a 400KHz frequency for this device and +* some I2C busses (e.g, Designware I2C) default to a 400KHz freq, +* force the speed to 100KHz as a workaround. +* +* For future investigation: This problem may be related to the default +* HCNT/LCNT values given by some busses' drivers, because they are not +* specified in the aforementioned devices' ACPI tables, and because +* the device works without issues on Windows at what is expected to be +* a 400KHz frequency. The root cause of the issue is not known. +*/ + {"ELAN06FA" ,0 }, + {} +}; +static acpi_status i2c_acpi_lookup_speed (acpi_handle handle,u32 level,void *data,void **return_value) {
@@ -373,6 +392,9 @@ static acpi_status i2c_acpi_lookup_speed(acpi_handle handle, u32 level,if (acpi_match_device_ids (adev, i2c_acpi_force_400khz_device_ids) ==0 ) lookup->force_speed =I2C_MAX_FAST_MODE_FREQ ; +if (acpi_match_device_ids (adev, i2c_acpi_force_100khz_device_ids) ==0 ) + lookup->force_speed =I2C_MAX_STANDARD_MODE_FREQ ; +return AE_OK ; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 18/29 APEI: GHES: Have GHES honor the panic= setting
In reply to Sasha LevinFrom: Borislav Petkov <[email protected]>
[ Upstream commit 5c0e00a391dd0099fe95991bb2f962848d851916 ]
The GHES driver overrides the panic= setting by force-rebooting the system after a fatal hw error has been reported. The intent being that such an error would be reported earlier.
However, this is not optimal when a hard-to-debug issue requires long time to reproduce and when that happens, the box will get rebooted after 30 seconds and thus destroy the whole hw context of when the error happened.
So rip out the default GHES panic timeout and honor the global one.
In the panic disabled (panic=0) case, the error will still be logged to dmesg for later inspection and if panic after a hw error is really required, then that can be controlled the usual way - use panic= on the cmdline or set it in the kernel .config's CONFIG_PANIC_TIMEOUT.
--- drivers/acpi/apei/ghes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/acpi/apei/ghes.c +5 -5
@@ -173,8 +173,6 @@ static struct gen_pool *ghes_estatus_pool;static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE ];static atomic_t ghes_estatus_cache_alloced; -static int ghes_panic_timeout__read_mostly =30 ; -static void __iomem *ghes_map (u64 pfn,enum fixed_addresses fixmap_idx) {phys_addr_t paddr;
@@ -983,14 +981,16 @@ static void __ghes_panic(struct ghes *ghes,struct acpi_hest_generic_status *estatus, u64 buf_paddr, enum fixed_addresses fixmap_idx) { + const char *msg = GHES_PFX "Fatal hardware error"; +__ghes_print_estatus (KERN_EMERG , ghes->generic, estatus);ghes_clear_estatus (ghes, estatus, buf_paddr, fixmap_idx); -/* reboot to log the error! */ if (!panic_timeout) - panic_timeout = ghes_panic_timeout; -panic ("Fatal hardware error!" ); +pr_emerg ("%s but panic disabled\n" , msg); + +panic (msg); }static int ghes_proc (struct ghes *ghes)
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 19/29 Bluetooth: btusb: Add new VID/PID 13d3/3610 for MT7922
In reply to Sasha LevinFrom: Andrew Halaney <[email protected]>
[ Upstream commit 45e7d389bf2e52dfc893779c611dd5cff461b590 ]
A new machine has a Archer AX3000 / TX55e in it,
and out the box reported issues resetting hci0. It looks like this is a MT7922 from the lspci output, so treat it as a MediaTek device and use the proper callbacks. With that in place an xbox controller can be used without issue as seen below:
[ 7.047388] Bluetooth: hci0: HW/SW Version: 0x008a008a, Build Time: 20241106163512
[ 9.583883] Bluetooth: hci0: Device setup in 2582842 usecs
[ 9.583895] Bluetooth: hci0: HCI Enhanced Setup Synchronous Connection command is advertised, but not supported.
[ 9.644780] Bluetooth: hci0: AOSP extensions version v1.00
[ 9.644784] Bluetooth: hci0: AOSP quality report is supported
[ 876.379876] input: Xbox Wireless Controller as /devices/virtual/misc/uhid/0005:045E:0B13.0006/input/input27
[ 876.380215] hid-generic 0005:045E:0B13.0006: input,hidraw3: BLUETOOTH HID v5.15 Gamepad [Xbox Wireless Controller] on c0:bf:be:27:de:f7
[ 876.429368] input: Xbox Wireless Controller as /devices/virtual/misc/uhid/0005:045E:0B13.0006/input/input28
[ 876.429423] microsoft 0005:045E:0B13.0006: input,hidraw3: BLUETOOTH HID v5.15 Gamepad [Xbox Wireless Controller] on c0:bf:be:27:de:f7lspci output:
root@livingroom:/home/ajhalaney/git# lspci
...
05:00.0 Network controller: MEDIATEK Corp. MT7922 802.11ax PCI Express Wireless Network Adapterand USB device:
root@livingroom:/home/ajhalaney/git# cat /sys/kernel/debug/usb/devices
...
T: Bus=01 Lev=01 Prnt=01 Port=10 Cnt=03 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=13d3 ProdID=3610 Rev= 1.00
S: Manufacturer=MediaTek Inc.
S: Product=Wireless_Device
S: SerialNumber=000000000
C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA
A: FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01
I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms
I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms
I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms
I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms
I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms
I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms
I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms
E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms
I: If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us
E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us
I:* If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E: Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us
E: Ad=0a(O) Atr=03(Int.) MxPS= 512 Ivl=125us--- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btusb.c +2 -0
@@ -604,6 +604,8 @@ static const struct usb_device_id quirks_table[] = {/* MediaTek MT7922 Bluetooth devices */ { USB_DEVICE(0x13d3, 0x3585), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x13d3, 0x3610), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH }, /* MediaTek MT7922A Bluetooth devices */ { USB_DEVICE(0x0489, 0xe0d8), .driver_info = BTUSB_MEDIATEK |
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 20/29 Bluetooth: btusb: Add new VID/PID 13d3/3628 for MT7925
In reply to Sasha LevinFrom: En-Wei Wu <[email protected]>
[ Upstream commit f63f401130e5c5cd0dd2f18c9df967ab75cd4732 ]
Add VID 13d3 & PID 3628 for MediaTek MT7925 USB Bluetooth chip.
The information in /sys/kernel/debug/usb/devices about the Bluetooth device is listed as the below.
T: Bus=01 Lev=01 Prnt=01 Port=03 Cnt=03 Dev#= 4 Spd=480 MxCh= 0 D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3628 Rev= 1.00 S: Manufacturer=MediaTek Inc. S: Product=Wireless_Device S: SerialNumber=000000000 C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA A: FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01 I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms I: If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us I:* If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us E: Ad=0a(O) Atr=03(Int.) MxPS= 512 Ivl=125us
--- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/bluetooth/btusb.c +2 -0
@@ -670,6 +670,8 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x13d3, 0x3608), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x13d3, 0x3628), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH }, /* Additional Realtek 8723AE Bluetooth devices */ { USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK },
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 21/29 Bluetooth: MGMT: Fix slab-use-after-free Read in mgmt_remove_adv_monitor_sync
In reply to Sasha LevinFrom: Mazin Al Haddad <[email protected]>
[ Upstream commit 26fbd3494a7dd26269cb0817c289267dbcfdec06 ]
This fixes the following crash:
==================================================================
BUG: KASAN: slab-use-after-free in mgmt_remove_adv_monitor_sync+0x3a/0xd0 net/bluetooth/mgmt.c:5543 Read of size 8 at addr ffff88814128f898 by task kworker/u9:4/5961 CPU: 1 UID: 0 PID: 5961 Comm: kworker/u9:4 Not tainted 6.12.0-syzkaller-10684-gf1cd565ce577 #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 09/13/2024 Workqueue: hci0 hci_cmd_sync_work Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x241/0x360 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:378 [inline] print_report+0x169/0x550 mm/kasan/report.c:489 kasan_report+0x143/0x180 mm/kasan/report.c:602 mgmt_remove_adv_monitor_sync+0x3a/0xd0 net/bluetooth/mgmt.c:5543 hci_cmd_sync_work+0x22b/0x400 net/bluetooth/hci_sync.c:332 process_one_work kernel/workqueue.c:3229 [inline] process_scheduled_works+0xa63/0x1850 kernel/workqueue.c:3310 worker_thread+0x870/0xd30 kernel/workqueue.c:3391 kthread+0x2f0/0x390 kernel/kthread.c:389 ret_from_fork+0x4b/0x80 arch/x86/kernel/process.c:147 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:244 </TASK> Allocated by task 16026: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0x98/0xb0 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __kmalloc_cache_noprof+0x243/0x390 mm/slub.c:4314 kmalloc_noprof include/linux/slab.h:901 [inline] kzalloc_noprof include/linux/slab.h:1037 [inline] mgmt_pending_new+0x65/0x250 net/bluetooth/mgmt_util.c:269 mgmt_pending_add+0x36/0x120 net/bluetooth/mgmt_util.c:296 remove_adv_monitor+0x102/0x1b0 net/bluetooth/mgmt.c:5568 hci_mgmt_cmd+0xc47/0x11d0 net/bluetooth/hci_sock.c:1712 hci_sock_sendmsg+0x7b8/0x11c0 net/bluetooth/hci_sock.c:1832 sock_sendmsg_nosec net/socket.c:711 [inline] __sock_sendmsg+0x221/0x270 net/socket.c:726 sock_write_iter+0x2d7/0x3f0 net/socket.c:1147 new_sync_write fs/read_write.c:586 [inline] vfs_write+0xaeb/0xd30 fs/read_write.c:679 ksys_write+0x18f/0x2b0 fs/read_write.c:731 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 16022: kasan_save_stack mm/kasan/common.c:47 [inline] kasan_save_track+0x3f/0x80 mm/kasan/common.c:68 kasan_save_free_info+0x40/0x50 mm/kasan/generic.c:582 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x59/0x70 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2338 [inline] slab_free mm/slub.c:4598 [inline] kfree+0x196/0x420 mm/slub.c:4746 mgmt_pending_foreach+0xd1/0x130 net/bluetooth/mgmt_util.c:259 __mgmt_power_off+0x183/0x430 net/bluetooth/mgmt.c:9550 hci_dev_close_sync+0x6c4/0x11c0 net/bluetooth/hci_sync.c:5208 hci_dev_do_close net/bluetooth/hci_core.c:483 [inline] hci_dev_close+0x112/0x210 net/bluetooth/hci_core.c:508 sock_do_ioctl+0x158/0x460 net/socket.c:1209 sock_ioctl+0x626/0x8e0 net/socket.c:1328 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:906 [inline] __se_sys_ioctl+0xf5/0x170 fs/ioctl.c:892 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- net/bluetooth/mgmt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/bluetooth/mgmt.c +11 -1
@@ -5460,10 +5460,16 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev, {struct mgmt_rp_remove_adv_monitor rp;struct mgmt_pending_cmd *cmd = data; -struct mgmt_cp_remove_adv_monitor *cp = cmd->param; +struct mgmt_cp_remove_adv_monitor *cp; + +if (status == -ECANCELED || + cmd !=pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev)) +return ;hci_dev_lock (hdev); + cp = cmd->param; + rp.monitor_handle = cp->monitor_handle;if (!status)
@@ -5481,6 +5487,10 @@ static void mgmt_remove_adv_monitor_complete(struct hci_dev *hdev,static int mgmt_remove_adv_monitor_sync (struct hci_dev *hdev,void *data) {struct mgmt_pending_cmd *cmd = data; + +if (cmd !=pending_find (MGMT_OP_REMOVE_ADV_MONITOR , hdev)) +return -ECANCELED ; +struct mgmt_cp_remove_adv_monitor *cp = cmd->param;u16 handle =__le16_to_cpu (cp->monitor_handle);
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 22/29 net: wwan: iosm: Fix hibernation by re-binding the driver around it
In reply to Sasha LevinFrom: "Maciej S. Szmigiero" <[email protected]>
[ Upstream commit 0b6f6593aa8c3a05f155c12fd0e7ad33a5149c31 ]
Currently, the driver is seriously broken with respect to the hibernation (S4): after image restore the device is back into IPC_MEM_EXEC_STAGE_BOOT (which AFAIK means bootloader stage) and needs full re-launch of the rest of its firmware, but the driver restore handler treats the device as merely sleeping and just sends it a wake-up command.
This wake-up command times out but device nodes (/dev/wwan*) remain accessible.
However attempting to use them causes the bootloader to crash and enter IPC_MEM_EXEC_STAGE_CD_READY stage (which apparently means "a crash dump is ready").
It seems that the device cannot be re-initialized from this crashed stage without toggling some reset pin (on my test platform that's apparently what the device _RST ACPI method does).
While it would theoretically be possible to rewrite the driver to tear down the whole MUX / IPC layers on hibernation (so the bootloader does not crash from improper access) and then re-launch the device on restore this would require significant refactoring of the driver (believe me, I've tried), since there are quite a few assumptions hard-coded in the driver about the device never being partially de-initialized (like channels other than devlink cannot be closed, for example).
Probably this would also need some programming guide for this hardware.
Considering that the driver seems orphaned [1] and other people are hitting this issue too [2] fix it by simply unbinding the PCI driver before hibernation and re-binding it after restore, much like USB_QUIRK_RESET_RESUME does for USB devices that exhibit a similar problem.
Tested on XMM7360 in HP EliteBook 855 G7 both with s2idle (which uses the existing suspend / resume handlers) and S4 (which uses the new code).
[1]: https://lore.kernel.org/all/[email protected]/
[2]:
https://github.com/xmm7360/xmm7360-pci/issues/211#issuecomment-1804139413
--- drivers/net/wwan/iosm/iosm_ipc_pcie.c | 56 ++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)
drivers/net/wwan/iosm/iosm_ipc_pcie.c +55 -1
@@ -6,6 +6,7 @@#include <linux/acpi.h> #include <linux/bitfield.h> #include <linux/module.h> +#include <linux/suspend.h> #include <net/rtnetlink.h> #include "iosm_ipc_imem.h"
@@ -18,6 +19,7 @@ MODULE_LICENSE("GPL v2");/* WWAN GUID */ static guid_t wwan_acpi_guid =GUID_INIT (0xbad01b75 ,0x22a8 ,0x4f48 ,0x87 ,0x92 ,0xbd ,0xde ,0x94 ,0x67 ,0x74 ,0x7d ); +static bool pci_registered;static void ipc_pcie_resources_release (struct iosm_pcie *ipc_pcie) {
@@ -448,7 +450,6 @@ static struct pci_driver iosm_ipc_driver = { }, .id_table = iosm_ipc_ids, }; -module_pci_driver (iosm_ipc_driver);int ipc_pcie_addr_map (struct iosm_pcie *ipc_pcie,unsigned char *data,size_t size,dma_addr_t *mapping,int direction)
@@ -530,3 +531,56 @@ void ipc_pcie_kfree_skb(struct iosm_pcie *ipc_pcie, struct sk_buff *skb)IPC_CB (skb)->mapping =0 ;dev_kfree_skb (skb); } + +static int pm_notify (struct notifier_block *nb,unsigned long mode,void *_unused) +{ +if (mode ==PM_HIBERNATION_PREPARE || mode ==PM_RESTORE_PREPARE ) { +if (pci_registered) { +pci_unregister_driver (&iosm_ipc_driver); + pci_registered = false; + } + }else if (mode ==PM_POST_HIBERNATION || mode ==PM_POST_RESTORE ) { +if (!pci_registered) { +int ret; + + ret =pci_register_driver (&iosm_ipc_driver); +if (ret) { +pr_err (KBUILD_MODNAME ": unable to re-register PCI driver: %d\n" , + ret); + }else { + pci_registered = true; + } + } + } + +return 0 ; +} + +static struct notifier_block pm_notifier = { + .notifier_call = pm_notify, +}; + +static int __init iosm_ipc_driver_init (void ) +{ +int ret; + + ret =pci_register_driver (&iosm_ipc_driver); +if (ret) +return ret; + + pci_registered = true; + +register_pm_notifier (&pm_notifier); + +return 0 ; +} +module_init (iosm_ipc_driver_init); + +static void __exit iosm_ipc_driver_exit(void) +{ +unregister_pm_notifier (&pm_notifier); + +if (pci_registered) +pci_unregister_driver (&iosm_ipc_driver); +} +module_exit (iosm_ipc_driver_exit);
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 23/29 HID: hid-asus: Disable OOBE mode on the ProArt P16
In reply to Sasha LevinFrom: "Luke D. Jones" <[email protected]>
[ Upstream commit 53078a736fbc60e5d3a1e14f4cd4214003815026 ]
The new ASUS ProArt 16" laptop series come with their keyboards stuck in an Out-Of-Box-Experience mode. While in this mode most functions will not work such as LED control or Fn key combos. The correct init sequence is now done to disable this OOBE.
This patch addresses only the ProArt series so far and it is unknown if there may be others, in which case a new quirk may be required.
--- drivers/hid/hid-asus.c | 26 ++++++++++++++++++++++ include/linux/platform_data/x86/asus-wmi.h | 5 +++++ 2 files changed, 31 insertions(+)
drivers/hid/hid-asus.c +26 -0
@@ -432,6 +432,26 @@ static int asus_kbd_get_functions(struct hid_device *hdev,return ret; } +static int asus_kbd_disable_oobe (struct hid_device *hdev) +{ +const u8 init[][6 ] = { + {FEATURE_KBD_REPORT_ID ,0x05 ,0x20 ,0x31 ,0x00 ,0x08 }, + {FEATURE_KBD_REPORT_ID ,0xBA ,0xC5 ,0xC4 }, + {FEATURE_KBD_REPORT_ID ,0xD0 ,0x8F ,0x01 }, + {FEATURE_KBD_REPORT_ID ,0xD0 ,0x85 ,0xFF } + }; +int ret; + +for (size_t i =0 ; i <ARRAY_SIZE (init); i++) { + ret =asus_kbd_set_report (hdev, init[i],sizeof (init[i])); +if (ret <0 ) +return ret; + } + +hid_info (hdev,"Disabled OOBE for keyboard\n" ); +return 0 ; +} +static void asus_schedule_work (struct asus_kbd_leds *led) {unsigned long flags;
@@ -534,6 +554,12 @@ static int asus_kbd_register_leds(struct hid_device *hdev) ret =asus_kbd_init (hdev,FEATURE_KBD_LED_REPORT_ID2 );if (ret <0 )return ret; + +if (dmi_match (DMI_PRODUCT_FAMILY ,"ProArt P16" )) { + ret =asus_kbd_disable_oobe (hdev); +if (ret <0 ) +return ret; + } }else {/* Initialize keyboard */ ret =asus_kbd_init (hdev,FEATURE_KBD_REPORT_ID );
include/linux/platform_data/x86/asus-wmi.h +5 -0
@@ -184,6 +184,11 @@ static const struct dmi_system_id asus_use_hid_led_dmi_ids[] = { DMI_MATCH(DMI_PRODUCT_FAMILY, "ROG Flow"), }, }, + { + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt P16"), + }, + }, { .matches = { DMI_MATCH(DMI_BOARD_NAME, "GA403U"),
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 24/29 mmc: sdhci-msm: Correctly set the load for the regulator
In reply to Sasha LevinFrom: Yuanjie Yang <[email protected]>
[ Upstream commit 20a0c37e44063997391430c4ae09973e9cbc3911 ]
Qualcomm regulator supports two power supply modes: HPM and LPM. Currently, the sdhci-msm.c driver does not set the load to adjust the current for eMMC and SD. If the regulator dont't set correct load in LPM state, it will lead to the inability to properly initialize eMMC and SD.
Set the correct regulator current for eMMC and SD to ensure that the device can work normally even when the regulator is in LPM.
--- drivers/mmc/host/sdhci-msm.c | 53 ++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-msm.c +51 -2
@@ -134,9 +134,18 @@/* Timeout value to avoid infinite waiting for pwr_irq */ #define MSM_PWR_IRQ_TIMEOUT_MS 5000 +/* Max load for eMMC Vdd supply */ +#define MMC_VMMC_MAX_LOAD_UA 570000 +/* Max load for eMMC Vdd-io supply */ #define MMC_VQMMC_MAX_LOAD_UA 325000 +/* Max load for SD Vdd supply */ +#define SD_VMMC_MAX_LOAD_UA 800000 + +/* Max load for SD Vdd-io supply */ +#define SD_VQMMC_MAX_LOAD_UA 22000 +#define msm_host_readl (msm_host, host, offset) \ msm_host->var_ops->msm_readl_relaxed(host, offset)
@@ -1403,11 +1412,48 @@ static int sdhci_msm_set_pincfg(struct sdhci_msm_host *msm_host, bool level)return ret; } -static int sdhci_msm_set_vmmc (struct mmc_host *mmc) +static void msm_config_vmmc_regulator (struct mmc_host *mmc,bool hpm) +{ +int load; + +if (!hpm) + load =0 ; +else if (!mmc->card) + load =max (MMC_VMMC_MAX_LOAD_UA ,SD_VMMC_MAX_LOAD_UA ); +else if (mmc_card_mmc (mmc->card)) + load =MMC_VMMC_MAX_LOAD_UA ; +else if (mmc_card_sd (mmc->card)) + load =SD_VMMC_MAX_LOAD_UA ; +else +return ; + +regulator_set_load (mmc->supply.vmmc, load); +} + +static void msm_config_vqmmc_regulator (struct mmc_host *mmc,bool hpm) +{ +int load; + +if (!hpm) + load =0 ; +else if (!mmc->card) + load =max (MMC_VQMMC_MAX_LOAD_UA ,SD_VQMMC_MAX_LOAD_UA ); +else if (mmc_card_sd (mmc->card)) + load =SD_VQMMC_MAX_LOAD_UA ; +else +return ; + +regulator_set_load (mmc->supply.vqmmc, load); +} + +static int sdhci_msm_set_vmmc (struct sdhci_msm_host *msm_host, +struct mmc_host *mmc,bool hpm) {if (IS_ERR (mmc->supply.vmmc))return 0 ; +msm_config_vmmc_regulator (mmc, hpm); +return mmc_regulator_set_ocr (mmc, mmc->supply.vmmc, mmc->ios.vdd); }
@@ -1420,6 +1466,8 @@ static int msm_toggle_vqmmc(struct sdhci_msm_host *msm_host,if (msm_host->vqmmc_enabled == level)return 0 ; +msm_config_vqmmc_regulator (mmc, level); +if (level) {/* Set the IO voltage regulator to default voltage level */ if (msm_host->caps_0 &CORE_3_0V_SUPPORT )
@@ -1642,7 +1690,8 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) }if (pwr_state) { - ret =sdhci_msm_set_vmmc (mmc); + ret =sdhci_msm_set_vmmc (msm_host, mmc, + pwr_state &REQ_BUS_ON );if (!ret) ret =sdhci_msm_set_vqmmc (msm_host, mmc, pwr_state &REQ_BUS_ON );
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 25/29 octeon_ep: update tx/rx stats locally for persistence
In reply to Sasha LevinFrom: Shinas Rasheed <[email protected]>
[ Upstream commit 10fad79846e49f67ad1a0a05910837125c6ca9ad ]
Update tx/rx stats locally, so that ndo_get_stats64()
can use that and not rely on per queue resources to obtain statistics. The latter used to cause race conditions when the device stopped.
--- .../marvell/octeon_ep/octep_ethtool.c | 41 ++++++++----------- .../ethernet/marvell/octeon_ep/octep_main.c | 19 ++++----- .../ethernet/marvell/octeon_ep/octep_main.h | 6 +++ .../net/ethernet/marvell/octeon_ep/octep_rx.c | 11 ++--- .../net/ethernet/marvell/octeon_ep/octep_rx.h | 4 +- .../net/ethernet/marvell/octeon_ep/octep_tx.c | 7 ++-- .../net/ethernet/marvell/octeon_ep/octep_tx.h | 4 +- 7 files changed, 45 insertions(+), 47 deletions(-)
drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c +17 -24
@@ -157,17 +157,14 @@ octep_get_ethtool_stats(struct net_device *netdev, iface_rx_stats, iface_tx_stats); -for (q =0 ; q < oct->num_oqs; q++) { -struct octep_iq *iq = oct->iq[q]; -struct octep_oq *oq = oct->oq[q]; - - tx_packets += iq->stats.instr_completed; - tx_bytes += iq->stats.bytes_sent; - tx_busy_errors += iq->stats.tx_busy; - - rx_packets += oq->stats.packets; - rx_bytes += oq->stats.bytes; - rx_alloc_errors += oq->stats.alloc_failures; +for (q =0 ; q <OCTEP_MAX_QUEUES ; q++) { + tx_packets += oct->stats_iq[q].instr_completed; + tx_bytes += oct->stats_iq[q].bytes_sent; + tx_busy_errors += oct->stats_iq[q].tx_busy; + + rx_packets += oct->stats_oq[q].packets; + rx_bytes += oct->stats_oq[q].bytes; + rx_alloc_errors += oct->stats_oq[q].alloc_failures; } i =0 ; data[i++] = rx_packets;
@@ -205,22 +202,18 @@ octep_get_ethtool_stats(struct net_device *netdev, data[i++] = iface_rx_stats->err_pkts;/* Per Tx Queue stats */ -for (q =0 ; q < oct->num_iqs; q++) { -struct octep_iq *iq = oct->iq[q]; - - data[i++] = iq->stats.instr_posted; - data[i++] = iq->stats.instr_completed; - data[i++] = iq->stats.bytes_sent; - data[i++] = iq->stats.tx_busy; +for (q =0 ; q <OCTEP_MAX_QUEUES ; q++) { + data[i++] = oct->stats_iq[q].instr_posted; + data[i++] = oct->stats_iq[q].instr_completed; + data[i++] = oct->stats_iq[q].bytes_sent; + data[i++] = oct->stats_iq[q].tx_busy; }/* Per Rx Queue stats */ -for (q =0 ; q < oct->num_oqs; q++) { -struct octep_oq *oq = oct->oq[q]; - - data[i++] = oq->stats.packets; - data[i++] = oq->stats.bytes; - data[i++] = oq->stats.alloc_failures; +for (q =0 ; q <OCTEP_MAX_QUEUES ; q++) { + data[i++] = oct->stats_oq[q].packets; + data[i++] = oct->stats_oq[q].bytes; + data[i++] = oct->stats_oq[q].alloc_failures; } }
drivers/net/ethernet/marvell/octeon_ep/octep_main.c +8 -11
@@ -822,7 +822,7 @@ static inline int octep_iq_full_check(struct octep_iq *iq)if (unlikely (IQ_INSTR_SPACE (iq) >OCTEP_WAKE_QUEUE_THRESHOLD )) {netif_start_subqueue (iq->netdev, iq->q_no); - iq->stats.restart_cnt++; + iq->stats->restart_cnt++;return 0 ; }
@@ -960,7 +960,7 @@ static netdev_tx_t octep_start_xmit(struct sk_buff *skb,wmb ();/* Ring Doorbell to notify the NIC of new packets */ writel (iq->fill_cnt, iq->doorbell_reg); - iq->stats.instr_posted += iq->fill_cnt; + iq->stats->instr_posted += iq->fill_cnt; iq->fill_cnt =0 ;return NETDEV_TX_OK ;
@@ -991,8 +991,8 @@ static netdev_tx_t octep_start_xmit(struct sk_buff *skb,static void octep_get_stats64 (struct net_device *netdev,struct rtnl_link_stats64 *stats) { -u64 tx_packets, tx_bytes, rx_packets, rx_bytes;struct octep_device *oct =netdev_priv (netdev); +u64 tx_packets, tx_bytes, rx_packets, rx_bytes;int q;if (netif_running (netdev))
@@ -1005,14 +1005,11 @@ static void octep_get_stats64(struct net_device *netdev, tx_bytes =0 ; rx_packets =0 ; rx_bytes =0 ; -for (q =0 ; q < oct->num_oqs; q++) { -struct octep_iq *iq = oct->iq[q]; -struct octep_oq *oq = oct->oq[q]; - - tx_packets += iq->stats.instr_completed; - tx_bytes += iq->stats.bytes_sent; - rx_packets += oq->stats.packets; - rx_bytes += oq->stats.bytes; +for (q =0 ; q <OCTEP_MAX_QUEUES ; q++) { + tx_packets += oct->stats_iq[q].instr_completed; + tx_bytes += oct->stats_iq[q].bytes_sent; + rx_packets += oct->stats_oq[q].packets; + rx_bytes += oct->stats_oq[q].bytes; } stats->tx_packets = tx_packets; stats->tx_bytes = tx_bytes;
drivers/net/ethernet/marvell/octeon_ep/octep_main.h +6 -0
@@ -257,11 +257,17 @@ struct octep_device {/* Pointers to Octeon Tx queues */ struct octep_iq *iq[OCTEP_MAX_IQ ]; +/* Per iq stats */ +struct octep_iq_stats stats_iq[OCTEP_MAX_IQ ]; +/* Rx queues (OQ: Output Queue) */ u16 num_oqs;/* Pointers to Octeon Rx queues */ struct octep_oq *oq[OCTEP_MAX_OQ ]; +/* Per oq stats */ +struct octep_oq_stats stats_oq[OCTEP_MAX_OQ ]; +/* Hardware port number of the PCIe interface */ u16 pcie_port;
drivers/net/ethernet/marvell/octeon_ep/octep_rx.c +6 -5
@@ -87,7 +87,7 @@ static int octep_oq_refill(struct octep_device *oct, struct octep_oq *oq) page =dev_alloc_page ();if (unlikely (!page)) {dev_err (oq->dev,"refill: rx buffer alloc failed\n" ); - oq->stats.alloc_failures++; + oq->stats->alloc_failures++;break ; }
@@ -98,7 +98,7 @@ static int octep_oq_refill(struct octep_device *oct, struct octep_oq *oq)"OQ-%d buffer refill: DMA mapping error!\n" , oq->q_no);put_page (page); - oq->stats.alloc_failures++; + oq->stats->alloc_failures++;break ; } oq->buff_info[refill_idx].page = page;
@@ -134,6 +134,7 @@ static int octep_setup_oq(struct octep_device *oct, int q_no) oq->netdev = oct->netdev; oq->dev = &oct->pdev->dev; oq->q_no = q_no; + oq->stats = &oct->stats_oq[q_no]; oq->max_count =CFG_GET_OQ_NUM_DESC (oct->conf); oq->ring_size_mask = oq->max_count -1 ; oq->buffer_size =CFG_GET_OQ_BUF_SIZE (oct->conf);
@@ -443,7 +444,7 @@ static int __octep_oq_process_rx(struct octep_device *oct,if (!skb) {octep_oq_drop_rx (oq, buff_info, &read_idx, &desc_used); - oq->stats.alloc_failures++; + oq->stats->alloc_failures++;continue ; }skb_reserve (skb, data_offset);
@@ -494,8 +495,8 @@ static int __octep_oq_process_rx(struct octep_device *oct, oq->host_read_idx = read_idx; oq->refill_count += desc_used; - oq->stats.packets += pkt; - oq->stats.bytes += rx_bytes; + oq->stats->packets += pkt; + oq->stats->bytes += rx_bytes;return pkt; }
drivers/net/ethernet/marvell/octeon_ep/octep_rx.h +2 -2
@@ -186,8 +186,8 @@ struct octep_oq {*/ u8 __iomem *pkts_sent_reg; -/* Statistics for this OQ. */ -struct octep_oq_stats stats; +/* Pointer to statistics for this OQ. */ +struct octep_oq_stats *stats;/* Packets pending to be processed */ u32 pkts_pending;
drivers/net/ethernet/marvell/octeon_ep/octep_tx.c +4 -3
@@ -81,9 +81,9 @@ int octep_iq_process_completions(struct octep_iq *iq, u16 budget) } iq->pkts_processed += compl_pkts; - iq->stats.instr_completed += compl_pkts; - iq->stats.bytes_sent += compl_bytes; - iq->stats.sgentry_sent += compl_sg; + iq->stats->instr_completed += compl_pkts; + iq->stats->bytes_sent += compl_bytes; + iq->stats->sgentry_sent += compl_sg; iq->flush_index = fi;netdev_tx_completed_queue (iq->netdev_q, compl_pkts, compl_bytes);
@@ -187,6 +187,7 @@ static int octep_setup_iq(struct octep_device *oct, int q_no) iq->netdev = oct->netdev; iq->dev = &oct->pdev->dev; iq->q_no = q_no; + iq->stats = &oct->stats_iq[q_no]; iq->max_count =CFG_GET_IQ_NUM_DESC (oct->conf); iq->ring_size_mask = iq->max_count -1 ; iq->fill_threshold =CFG_GET_IQ_DB_MIN (oct->conf);
drivers/net/ethernet/marvell/octeon_ep/octep_tx.h +2 -2
@@ -170,8 +170,8 @@ struct octep_iq {*/ u16 flush_index; -/* Statistics for this input queue. */ -struct octep_iq_stats stats; +/* Pointer to statistics for this input queue. */ +struct octep_iq_stats *stats;/* Pointer to the Virtual Base addr of the input ring. */ struct octep_tx_desc_hw *desc_ring;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 26/29 octeon_ep_vf: update tx/rx stats locally for persistence
In reply to Sasha LevinFrom: Shinas Rasheed <[email protected]>
[ Upstream commit f84039939512e6d88b0f2f353695530f123be789 ]
Update tx/rx stats locally, so that ndo_get_stats64()
can use that and not rely on per queue resources to obtain statistics. The latter used to cause race conditions when the device stopped.
--- .../marvell/octeon_ep_vf/octep_vf_ethtool.c | 29 +++++++------------ .../marvell/octeon_ep_vf/octep_vf_main.c | 17 +++++------ .../marvell/octeon_ep_vf/octep_vf_main.h | 6 ++++ .../marvell/octeon_ep_vf/octep_vf_rx.c | 9 +++--- .../marvell/octeon_ep_vf/octep_vf_rx.h | 2 +- .../marvell/octeon_ep_vf/octep_vf_tx.c | 7 +++-- .../marvell/octeon_ep_vf/octep_vf_tx.h | 2 +- 7 files changed, 35 insertions(+), 37 deletions(-)
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_ethtool.c +11 -18
@@ -121,12 +121,9 @@ static void octep_vf_get_ethtool_stats(struct net_device *netdev, iface_tx_stats = &oct->iface_tx_stats; iface_rx_stats = &oct->iface_rx_stats; -for (q =0 ; q < oct->num_oqs; q++) { -struct octep_vf_iq *iq = oct->iq[q]; -struct octep_vf_oq *oq = oct->oq[q]; - - tx_busy_errors += iq->stats.tx_busy; - rx_alloc_errors += oq->stats.alloc_failures; +for (q =0 ; q <OCTEP_VF_MAX_QUEUES ; q++) { + tx_busy_errors += oct->stats_iq[q].tx_busy; + rx_alloc_errors += oct->stats_oq[q].alloc_failures; } i =0 ; data[i++] = rx_alloc_errors;
@@ -141,22 +138,18 @@ static void octep_vf_get_ethtool_stats(struct net_device *netdev, data[i++] = iface_rx_stats->dropped_octets_fifo_full;/* Per Tx Queue stats */ -for (q =0 ; q < oct->num_iqs; q++) { -struct octep_vf_iq *iq = oct->iq[q]; - - data[i++] = iq->stats.instr_posted; - data[i++] = iq->stats.instr_completed; - data[i++] = iq->stats.bytes_sent; - data[i++] = iq->stats.tx_busy; +for (q =0 ; q <OCTEP_VF_MAX_QUEUES ; q++) { + data[i++] = oct->stats_iq[q].instr_posted; + data[i++] = oct->stats_iq[q].instr_completed; + data[i++] = oct->stats_iq[q].bytes_sent; + data[i++] = oct->stats_iq[q].tx_busy; }/* Per Rx Queue stats */ for (q =0 ; q < oct->num_oqs; q++) { -struct octep_vf_oq *oq = oct->oq[q]; - - data[i++] = oq->stats.packets; - data[i++] = oq->stats.bytes; - data[i++] = oq->stats.alloc_failures; + data[i++] = oct->stats_oq[q].packets; + data[i++] = oct->stats_oq[q].bytes; + data[i++] = oct->stats_oq[q].alloc_failures; } }
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c +7 -10
@@ -574,7 +574,7 @@ static int octep_vf_iq_full_check(struct octep_vf_iq *iq)* caused queues to get re-enabled after * being stopped */ - iq->stats.restart_cnt++; + iq->stats->restart_cnt++; fallthrough;case 1 :/* Queue left enabled, since IQ is not yet full*/ return 0 ;
@@ -731,7 +731,7 @@ static netdev_tx_t octep_vf_start_xmit(struct sk_buff *skb,/* Flush the hw descriptors before writing to doorbell */ smp_wmb ();writel (iq->fill_cnt, iq->doorbell_reg); - iq->stats.instr_posted += iq->fill_cnt; + iq->stats->instr_posted += iq->fill_cnt; iq->fill_cnt =0 ;return NETDEV_TX_OK ; }
@@ -786,14 +786,11 @@ static void octep_vf_get_stats64(struct net_device *netdev, tx_bytes =0 ; rx_packets =0 ; rx_bytes =0 ; -for (q =0 ; q < oct->num_oqs; q++) { -struct octep_vf_iq *iq = oct->iq[q]; -struct octep_vf_oq *oq = oct->oq[q]; - - tx_packets += iq->stats.instr_completed; - tx_bytes += iq->stats.bytes_sent; - rx_packets += oq->stats.packets; - rx_bytes += oq->stats.bytes; +for (q =0 ; q <OCTEP_VF_MAX_QUEUES ; q++) { + tx_packets += oct->stats_iq[q].instr_completed; + tx_bytes += oct->stats_iq[q].bytes_sent; + rx_packets += oct->stats_oq[q].packets; + rx_bytes += oct->stats_oq[q].bytes; } stats->tx_packets = tx_packets; stats->tx_bytes = tx_bytes;
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h +6 -0
@@ -246,11 +246,17 @@ struct octep_vf_device {/* Pointers to Octeon Tx queues */ struct octep_vf_iq *iq[OCTEP_VF_MAX_IQ ]; +/* Per iq stats */ +struct octep_vf_iq_stats stats_iq[OCTEP_VF_MAX_IQ ]; +/* Rx queues (OQ: Output Queue) */ u16 num_oqs;/* Pointers to Octeon Rx queues */ struct octep_vf_oq *oq[OCTEP_VF_MAX_OQ ]; +/* Per oq stats */ +struct octep_vf_oq_stats stats_oq[OCTEP_VF_MAX_OQ ]; +/* Hardware port number of the PCIe interface */ u16 pcie_port;
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c +5 -4
@@ -87,7 +87,7 @@ static int octep_vf_oq_refill(struct octep_vf_device *oct, struct octep_vf_oq *o page =dev_alloc_page ();if (unlikely (!page)) {dev_err (oq->dev,"refill: rx buffer alloc failed\n" ); - oq->stats.alloc_failures++; + oq->stats->alloc_failures++;break ; }
@@ -98,7 +98,7 @@ static int octep_vf_oq_refill(struct octep_vf_device *oct, struct octep_vf_oq *o"OQ-%d buffer refill: DMA mapping error!\n" , oq->q_no);put_page (page); - oq->stats.alloc_failures++; + oq->stats->alloc_failures++;break ; } oq->buff_info[refill_idx].page = page;
@@ -134,6 +134,7 @@ static int octep_vf_setup_oq(struct octep_vf_device *oct, int q_no) oq->netdev = oct->netdev; oq->dev = &oct->pdev->dev; oq->q_no = q_no; + oq->stats = &oct->stats_oq[q_no]; oq->max_count =CFG_GET_OQ_NUM_DESC (oct->conf); oq->ring_size_mask = oq->max_count -1 ; oq->buffer_size =CFG_GET_OQ_BUF_SIZE (oct->conf);
@@ -458,8 +459,8 @@ static int __octep_vf_oq_process_rx(struct octep_vf_device *oct, oq->host_read_idx = read_idx; oq->refill_count += desc_used; - oq->stats.packets += pkt; - oq->stats.bytes += rx_bytes; + oq->stats->packets += pkt; + oq->stats->bytes += rx_bytes;return pkt; }
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.h +1 -1
@@ -187,7 +187,7 @@ struct octep_vf_oq {u8 __iomem *pkts_sent_reg;/* Statistics for this OQ. */ -struct octep_vf_oq_stats stats; +struct octep_vf_oq_stats *stats;/* Packets pending to be processed */ u32 pkts_pending;
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.c +4 -3
@@ -82,9 +82,9 @@ int octep_vf_iq_process_completions(struct octep_vf_iq *iq, u16 budget) } iq->pkts_processed += compl_pkts; - iq->stats.instr_completed += compl_pkts; - iq->stats.bytes_sent += compl_bytes; - iq->stats.sgentry_sent += compl_sg; + iq->stats->instr_completed += compl_pkts; + iq->stats->bytes_sent += compl_bytes; + iq->stats->sgentry_sent += compl_sg; iq->flush_index = fi; netif_subqueue_completed_wake(iq->netdev, iq->q_no, compl_pkts,
@@ -186,6 +186,7 @@ static int octep_vf_setup_iq(struct octep_vf_device *oct, int q_no) iq->netdev = oct->netdev; iq->dev = &oct->pdev->dev; iq->q_no = q_no; + iq->stats = &oct->stats_iq[q_no]; iq->max_count =CFG_GET_IQ_NUM_DESC (oct->conf); iq->ring_size_mask = iq->max_count -1 ; iq->fill_threshold =CFG_GET_IQ_DB_MIN (oct->conf);
drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.h +1 -1
@@ -129,7 +129,7 @@ struct octep_vf_iq {u16 flush_index;/* Statistics for this input queue. */ -struct octep_vf_iq_stats stats; +struct octep_vf_iq_stats *stats;/* Pointer to the Virtual Base addr of the input ring. */ struct octep_vf_tx_desc_hw *desc_ring;
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 27/29 tipc: re-order conditions in tipc_crypto_key_rcv()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 5fe71fda89745fc3cd95f70d06e9162b595c3702 ]
On a 32bit system the "keylen + sizeof(struct tipc_aead_key)" math could have an integer wrapping issue. It doesn't matter because the "keylen" is checked on the next line, but just to make life easier for static analysis tools, let's re-order these conditions and avoid the integer overflow.
--- net/tipc/crypto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/crypto.c +2 -2
@@ -2293,8 +2293,8 @@ static bool tipc_crypto_key_rcv(struct tipc_crypto *rx, struct tipc_msg *hdr) keylen =ntohl (*((__be32 *)(data +TIPC_AEAD_ALG_NAME )));/* Verify the supplied size values */ -if (unlikely (size != keylen +sizeof (struct tipc_aead_key ) || - keylen >TIPC_AEAD_KEY_SIZE_MAX )) { +if (unlikely (keylen >TIPC_AEAD_KEY_SIZE_MAX || + size != keylen +sizeof (struct tipc_aead_key ))) {pr_debug ("%s: invalid MSG_CRYPTO key size\n" , rx->name); goto exit; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 28/29 selftests/net/ipsec: Fix Null pointer dereference in rtattr_pack()
In reply to Sasha LevinFrom: Liu Ye <[email protected]>
[ Upstream commit 3a0b7fa095212b51ed63892540c4f249991a2d74 ]
Address Null pointer dereference / undefined behavior in rtattr_pack (note that size is 0 in the bad case).
Flagged by cppcheck as:
tools/testing/selftests/net/ipsec.c:230:25: warning: Possible null pointer
dereference: payload [nullPointer]
memcpy(RTA_DATA(attr), payload, size);
^
tools/testing/selftests/net/ipsec.c:1618:54: note: Calling function 'rtattr_pack',
4th argument 'NULL' value is 0
if (rtattr_pack(&req.nh, sizeof(req), XFRMA_IF_ID, NULL, 0)) {
^
tools/testing/selftests/net/ipsec.c:230:25: note: Null pointer dereference
memcpy(RTA_DATA(attr), payload, size);
^--- tools/testing/selftests/net/ipsec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/net/ipsec.c +2 -1
@@ -227,7 +227,8 @@ static int rtattr_pack(struct nlmsghdr *nh, size_t req_sz, attr->rta_len =RTA_LENGTH (size); attr->rta_type = rta_type; -memcpy (RTA_DATA (attr), payload, size); +if (payload) +memcpy (RTA_DATA (attr), payload, size);return 0 ; }
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 29/29 net: ethernet: ti: am65-cpsw: ensure proper channel cleanup in error path
In reply to Sasha LevinFrom: Roger Quadros <[email protected]>
[ Upstream commit 681eb2beb3efe21e630bcc4881595e3b42dd7948 ]
We are missing netif_napi_del() and am65_cpsw_nuss_free_tx/rx_chns() in error path when am65_cpsw_nuss_init_tx/rx_chns() is used anywhere other than at probe(). i.e. am65_cpsw_nuss_update_tx_rx_chns and am65_cpsw_nuss_resume()
As reported, in am65_cpsw_nuss_update_tx_rx_chns(), if am65_cpsw_nuss_init_tx_chns() partially fails then devm_add_action(dev, am65_cpsw_nuss_free_tx_chns,..) is added but the cleanup via am65_cpsw_nuss_free_tx_chns() will not run.
Same issue exists for am65_cpsw_nuss_init_tx/rx_chns() failures in am65_cpsw_nuss_resume() as well.
This would otherwise require more instances of devm_add/remove_action and is clearly more of a distraction than any benefit.
So, drop devm_add/remove_action for am65_cpsw_nuss_free_tx/rx_chns() and call am65_cpsw_nuss_free_tx/rx_chns() and netif_napi_del() where required.
--- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 67 ++++++++++++++++-------- 1 file changed, 44 insertions(+), 23 deletions(-)
drivers/net/ethernet/ti/am65-cpsw-nuss.c +44 -23
@@ -2201,8 +2201,6 @@ static void am65_cpsw_nuss_remove_tx_chns(struct am65_cpsw_common *common)struct device *dev = common->dev;int i; -devm_remove_action (dev, am65_cpsw_nuss_free_tx_chns, common); - common->tx_ch_rate_msk =0 ;for (i =0 ; i < common->tx_ch_num; i++) {struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i];
@@ -2224,8 +2222,6 @@ static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)for (i =0 ; i < common->tx_ch_num; i++) {struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i]; -netif_napi_add_tx (common->dma_ndev, &tx_chn->napi_tx, - am65_cpsw_nuss_tx_poll);hrtimer_init (&tx_chn->tx_hrtimer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL_PINNED ); tx_chn->tx_hrtimer.function = &am65_cpsw_nuss_tx_timer_callback;
@@ -2238,9 +2234,21 @@ static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common) tx_chn->id, tx_chn->irq, ret); goto err; } + +netif_napi_add_tx (common->dma_ndev, &tx_chn->napi_tx, + am65_cpsw_nuss_tx_poll); } +return 0 ; + err: +for (--i ; i >=0 ; i--) { +struct am65_cpsw_tx_chn *tx_chn = &common->tx_chns[i]; + +netif_napi_del (&tx_chn->napi_tx); +devm_free_irq (dev, tx_chn->irq, tx_chn); + } +return ret; }
@@ -2321,12 +2329,10 @@ static int am65_cpsw_nuss_init_tx_chns(struct am65_cpsw_common *common) goto err; } +return 0 ; + err: - i =devm_add_action (dev, am65_cpsw_nuss_free_tx_chns, common); -if (i) { -dev_err (dev,"Failed to add free_tx_chns action %d\n" , i); -return i; - } +am65_cpsw_nuss_free_tx_chns (common);return ret; }
@@ -2354,7 +2360,6 @@ static void am65_cpsw_nuss_remove_rx_chns(struct am65_cpsw_common *common) rx_chn = &common->rx_chns; flows = rx_chn->flows; -devm_remove_action (dev, am65_cpsw_nuss_free_rx_chns, common);for (i =0 ; i < common->rx_ch_num_flows; i++) {if (!(flows[i].irq <0 ))
@@ -2453,7 +2458,7 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common) i, &rx_flow_cfg);if (ret) {dev_err (dev,"Failed to init rx flow%d %d\n" , i, ret); - goto err; + goto err_flow; }if (!i) fdqring_id =
@@ -2465,14 +2470,12 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)dev_err (dev,"Failed to get rx dma irq %d\n" , flow->irq); ret = flow->irq; - goto err; + goto err_flow; }snprintf (flow->name,sizeof (flow->name),"%s-rx%d" ,dev_name (dev), i); -netif_napi_add (common->dma_ndev, &flow->napi_rx, - am65_cpsw_nuss_rx_poll);hrtimer_init (&flow->rx_hrtimer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL_PINNED ); flow->rx_hrtimer.function = &am65_cpsw_nuss_rx_timer_callback;
@@ -2485,20 +2488,28 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)dev_err (dev,"failure requesting rx %d irq %u, %d\n" , i, flow->irq, ret); flow->irq = -EINVAL ; - goto err; + goto err_flow; } + +netif_napi_add (common->dma_ndev, &flow->napi_rx, + am65_cpsw_nuss_rx_poll); }/* setup classifier to route priorities to flows */ cpsw_ale_classifier_setup_default (common->ale, common->rx_ch_num_flows); -err: - i =devm_add_action (dev, am65_cpsw_nuss_free_rx_chns, common); -if (i) { -dev_err (dev,"Failed to add free_rx_chns action %d\n" , i); -return i; +return 0 ; + +err_flow: +for (--i; i >=0 ; i--) { + flow = &rx_chn->flows[i]; +netif_napi_del (&flow->napi_rx); +devm_free_irq (dev, flow->irq, flow); } +err: +am65_cpsw_nuss_free_rx_chns (common); +return ret; }
@@ -3324,7 +3335,7 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common)return ret; ret =am65_cpsw_nuss_init_rx_chns (common);if (ret) -return ret; + goto err_remove_tx;/* The DMA Channels are not guaranteed to be in a clean state. * Reset and disable them to ensure that they are back to the
@@ -3345,7 +3356,7 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) ret =am65_cpsw_nuss_register_devlink (common);if (ret) -return ret; + goto err_remove_rx;for (i =0 ; i < common->port_num; i++) { port = &common->ports[i];
@@ -3376,6 +3387,10 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) err_cleanup_ndev:am65_cpsw_nuss_cleanup_ndev (common);am65_cpsw_unregister_devlink (common); +err_remove_rx: +am65_cpsw_nuss_remove_rx_chns (common); +err_remove_tx: +am65_cpsw_nuss_remove_tx_chns (common);return ret; }
@@ -3395,6 +3410,8 @@ int am65_cpsw_nuss_update_tx_rx_chns(struct am65_cpsw_common *common,return ret; ret =am65_cpsw_nuss_init_rx_chns (common); +if (ret) +am65_cpsw_nuss_remove_tx_chns (common);return ret; }
@@ -3652,6 +3669,8 @@ static void am65_cpsw_nuss_remove(struct platform_device *pdev)*/ am65_cpsw_nuss_cleanup_ndev (common);am65_cpsw_unregister_devlink (common); +am65_cpsw_nuss_remove_rx_chns (common); +am65_cpsw_nuss_remove_tx_chns (common);am65_cpsw_nuss_phylink_cleanup (common);am65_cpts_release (common->cpts);am65_cpsw_disable_serdes_phy (common);
@@ -3713,8 +3732,10 @@ static int am65_cpsw_nuss_resume(struct device *dev)if (ret)return ret; ret =am65_cpsw_nuss_init_rx_chns (common); -if (ret) +if (ret) { +am65_cpsw_nuss_remove_tx_chns (common);return ret; + }/* If RX IRQ was disabled before suspend, keep it disabled */ for (i =0 ; i < common->rx_ch_num_flows; i++) {
Signature · 1 line
2.39.5