6.15.11-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainerPATCH 139/515 thermal/drivers/qcom-spmi-temp-alarm: Enable stage 2 shutdown when required
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Collins <[email protected]>
[ Upstream commit f8e157ff2df46ddabd930815d196895976227831 ]
Certain TEMP_ALARM GEN2 PMIC peripherals need over-temperature stage 2 automatic PMIC partial shutdown. This will ensure that in the event of reaching the hotter stage 3 over-temperature threshold, repeated faults will be avoided during the automatic PMIC hardware full shutdown. Modify the stage 2 shutdown control logic to ensure that stage 2 shutdown is enabled on all affected PMICs. Read the digital major and minor revision registers to identify these PMICs.
--- drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 43 ++++++++++++++++----- 1 file changed, 34 insertions(+), 9 deletions(-)
drivers/thermal/qcom/qcom-spmi-temp-alarm.c +34 -9
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2011-2015, 2017, 2020, The Linux Foundation. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include <linux/bitops.h>
@@ -16,6 +17,7 @@#include "../thermal_hwmon.h" +#define QPNP_TM_REG_DIG_MINOR 0x00#define QPNP_TM_REG_DIG_MAJOR 0x01#define QPNP_TM_REG_TYPE 0x04#define QPNP_TM_REG_SUBTYPE 0x05
@@ -31,7 +33,7 @@#define STATUS_GEN2_STATE_MASK GENMASK(6, 4)#define STATUS_GEN2_STATE_SHIFT 4 -#define SHUTDOWN_CTRL1_OVERRIDE_S2 BIT(6) +#define SHUTDOWN_CTRL1_OVERRIDE_STAGE2 BIT(6)#define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0)#define SHUTDOWN_CTRL1_RATE_25HZ BIT(3)
@@ -78,6 +80,7 @@ struct qpnp_tm_chip {/* protects .thresh, .stage and chip registers */ struct mutex lock;bool initialized; +bool require_stage2_shutdown;struct iio_channel *adc;const long (*temp_map)[THRESH_COUNT ][STAGE_COUNT ];
@@ -220,13 +223,13 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, {long stage2_threshold_min = (*chip->temp_map)[THRESH_MIN ][1 ];long stage2_threshold_max = (*chip->temp_map)[THRESH_MAX ][1 ]; -bool disable_s2_shutdown = false; +bool disable_stage2_shutdown = false;u8 reg;WARN_ON (!mutex_is_locked (&chip->lock));/* -* Default: S2 and S3 shutdown enabled, thresholds at +* Default: Stage 2 and Stage 3 shutdown enabled, thresholds at * lowest threshold set, monitoring at 25Hz */ reg =SHUTDOWN_CTRL1_RATE_25HZ ;
@@ -241,12 +244,12 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, chip->thresh =THRESH_MAX - ((stage2_threshold_max - temp) /TEMP_THRESH_STEP ); - disable_s2_shutdown = true; + disable_stage2_shutdown = true; }else { chip->thresh =THRESH_MAX ;if (chip->adc) - disable_s2_shutdown = true; + disable_stage2_shutdown = true;else dev_warn(chip->dev, "No ADC is configured and critical temperature %d mC is above the maximum stage 2 threshold of %ld mC! Configuring stage 2 shutdown at %ld mC.\n",
@@ -255,8 +258,8 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, skip: reg |= chip->thresh; -if (disable_s2_shutdown) - reg |=SHUTDOWN_CTRL1_OVERRIDE_S2 ; +if (disable_stage2_shutdown && !chip->require_stage2_shutdown) + reg |=SHUTDOWN_CTRL1_OVERRIDE_STAGE2 ;return qpnp_tm_write (chip,QPNP_TM_REG_SHUTDOWN_CTRL1 , reg); }
@@ -350,8 +353,8 @@ static int qpnp_tm_probe(struct platform_device *pdev) {struct qpnp_tm_chip *chip;struct device_node *node; -u8 type, subtype, dig_major; -u32 res; +u8 type, subtype, dig_major, dig_minor; +u32 res, dig_revision;int ret, irq; node = pdev->dev.of_node;
@@ -402,6 +405,11 @@ static int qpnp_tm_probe(struct platform_device *pdev)return dev_err_probe (&pdev->dev, ret,"could not read dig_major\n" ); + ret =qpnp_tm_read (chip,QPNP_TM_REG_DIG_MINOR , &dig_minor); +if (ret <0 ) +return dev_err_probe (&pdev->dev, ret, +"could not read dig_minor\n" ); +if (type !=QPNP_TM_TYPE || (subtype !=QPNP_TM_SUBTYPE_GEN1 && subtype !=QPNP_TM_SUBTYPE_GEN2 )) { dev_err(&pdev->dev, "invalid type 0x%02x or subtype 0x%02x\n",
@@ -415,6 +423,23 @@ static int qpnp_tm_probe(struct platform_device *pdev)else chip->temp_map = &temp_map_gen1; +if (chip->subtype ==QPNP_TM_SUBTYPE_GEN2 ) { + dig_revision = (dig_major <<8 ) | dig_minor; +/* +* Check if stage 2 automatic partial shutdown must remain +* enabled to avoid potential repeated faults upon reaching +* over-temperature stage 3. +*/ +switch (dig_revision) { +case 0x0001 : +case 0x0002 : +case 0x0100 : +case 0x0101 : + chip->require_stage2_shutdown = true; +break ; + } + } +/* * Register the sensor before initializing the hardware to be able to * read the trip points. get_temp() returns the default temperature
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 140/515 tools/nolibc: define time_t in terms of __kernel_old_time_t
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit d5094bcb5bfdfea2cf0de8aaf77cc65db56cbdb5 ]
Nolibc assumes that the kernel ABI is using a time values that are as large as a long integer. For most ABIs this holds true.
But for x32 this is not correct, as it uses 32bit longs but 64bit times.
Also the 'struct stat' implementation of nolibc relies on timespec::tv_sec and time_t being the same type. While timespec::tv_sec comes from the kernel and is of type __kernel_old_time_t, time_t is defined within nolibc.
Switch to the __kernel_old_time_t to always get the correct type.
--- tools/include/nolibc/std.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/include/nolibc/std.h +3 -1
@@ -20,6 +20,8 @@#include "stdint.h" +#include <linux/types.h> +/* those are commonly provided by sys/types.h */ typedef unsigned int dev_t ;typedef unsigned long ino_t ;
@@ -31,6 +33,6 @@ typedef unsigned long nlink_t;typedef signed long off_t ;typedef signed long blksize_t ;typedef signed long blkcnt_t ; -typedef signed long time_t ; +typedef __kernel_old_time_t time_t ;#endif /* _NOLIBC_STD_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 141/515 iio: adc: ad_sigma_delta: dont overallocate scan buffer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Lechner <[email protected]>
[ Upstream commit 5a2f15c5a8e017d0951e6dc62aa7b5b634f56881 ]
Fix overallocating the size of the scan buffer by converting bits to bytes. The size is meant to be in bytes, so scanbits needs to be divided by 8.
--- drivers/iio/adc/ad_sigma_delta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad_sigma_delta.c +1 -1
@@ -489,7 +489,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)return ret; } - samples_buf_size =ALIGN (slot * indio_dev->channels[0 ].scan_type.storagebits,8 ); + samples_buf_size =ALIGN (slot * indio_dev->channels[0 ].scan_type.storagebits /8 ,8 ); samples_buf_size +=sizeof (int64_t ); samples_buf =devm_krealloc (&sigma_delta->spi->dev, sigma_delta->samples_buf, samples_buf_size,GFP_KERNEL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 142/515 gpio: tps65912: check the return value of regmap_update_bits()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit a0b2a6bbff8c26aafdecd320f38f52c341d5cafa ]
regmap_update_bits() can fail, check its return value like we do elsewhere in the driver.
--- drivers/gpio/gpio-tps65912.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpio/gpio-tps65912.c +5 -2
@@ -49,10 +49,13 @@ static int tps65912_gpio_direction_output(struct gpio_chip *gc, unsigned offset, int value) {struct tps65912_gpio *gpio =gpiochip_get_data (gc); +int ret;/* Set the initial value */ -regmap_update_bits (gpio->tps->regmap,TPS65912_GPIO1 + offset, -GPIO_SET_MASK , value ?GPIO_SET_MASK :0 ); + ret =regmap_update_bits (gpio->tps->regmap,TPS65912_GPIO1 + offset, +GPIO_SET_MASK , value ?GPIO_SET_MASK :0 ); +if (ret) +return ret;return regmap_update_bits (gpio->tps->regmap,TPS65912_GPIO1 + offset,GPIO_CFG_MASK ,GPIO_CFG_MASK );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 143/515 mfd: tps6594: Add TI TPS652G1 support
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Walle <[email protected]>
[ Upstream commit 626bb0a45584d544d84eab909795ccb355062bcc ]
The TPS652G1 is a stripped down version of the TPS65224. From a software point of view, it lacks any voltage monitoring, the watchdog, the ESM and the ADC.
--- drivers/mfd/tps6594-core.c | 88 ++++++++++++++++++++++++++++++++++--- drivers/mfd/tps6594-i2c.c | 10 ++++- drivers/mfd/tps6594-spi.c | 10 ++++- include/linux/mfd/tps6594.h | 1 + 4 files changed, 99 insertions(+), 10 deletions(-)
drivers/mfd/tps6594-core.c +82 -6
@@ -1,6 +1,11 @@// SPDX-License-Identifier: GPL-2.0 /* -* Core functions for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs +* Core functions for following TI PMICs: +* - LP8764 +* - TPS65224 +* - TPS652G1 +* - TPS6593 +* - TPS6594 * * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/ */
@@ -414,6 +419,61 @@ static const unsigned int tps65224_irq_reg[] = { TPS6594_REG_INT_FSM_ERR, }; +/* TPS652G1 Resources */ + +static const struct mfd_cell tps652g1_common_cells[] = { +MFD_CELL_RES ("tps6594-pfsm" , tps65224_pfsm_resources), +MFD_CELL_RES ("tps6594-pinctrl" , tps65224_pinctrl_resources), +MFD_CELL_NAME ("tps6594-regulator" ), +}; + +static const struct regmap_irq tps652g1_irqs[] = { +/* INT_GPIO register */ +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO1 ,2 ,TPS65224_BIT_GPIO1_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO2 ,2 ,TPS65224_BIT_GPIO2_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO3 ,2 ,TPS65224_BIT_GPIO3_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO4 ,2 ,TPS65224_BIT_GPIO4_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO5 ,2 ,TPS65224_BIT_GPIO5_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_GPIO6 ,2 ,TPS65224_BIT_GPIO6_INT ), + +/* INT_STARTUP register */ +REGMAP_IRQ_REG (TPS65224_IRQ_VSENSE ,3 ,TPS65224_BIT_VSENSE_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_ENABLE ,3 ,TPS6594_BIT_ENABLE_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_PB_SHORT ,3 ,TPS65224_BIT_PB_SHORT_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_FSD ,3 ,TPS6594_BIT_FSD_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_SOFT_REBOOT ,3 ,TPS6594_BIT_SOFT_REBOOT_INT ), + +/* INT_MISC register */ +REGMAP_IRQ_REG (TPS65224_IRQ_BIST_PASS ,4 ,TPS6594_BIT_BIST_PASS_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_EXT_CLK ,4 ,TPS6594_BIT_EXT_CLK_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_REG_UNLOCK ,4 ,TPS65224_BIT_REG_UNLOCK_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_TWARN ,4 ,TPS6594_BIT_TWARN_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_PB_LONG ,4 ,TPS65224_BIT_PB_LONG_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_PB_FALL ,4 ,TPS65224_BIT_PB_FALL_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_PB_RISE ,4 ,TPS65224_BIT_PB_RISE_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_ADC_CONV_READY ,4 ,TPS65224_BIT_ADC_CONV_READY_INT ), + +/* INT_MODERATE_ERR register */ +REGMAP_IRQ_REG (TPS65224_IRQ_TSD_ORD ,5 ,TPS6594_BIT_TSD_ORD_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_BIST_FAIL ,5 ,TPS6594_BIT_BIST_FAIL_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_REG_CRC_ERR ,5 ,TPS6594_BIT_REG_CRC_ERR_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_RECOV_CNT ,5 ,TPS6594_BIT_RECOV_CNT_INT ), + +/* INT_SEVERE_ERR register */ +REGMAP_IRQ_REG (TPS65224_IRQ_TSD_IMM ,6 ,TPS6594_BIT_TSD_IMM_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_VCCA_OVP ,6 ,TPS6594_BIT_VCCA_OVP_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_PFSM_ERR ,6 ,TPS6594_BIT_PFSM_ERR_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_BG_XMON ,6 ,TPS65224_BIT_BG_XMON_INT ), + +/* INT_FSM_ERR register */ +REGMAP_IRQ_REG (TPS65224_IRQ_IMM_SHUTDOWN ,7 ,TPS6594_BIT_IMM_SHUTDOWN_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_ORD_SHUTDOWN ,7 ,TPS6594_BIT_ORD_SHUTDOWN_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_MCU_PWR_ERR ,7 ,TPS6594_BIT_MCU_PWR_ERR_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_SOC_PWR_ERR ,7 ,TPS6594_BIT_SOC_PWR_ERR_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_COMM_ERR ,7 ,TPS6594_BIT_COMM_ERR_INT ), +REGMAP_IRQ_REG (TPS65224_IRQ_I2C2_ERR ,7 ,TPS65224_BIT_I2C2_ERR_INT ), +}; +static inline unsigned int tps6594_get_irq_reg (struct regmap_irq_chip_data *data,unsigned int base,int index) {
@@ -443,7 +503,7 @@ static int tps6594_handle_post_irq(void *irq_drv_data)* a new interrupt. */ if (tps->use_crc) { -if (tps->chip_id ==TPS65224 ) { +if (tps->chip_id ==TPS65224 || tps->chip_id ==TPS652G1 ) { regmap_reg =TPS6594_REG_INT_FSM_ERR ; mask_val =TPS6594_BIT_COMM_ERR_INT ; }else {
@@ -481,6 +541,18 @@ static struct regmap_irq_chip tps65224_irq_chip = { .handle_post_irq = tps6594_handle_post_irq, }; +static struct regmap_irq_chip tps652g1_irq_chip = { + .ack_base =TPS6594_REG_INT_BUCK , + .ack_invert =1 , + .clear_ack =1 , + .init_ack_masked =1 , + .num_regs =ARRAY_SIZE (tps65224_irq_reg), + .irqs = tps652g1_irqs, + .num_irqs =ARRAY_SIZE (tps652g1_irqs), + .get_irq_reg = tps65224_get_irq_reg, + .handle_post_irq = tps6594_handle_post_irq, +}; +static const struct regmap_range tps6594_volatile_ranges[] = {regmap_reg_range (TPS6594_REG_INT_TOP ,TPS6594_REG_STAT_READBACK_ERR ),regmap_reg_range (TPS6594_REG_RTC_STATUS ,TPS6594_REG_RTC_STATUS ),
@@ -507,7 +579,7 @@ static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)int ret;unsigned int regmap_reg, mask_val; -if (tps->chip_id ==TPS65224 ) { +if (tps->chip_id ==TPS65224 || tps->chip_id ==TPS652G1 ) { regmap_reg =TPS6594_REG_CONFIG_2 ; mask_val =TPS65224_BIT_I2C1_SPI_CRC_EN ; }else {
@@ -537,7 +609,7 @@ static int tps6594_set_crc_feature(struct tps6594 *tps)int ret;unsigned int regmap_reg, mask_val; -if (tps->chip_id ==TPS65224 ) { +if (tps->chip_id ==TPS65224 || tps->chip_id ==TPS652G1 ) { regmap_reg =TPS6594_REG_CONFIG_2 ; mask_val =TPS65224_BIT_I2C1_SPI_CRC_EN ; }else {
@@ -628,6 +700,10 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc) irq_chip = &tps65224_irq_chip; n_cells =ARRAY_SIZE (tps65224_common_cells); cells = tps65224_common_cells; + }else if (tps->chip_id ==TPS652G1 ) { + irq_chip = &tps652g1_irq_chip; + n_cells =ARRAY_SIZE (tps652g1_common_cells); + cells = tps652g1_common_cells; }else { irq_chip = &tps6594_irq_chip; n_cells =ARRAY_SIZE (tps6594_common_cells);
@@ -651,8 +727,8 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)if (ret)return dev_err_probe (dev, ret,"Failed to add common child devices\n" ); -/* No RTC for LP8764 and TPS65224 */ -if (tps->chip_id !=LP8764 && tps->chip_id !=TPS65224 ) { +/* No RTC for LP8764, TPS65224 and TPS652G1 */ +if (tps->chip_id !=LP8764 && tps->chip_id !=TPS65224 && tps->chip_id !=TPS652G1 ) { ret =devm_mfd_add_devices (dev,PLATFORM_DEVID_AUTO , tps6594_rtc_cells,ARRAY_SIZE (tps6594_rtc_cells),NULL ,0 ,regmap_irq_get_domain (tps->irq_data));
drivers/mfd/tps6594-i2c.c +8 -2
@@ -1,6 +1,11 @@// SPDX-License-Identifier: GPL-2.0 /* -* I2C access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs +* I2C access driver for the following TI PMICs: +* - LP8764 +* - TPS65224 +* - TPS652G1 +* - TPS6593 +* - TPS6594 * * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/ */
@@ -197,6 +202,7 @@ static const struct of_device_id tps6594_i2c_of_match_table[] = { { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, }, { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, }, { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, }, + { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, }, {} }; MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
@@ -222,7 +228,7 @@ static int tps6594_i2c_probe(struct i2c_client *client)return dev_err_probe (dev, -EINVAL ,"Failed to find matching chip ID\n" ); tps->chip_id = (unsigned long )match->data; -if (tps->chip_id ==TPS65224 ) +if (tps->chip_id ==TPS65224 || tps->chip_id ==TPS652G1 ) tps6594_i2c_regmap_config.volatile_table = &tps65224_volatile_table; tps->regmap =devm_regmap_init (dev,NULL , client, &tps6594_i2c_regmap_config);
drivers/mfd/tps6594-spi.c +8 -2
@@ -1,6 +1,11 @@// SPDX-License-Identifier: GPL-2.0 /* -* SPI access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs +* SPI access driver for the following TI PMICs: +* - LP8764 +* - TPS65224 +* - TPS652G1 +* - TPS6593 +* - TPS6594 * * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/ */
@@ -82,6 +87,7 @@ static const struct of_device_id tps6594_spi_of_match_table[] = { { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, }, { .compatible = "ti,lp8764-q1", .data = (void *)LP8764, }, { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, }, + { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, }, {} }; MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
@@ -107,7 +113,7 @@ static int tps6594_spi_probe(struct spi_device *spi)return dev_err_probe (dev, -EINVAL ,"Failed to find matching chip ID\n" ); tps->chip_id = (unsigned long )match->data; -if (tps->chip_id ==TPS65224 ) +if (tps->chip_id ==TPS65224 || tps->chip_id ==TPS652G1 ) tps6594_spi_regmap_config.volatile_table = &tps65224_volatile_table; tps->regmap =devm_regmap_init (dev,NULL , spi, &tps6594_spi_regmap_config);
include/linux/mfd/tps6594.h +1 -0
@@ -19,6 +19,7 @@ enum pmic_id {TPS6593 ,LP8764 ,TPS65224 , + TPS652G1, };/* Macro to get page index from register address */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 144/515 ARM: tegra: Use I/O memcpy to write to IRAM
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Kling <[email protected]>
[ Upstream commit 398e67e0f5ae04b29bcc9cbf342e339fe9d3f6f1 ]
Kasan crashes the kernel trying to check boundaries when using the normal memcpy.
--- arch/arm/mach-tegra/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-tegra/reset.c +1 -1
@@ -63,7 +63,7 @@ static void __init tegra_cpu_reset_handler_enable(void)BUG_ON (is_enabled);BUG_ON (tegra_cpu_reset_handler_size >TEGRA_IRAM_RESET_HANDLER_SIZE ); -memcpy (iram_base, (void *)__tegra_cpu_reset_handler_start, +memcpy_toio (iram_base, (void *)__tegra_cpu_reset_handler_start, tegra_cpu_reset_handler_size); err =call_firmware_op (set_cpu_boot_addr,0 , reset_address);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 145/515 tools/build: Fix s390(x) cross-compilation with clang
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit a40f0cdce78be8a559ee8a85c908049c65a410b2 ]
The heuristic to derive a clang target triple from a GCC one does not work for s390. GCC uses "s390-linux" while clang expects "s390x-linux" or "powerz-linux".
Add an explicit override.
--- tools/scripts/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/scripts/Makefile.include +3 -1
@@ -101,7 +101,9 @@ else ifneq ($(CROSS_COMPILE),) # Allow userspace to override CLANG_CROSS_FLAGS to specify their own # sysroots and flags or to avoid the GCC call in pure Clang builds. ifeq ($(CLANG_CROSS_FLAGS),) -CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) +CLANG_TARGET := $(notdir $(CROSS_COMPILE:%-=%)) +CLANG_TARGET := $(subst s390-linux,s390x-linux,$(CLANG_TARGET)) +CLANG_CROSS_FLAGS := --target=$(CLANG_TARGET) GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null)) ifneq ($(GCC_TOOLCHAIN_DIR),) CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 146/515 selftests: tracing: Use mutex_unlock for testing glob filter
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit a089bb2822a49b0c5777a8936f82c1f8629231fb ]
Since commit c5b6ababd21a ("locking/mutex: implement mutex_trylock_nested") makes mutex_trylock() as an inlined function if CONFIG_DEBUG_LOCK_ALLOC=y, we can not use mutex_trylock() for testing the glob filter of ftrace.
Use mutex_unlock instead.
--- .../testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc +1 -1
@@ -29,7 +29,7 @@ ftrace_filter_check 'schedule*' '^schedule.*$' ftrace_filter_check '*pin*lock' '.*pin.*lock$' # filter by start*mid* -ftrace_filter_check 'mutex*try*' '^mutex.*try.*' +ftrace_filter_check 'mutex*unl*' '^mutex.*unl.*' # Advanced full-glob matching feature is recently supported. # Skip the tests if we are sure the kernel does not support it.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 147/515 ACPI: PRM: Reduce unnecessary printing to avoid user confusion
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhu Qiyu <[email protected]>
[ Upstream commit 3db5648c4d608b5483470efc1da9780b081242dd ]
Commit 088984c8d54c ("ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM handler and context") introduced non-essential printing "Failed to find VA for GUID: xxxx, PA: 0x0" which may confuse users to think that something wrong is going on while it is not the case.
According to the PRM Spec Section 4.1.2 [1], both static data buffer address and ACPI parameter buffer address may be NULL if they are not needed, so there is no need to print out the "Failed to find VA ... " in those cases.
--- drivers/acpi/prmt.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
drivers/acpi/prmt.c +24 -2
@@ -85,8 +85,6 @@ static u64 efi_pa_va_lookup(efi_guid_t *guid, u64 pa) } } -pr_warn ("Failed to find VA for GUID: %pUL, PA: 0x%llx" , guid, pa); -return 0 ; }
@@ -154,13 +152,37 @@ acpi_parse_prmt(union acpi_subtable_headers *header, const unsigned long end)guid_copy (&th->guid, (guid_t *)handler_info->handler_guid); th->handler_addr = (void *)efi_pa_va_lookup (&th->guid, handler_info->handler_address); +/* +* Print a warning message if handler_addr is zero which is not expected to +* ever happen. +*/ +if (unlikely (!th->handler_addr)) +pr_warn ("Failed to find VA of handler for GUID: %pUL, PA: 0x%llx" , + &th->guid, handler_info->handler_address); th->static_data_buffer_addr =efi_pa_va_lookup (&th->guid, handler_info->static_data_buffer_address); +/* +* According to the PRM specification, static_data_buffer_address can be zero, +* so avoid printing a warning message in that case. Otherwise, if the +* return value of efi_pa_va_lookup() is zero, print the message. +*/ +if (unlikely (!th->static_data_buffer_addr && handler_info->static_data_buffer_address)) +pr_warn ("Failed to find VA of static data buffer for GUID: %pUL, PA: 0x%llx" , + &th->guid, handler_info->static_data_buffer_address); th->acpi_param_buffer_addr =efi_pa_va_lookup (&th->guid, handler_info->acpi_param_buffer_address); +/* +* According to the PRM specification, acpi_param_buffer_address can be zero, +* so avoid printing a warning message in that case. Otherwise, if the +* return value of efi_pa_va_lookup() is zero, print the message. +*/ +if (unlikely (!th->acpi_param_buffer_addr && handler_info->acpi_param_buffer_address)) +pr_warn ("Failed to find VA of acpi param buffer for GUID: %pUL, PA: 0x%llx" , + &th->guid, handler_info->acpi_param_buffer_address); + }while (++cur_handler < tm->handler_count && (handler_info =get_next_handler (handler_info)));return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 148/515 firmware: arm_scmi: power_control: Ensure SCMI_SYSPOWER_IDLE is set early during resume
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peng Fan <[email protected]>
[ Upstream commit 9a0658d3991e6c82df87584b253454842f22f965 ]
Fix a race condition where a second suspend notification from another SCMI agent wakes the system before SCMI_SYSPOWER_IDLE is set, leading to ignored suspend requests. This is due to interrupts triggering early execution of scmi_userspace_notifier() before the SCMI state is updated.
To resolve this, set SCMI_SYSPOWER_IDLE earlier in the device resume path, prior to thaw_processes(). This ensures the SCMI state is correct when the notifier runs, allowing the system to suspend again as expected.
On some platforms using SCMI, SCP cannot distinguish between CPU idle and suspend since both result in cluster power-off. By explicitly setting the idle state early, the Linux SCMI agent can correctly re-suspend in response to external notifications.
Message-Id: <[email protected]>
--- .../firmware/arm_scmi/scmi_power_control.c | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
drivers/firmware/arm_scmi/scmi_power_control.c +17 -5
@@ -46,6 +46,7 @@#include <linux/math.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/pm.h> #include <linux/printk.h> #include <linux/reboot.h> #include <linux/scmi_protocol.h>
@@ -324,12 +325,7 @@ static int scmi_userspace_notifier(struct notifier_block *nb,static void scmi_suspend_work_func (struct work_struct *work) { -struct scmi_syspower_conf *sc = - container_of(work, struct scmi_syspower_conf, suspend_work); -pm_suspend (PM_SUSPEND_MEM ); - - sc->state =SCMI_SYSPOWER_IDLE ; }static int scmi_syspower_probe (struct scmi_device *sdev)
@@ -354,6 +350,7 @@ static int scmi_syspower_probe(struct scmi_device *sdev) sc->required_transition =SCMI_SYSTEM_MAX ; sc->userspace_nb.notifier_call = &scmi_userspace_notifier; sc->dev = &sdev->dev; +dev_set_drvdata (&sdev->dev, sc);INIT_WORK (&sc->suspend_work, scmi_suspend_work_func);
@@ -363,6 +360,18 @@ static int scmi_syspower_probe(struct scmi_device *sdev) NULL, &sc->userspace_nb); } +static int scmi_system_power_resume (struct device *dev) +{ +struct scmi_syspower_conf *sc =dev_get_drvdata (dev); + + sc->state =SCMI_SYSPOWER_IDLE ; +return 0 ; +} + +static const struct dev_pm_ops scmi_system_power_pmops = { +SET_SYSTEM_SLEEP_PM_OPS (NULL , scmi_system_power_resume) +}; +static const struct scmi_device_id scmi_id_table[] = { {SCMI_PROTOCOL_SYSTEM ,"syspower" }, { },
@@ -370,6 +379,9 @@ static const struct scmi_device_id scmi_id_table[] = {MODULE_DEVICE_TABLE (scmi, scmi_id_table);static struct scmi_driver scmi_system_power_driver = { + .driver = { + .pm = &scmi_system_power_pmops, + }, .name ="scmi-system-power" , .probe = scmi_syspower_probe, .id_table = scmi_id_table,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 149/515 firmware: tegra: Fix IVC dependency problems
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thierry Reding <[email protected]>
[ Upstream commit 78eb18020a88a4eed15f5af7700ed570642ff8f1 ]
The IVC code is library code that other drivers need to select if they need that library. However, if the symbol is user-selectable this can lead to conflicts.
Fix this by making the symbol only selectable for COMPILE_TEST and add a select TEGRA_IVC to TEGRA_BPMP, which is currently the only user.
--- drivers/firmware/tegra/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/firmware/tegra/Kconfig +3 -2
@@ -2,7 +2,7 @@ menu "Tegra firmware driver" config TEGRA_IVC - bool "Tegra IVC protocol" + bool "Tegra IVC protocol" if COMPILE_TEST depends on ARCH_TEGRA help IVC (Inter-VM Communication) protocol is part of the IPC
@@ -13,8 +13,9 @@ config TEGRA_IVC config TEGRA_BPMP bool "Tegra BPMP driver" - depends on ARCH_TEGRA && TEGRA_HSP_MBOX && TEGRA_IVC + depends on ARCH_TEGRA && TEGRA_HSP_MBOX depends on !CPU_BIG_ENDIAN + select TEGRA_IVC help BPMP (Boot and Power Management Processor) is designed to off-loading the PM functions which include clock/DVFS/thermal/power from the CPU.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 150/515 ALSA: hda: add MODULE_FIRMWARE for cs35l41/cs35l56
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: GalaxySnail <[email protected]>
[ Upstream commit 6eda9429501508196001845998bb8c73307d311a ]
add firmware information in the .modinfo section, so that userspace tools can find out firmware required by cs35l41/cs35l56 kernel module
--- sound/pci/hda/cs35l41_hda.c | 2 ++ sound/pci/hda/cs35l56_hda.c | 4 ++++ 2 files changed, 6 insertions(+)
sound/pci/hda/cs35l41_hda.c +2 -0
@@ -2060,3 +2060,5 @@ MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");MODULE_AUTHOR ("Lucas Tanure, Cirrus Logic Inc, <[email protected]>" );MODULE_LICENSE ("GPL" );MODULE_IMPORT_NS ("FW_CS_DSP" ); +MODULE_FIRMWARE ("cirrus/cs35l41-*.wmfw" ); +MODULE_FIRMWARE ("cirrus/cs35l41-*.bin" );
sound/pci/hda/cs35l56_hda.c +4 -0
@@ -1178,3 +1178,7 @@ MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");MODULE_AUTHOR ("Richard Fitzgerald <[email protected]>" );MODULE_AUTHOR ("Simon Trimmer <[email protected]>" );MODULE_LICENSE ("GPL" ); +MODULE_FIRMWARE ("cirrus/cs35l54-*.wmfw" ); +MODULE_FIRMWARE ("cirrus/cs35l54-*.bin" ); +MODULE_FIRMWARE ("cirrus/cs35l56-*.wmfw" ); +MODULE_FIRMWARE ("cirrus/cs35l56-*.bin" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 151/515 PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 89d9cec3b1e9c49bae9375a2db6dc49bc7468af0 ]
Clear power.needs_force_resume in pm_runtime_reinit() in case it has been set by pm_runtime_force_suspend() invoked from a driver remove callback.
--- drivers/base/power/runtime.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/base/power/runtime.c +5 -0
@@ -1854,6 +1854,11 @@ void pm_runtime_reinit(struct device *dev)pm_runtime_put (dev->parent); } } +/* +* Clear power.needs_force_resume in case it has been set by +* pm_runtime_force_suspend() invoked from a driver remove callback. +*/ + dev->power.needs_force_resume = false; }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 152/515 thermal: sysfs: Return ENODATA instead of EAGAIN for reads
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hsin-Te Yuan <[email protected]>
[ Upstream commit 1a4aabc27e95674837f2e25f4ef340c0469e6203 ]
According to POSIX spec, EAGAIN returned by read with O_NONBLOCK set means the read would block. Hence, the common implementation in nonblocking model will poll the file when the nonblocking read returns EAGAIN. However, when the target file is thermal zone, this mechanism will totally malfunction because thermal zone doesn't implement sysfs notification and thus the poll will never return.
For example, the read in Golang implemnts such method and sometimes hangs at reading some thermal zones via sysfs.
Change to return -ENODATA instead of -EAGAIN to userspace.
--- drivers/thermal/thermal_sysfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/thermal/thermal_sysfs.c +6 -3
@@ -40,10 +40,13 @@ temp_show(struct device *dev, struct device_attribute *attr, char *buf) ret =thermal_zone_get_temp (tz, &temperature); -if (ret) -return ret; +if (!ret) +return sprintf (buf,"%d\n" , temperature); -return sprintf (buf,"%d\n" , temperature); +if (ret == -EAGAIN ) +return -ENODATA ; + +return ret; } static ssize_t
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 153/515 PM: sleep: console: Fix the black screen issue
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: tuhaowen <[email protected]>
[ Upstream commit 4266e8fa56d3d982bf451d382a410b9db432015c ]
When the computer enters sleep status without a monitor connected, the system switches the console to the virtual terminal tty63(SUSPEND_CONSOLE).
If a monitor is subsequently connected before waking up, the system skips the required VT restoration process during wake-up, leaving the console on tty63 instead of switching back to tty1.
To fix this issue, a global flag vt_switch_done is introduced to record whether the system has successfully switched to the suspend console via vt_move_to_console() during suspend.
If the switch was completed, vt_switch_done is set to 1. Later during resume, this flag is checked to ensure that the original console is restored properly by calling vt_move_to_console(orig_fgconsole, 0).
This prevents scenarios where the resume logic skips console restoration due to incorrect detection of the console state, especially when a monitor is reconnected before waking up.
--- kernel/power/console.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/power/console.c +6 -1
@@ -16,6 +16,7 @@#define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1)static int orig_fgconsole, orig_kmsg; +static bool vt_switch_done;static DEFINE_MUTEX (vt_switch_mutex);
@@ -136,17 +137,21 @@ void pm_prepare_console(void)if (orig_fgconsole <0 )return ; + vt_switch_done = true; + orig_kmsg =vt_kmsg_redirect (SUSPEND_CONSOLE );return ; }void pm_restore_console (void ) { -if (!pm_vt_switch ()) +if (!pm_vt_switch () && !vt_switch_done)return ;if (orig_fgconsole >=0 ) {vt_move_to_console (orig_fgconsole,0 );vt_kmsg_redirect (orig_kmsg); } + + vt_switch_done = false; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 154/515 ACPI: processor: fix acpi_object initialization
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Ott <[email protected]>
[ Upstream commit 13edf7539211d8f7d0068ce3ed143005f1da3547 ]
Initialization of the local acpi_object in acpi_processor_get_info() only sets the first 4 bytes to zero and is thus incomplete. This is indicated by messages like:
acpi ACPI0007:be: Invalid PBLK length [166288104]
Fix this by initializing all 16 bytes of the processor member of that union.
--- drivers/acpi/acpi_processor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/acpi_processor.c +1 -1
@@ -275,7 +275,7 @@ static inline int acpi_processor_hotadd_init(struct acpi_processor *pr,static int acpi_processor_get_info (struct acpi_device *device) { -union acpi_object object = {0 }; +union acpi_object object = { .processor = {0 } };struct acpi_buffer buffer = {sizeof (union acpi_object ), &object };struct acpi_processor *pr =acpi_driver_data (device);int device_declaration =0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 155/515 mmc: sdhci-msm: Ensure SD card power isnt ON when card removed
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarthak Garg <[email protected]>
[ Upstream commit db58532188ebf51d52b1d7693d9e94c76b926e9f ]
Many mobile phones feature multi-card tray designs, where the same tray is used for both SD and SIM cards. If the SD card is placed at the outermost location in the tray, the SIM card may come in contact with SD card power-supply while removing the tray, possibly resulting in SIM damage.
To prevent that, make sure the SD card is really inserted by reading the Card Detect pin state. If it's not, turn off the power in sdhci_msm_check_power_status() and also set the BUS_FAIL power state on the controller as part of pwr_irq handling for BUS_ON request.
--- drivers/mmc/host/sdhci-msm.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/mmc/host/sdhci-msm.c +14 -0
@@ -1564,6 +1564,7 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type) {struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host);struct sdhci_msm_host *msm_host =sdhci_pltfm_priv (pltfm_host); +struct mmc_host *mmc = host->mmc;bool done = false;u32 val =SWITCHABLE_SIGNALING_VOLTAGE ; const struct sdhci_msm_offset *msm_offset =
@@ -1621,6 +1622,12 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type)"%s: pwr_irq for req: (%d) timed out\n" , mmc_hostname(host->mmc), req_type); } + +if ((req_type &REQ_BUS_ON ) && mmc->card && !mmc->ops->get_cd (mmc)) { +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + host->pwr =0 ; + } +pr_debug ("%s: %s: request %d done\n" ,mmc_hostname (host->mmc), __func__, req_type); }
@@ -1679,6 +1686,13 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq)udelay (10 ); } +if ((irq_status &CORE_PWRCTL_BUS_ON ) && mmc->card && + !mmc->ops->get_cd (mmc)) { +msm_host_writel (msm_host,CORE_PWRCTL_BUS_FAIL , host, + msm_offset->core_pwrctl_ctl); +return ; + } +/* Handle BUS ON/OFF*/ if (irq_status &CORE_PWRCTL_BUS_ON ) { pwr_state =REQ_BUS_ON ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 156/515 ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit 4734c8b46b901cff2feda8b82abc710b65dc31c1 ]
When a GHES (Generic Hardware Error Source) triggers a panic, add the TAINT_MACHINE_CHECK taint flag to the kernel. This explicitly marks the kernel as tainted due to a machine check event, improving diagnostics and post-mortem analysis. The taint is set with LOCKDEP_STILL_OK to indicate lockdep remains valid.
At large scale deployment, this helps to quickly determine panics that are coming due to hardware failures.
--- drivers/acpi/apei/ghes.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/acpi/apei/ghes.c +2 -0
@@ -1099,6 +1099,8 @@ static void __ghes_panic(struct ghes *ghes,__ghes_print_estatus (KERN_EMERG , ghes->generic, estatus); +add_taint (TAINT_MACHINE_CHECK ,LOCKDEP_STILL_OK ); +ghes_clear_estatus (ghes, estatus, buf_paddr, fixmap_idx);if (!panic_timeout)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 157/515 irqchip/renesas-rzv2h: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit de2942828e7670526289f098df7e50b112e8ff1e ]
The interrupt controller found on RZ/G3E doesn't provide any facility to configure the wakeup sources. That's the reason why the driver lacks the irq_set_wake() callback for the interrupt chip.
But this prevent to properly enter power management states like "suspend to idle".
Enable the flags IRQCHIP_SKIP_SET_WAKE and IRQCHIP_MASK_ON_SUSPEND so the interrupt suspend logic can handle the chip correctly.
--- drivers/irqchip/irq-renesas-rzv2h.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/irqchip/irq-renesas-rzv2h.c +3 -1
@@ -394,7 +394,9 @@ static const struct irq_chip rzv2h_icu_chip = { .irq_retrigger = irq_chip_retrigger_hierarchy, .irq_set_type = rzv2h_icu_set_type, .irq_set_affinity = irq_chip_set_affinity_parent, - .flags = IRQCHIP_SET_TYPE_MASKED, + .flags =IRQCHIP_MASK_ON_SUSPEND | +IRQCHIP_SET_TYPE_MASKED | + IRQCHIP_SKIP_SET_WAKE, }; static int rzv2h_icu_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 158/515 selftests: vDSO: vdso_test_getrandom: Always print TAP header
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit 1158220b24674edaf885433153deb4f0e5c7d331 ]
The TAP specification requires that the output begins with a header line. If vgetrandom_init() fails and skips the test, that header line is missing.
Call vgetrandom_init() after ksft_print_header().
--- tools/testing/selftests/vDSO/vdso_test_getrandom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/testing/selftests/vDSO/vdso_test_getrandom.c +4 -2
@@ -242,6 +242,7 @@ static void kselftest(void)pid_t child;ksft_print_header (); +vgetrandom_init ();ksft_set_plan (2 );for (size_t i =0 ; i <1000 ; ++i) {
@@ -295,8 +296,6 @@ static void usage(const char *argv0)int main (int argc,char *argv[]) { -vgetrandom_init (); -if (argc ==1 ) {kselftest ();return 0 ;
@@ -306,6 +305,9 @@ int main(int argc, char *argv[])usage (argv[0 ]);return 1 ; } + +vgetrandom_init (); +if (!strcmp (argv[1 ],"bench-single" ))bench_single ();else if (!strcmp (argv[1 ],"bench-multi" ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 159/515 pps: clients: gpio: fix interrupt handling order in remove path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eliav Farber <[email protected]>
[ Upstream commit 6bca1e955830808dc90e0506b2951b4256b81bbb ]
The interrupt handler in pps_gpio_probe() is registered after calling pps_register_source() using devm_request_irq(). However, in the corresponding remove function, pps_unregister_source() is called before the IRQ is freed, since devm-managed resources are released after the remove function completes.
This creates a potential race condition where an interrupt may occur after the PPS source is unregistered but before the handler is removed, possibly leading to a kernel panic.
To prevent this, switch from devm-managed IRQ registration to manual management by using request_irq() and calling free_irq() explicitly in the remove path before unregistering the PPS source. This ensures the interrupt handler is safely removed before deactivating the PPS source.
--- drivers/pps/clients/pps-gpio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pps/clients/pps-gpio.c +3 -2
@@ -210,8 +210,8 @@ static int pps_gpio_probe(struct platform_device *pdev) }/* register IRQ interrupt handler */ - ret =devm_request_irq (dev, data->irq, pps_gpio_irq_handler, -get_irqf_trigger_flags (data), data->info.name, data); + ret =request_irq (data->irq, pps_gpio_irq_handler, +get_irqf_trigger_flags (data), data->info.name, data);if (ret) {pps_unregister_source (data->pps);dev_err (dev,"failed to acquire IRQ %d\n" , data->irq);
@@ -228,6 +228,7 @@ static void pps_gpio_remove(struct platform_device *pdev) {struct pps_gpio_device_data *data =platform_get_drvdata (pdev); +free_irq (data->irq, data);pps_unregister_source (data->pps);timer_delete_sync (&data->echo_timer);/* reset echo pin in any case */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 160/515 reset: brcmstb: Enable reset drivers for ARCH_BCM2835
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Robinson <[email protected]>
[ Upstream commit 1d99f92f71b6b4b2eee776562c991428490f71ef ]
The BRCMSTB and BRCMSTB_RESCAL reset drivers are also used in the BCM2712, AKA the RPi5. The RPi platforms have typically used the ARCH_BCM2835, and the PCIe support for this SoC can use this config which depends on these drivers so enable building them when just that arch option is enabled to ensure the platform works as expected.
--- drivers/reset/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/reset/Kconfig +5 -5
@@ -51,8 +51,8 @@ config RESET_BERLIN config RESET_BRCMSTB tristate "Broadcom STB reset controller" - depends on ARCH_BRCMSTB || COMPILE_TEST - default ARCH_BRCMSTB + depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + default ARCH_BRCMSTB || ARCH_BCM2835 help This enables the reset controller driver for Broadcom STB SoCs using a SUN_TOP_CTRL_SW_INIT style controller.
@@ -60,11 +60,11 @@ config RESET_BRCMSTB config RESET_BRCMSTB_RESCAL tristate "Broadcom STB RESCAL reset controller" depends on HAS_IOMEM - depends on ARCH_BRCMSTB || COMPILE_TEST - default ARCH_BRCMSTB + depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST + default ARCH_BRCMSTB || ARCH_BCM2835 help This enables the RESCAL reset controller for SATA, PCIe0, or PCIe1 on - BCM7216. + BCM7216 or the BCM2712. config RESET_EYEQ bool "Mobileye EyeQ reset controller"
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 161/515 ASoC: SDCA: Add flag for unused IRQs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit 775f5729b47d8737f4f98e0141f61b3358245398 ]
Zero is a valid SDCA IRQ interrupt position so add a special value to indicate that the IRQ is not used.
--- include/sound/sdca_function.h | 2 ++ sound/soc/sdca/sdca_functions.c | 2 ++ 2 files changed, 4 insertions(+)
include/sound/sdca_function.h +2 -0
@@ -16,6 +16,8 @@ struct device;struct sdca_entity ;struct sdca_function_desc ; +#define SDCA_NO_INTERRUPT -1 +/* * The addressing space for SDCA relies on 7 bits for Entities, so a * maximum of 128 Entities per function can be represented.
sound/soc/sdca/sdca_functions.c +2 -0
@@ -912,6 +912,8 @@ static int find_sdca_entity_control(struct device *dev, struct sdca_entity *enti &tmp);if (!ret) control->interrupt_position = tmp; +else + control->interrupt_position =SDCA_NO_INTERRUPT ; control->label =find_sdca_control_label (dev, entity, control);if (!control->label)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 162/515 char: misc: Fix improper and inaccurate error code returned by misc_init()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 0ef1fe4bc38673db72e39b700b29c50dfcc5a415 ]
misc_init() returns -EIO for __register_chrdev() invocation failure, but:
- -EIO is for I/O error normally, but __register_chrdev() does not do I/O.
- -EIO can not cover various error codes returned by __register_chrdev().
Fix by returning error code of __register_chrdev().
--- drivers/char/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/misc.c +2 -2
@@ -314,8 +314,8 @@ static int __init misc_init(void)if (err) goto fail_remove; - err = -EIO ; -if (__register_chrdev (MISC_MAJOR ,0 ,MINORMASK +1 ,"misc" , &misc_fops)) + err =__register_chrdev (MISC_MAJOR ,0 ,MINORMASK +1 ,"misc" , &misc_fops); +if (err <0 ) goto fail_printk;return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 163/515 mei: bus: Check for still connected devices in mei_cl_bus_dev_release()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 35e8a426b16adbecae7a4e0e3c00fc8d0273db53 ]
mei_cl_bus_dev_release() also frees the mei-client (struct mei_cl) belonging to the device being released.
If there are bugs like the just fixed bug in the ACE/CSI2 mei drivers, the mei-client being freed might still be part of the mei_device's file_list and iterating over this list after the freeing will then trigger a use-afer-free bug.
Add a check to mei_cl_bus_dev_release() to make sure that the to-be-freed mei-client is not on the mei_device's file_list.
--- drivers/misc/mei/bus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/misc/mei/bus.c +6 -0
@@ -1301,10 +1301,16 @@ static void mei_dev_bus_put(struct mei_device *bus)static void mei_cl_bus_dev_release (struct device *dev) {struct mei_cl_device *cldev =to_mei_cl_device (dev); +struct mei_device *mdev = cldev->cl->dev; +struct mei_cl *cl;mei_cl_flush_queues (cldev->cl,NULL );mei_me_cl_put (cldev->me_cl);mei_dev_bus_put (cldev->bus); + +list_for_each_entry (cl, &mdev->file_list, link) +WARN_ON (cl == cldev->cl); +kfree (cldev->cl);kfree (cldev); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 164/515 mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ulf Hansson <[email protected]>
[ Upstream commit 47a255f7d2eabee06cfbf5b1c2379749442fd01d ]
In the error path of sd_set_power_mode() we don't update host->power_mode, which could lead to an imbalance of the runtime PM usage count. Fix this by always updating host->power_mode.
--- drivers/mmc/host/rtsx_usb_sdmmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/rtsx_usb_sdmmc.c +1 -3
@@ -1029,9 +1029,7 @@ static int sd_set_power_mode(struct rtsx_usb_sdmmc *host, err =sd_power_on (host); } -if (!err) - host->power_mode = power_mode; - + host->power_mode = power_mode;return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 165/515 platform/chrome: cros_ec_sensorhub: Retries when a sensor is not ready
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gwendal Grignou <[email protected]>
[ Upstream commit 981d7f91aeda17424b29f033249f4fa7cd2a7556 ]
When the EC/ISH starts, it can take a while for all the sensors to be up and running or declared broken.
If the sensor stack return -EBUSY when checking for sensor information, retry up to 50 times.
It has been observed 100ms wait time is enough to have valid sensors ready. It can take more time in case a sensor is really broken and is not coming up.
--- drivers/platform/chrome/cros_ec_sensorhub.c | 23 +++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/platform/chrome/cros_ec_sensorhub.c +19 -4
@@ -8,6 +8,7 @@#include <linux/init.h> #include <linux/device.h> +#include <linux/delay.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_data/cros_ec_commands.h>
@@ -18,6 +19,7 @@#include <linux/types.h> #define DRV_NAME "cros-ec-sensorhub" +#define CROS_EC_CMD_INFO_RETRIES 50static void cros_ec_sensorhub_free_sensor (void *arg) {
@@ -53,7 +55,7 @@ static int cros_ec_sensorhub_register(struct device *dev,int sensor_type[MOTIONSENSE_TYPE_MAX ] = {0 };struct cros_ec_command *msg = sensorhub->msg;struct cros_ec_dev *ec = sensorhub->ec; -int ret, i; +int ret, i, retries;char *name;
@@ -65,12 +67,25 @@ static int cros_ec_sensorhub_register(struct device *dev, sensorhub->params->cmd =MOTIONSENSE_CMD_INFO ; sensorhub->params->info.sensor_num = i; - ret =cros_ec_cmd_xfer_status (ec->ec_dev, msg); + retries =CROS_EC_CMD_INFO_RETRIES ; +do { + ret =cros_ec_cmd_xfer_status (ec->ec_dev, msg); +if (ret == -EBUSY ) { +/* The EC is still busy initializing sensors. */ +usleep_range (5000 ,6000 ); + retries--; + } + }while (ret == -EBUSY && retries); +if (ret <0 ) { -dev_warn (dev,"no info for EC sensor %d : %d/%d\n" , - i, ret, msg->result); +dev_err (dev,"no info for EC sensor %d : %d/%d\n" , + i, ret, msg->result);continue ; } +if (retries <CROS_EC_CMD_INFO_RETRIES ) { +dev_warn (dev,"%d retries needed to bring up sensor %d\n" , +CROS_EC_CMD_INFO_RETRIES - retries, i); + }switch (sensorhub->resp->info.type) {case MOTIONSENSE_TYPE_ACCEL :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 166/515 ALSA: hda: Handle the jack polling always via a work
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 5f7e54b23e4d253eff3b10b12d6fa92d28d7dddc ]
We used to call directly hda_jackpoll_work() from a couple of places for updating the jack and notify to user-space, but this makes rather the code flow fragile. Namely, because of those direct calls, hda_jackpoll_work() uses snd_hda_power_up_pm() and *_down_pm() calls instead of the standard snd_hda_power_up() and *_down() calls. The latter pair assures the runtime PM resume sync, so it can avoid the race against the PM callbacks gracefully, while the former pair may continue if called concurrently, hence it may race (by design).
In this patch, we change the call pattern of hda_jackpoll_work(); now all callers are replaced with the standard snd_hda_jack_report_sync() and the additional schedule_delayed_work().
Since hda_jackpoll_work() is called only from the associated work, it's always outside the PM code path, and we can safely use snd_hda_power_up() and *_down() there instead. This allows us to remove the racy check of power-state in hda_jackpoll_work(), as well as the tricky cancel_delayed_work() and rescheduling at hda_codec_runtime_suspend().
--- sound/pci/hda/hda_codec.c | 41 +++++++++++++-------------------------- 1 file changed, 14 insertions(+), 27 deletions(-)
sound/pci/hda/hda_codec.c +14 -27
@@ -639,24 +639,16 @@ static void hda_jackpoll_work(struct work_struct *work)struct hda_codec *codec = container_of(work, struct hda_codec, jackpoll_work.work); -/* for non-polling trigger: we need nothing if already powered on */ -if (!codec->jackpoll_interval &&snd_hdac_is_power_on (&codec->core)) +if (!codec->jackpoll_interval)return ;/* the power-up/down sequence triggers the runtime resume */ -snd_hda_power_up_pm (codec); +snd_hda_power_up (codec);/* update jacks manually if polling is required, too */ -if (codec->jackpoll_interval) { -snd_hda_jack_set_dirty_all (codec); -snd_hda_jack_poll_all (codec); - } -snd_hda_power_down_pm (codec); - -if (!codec->jackpoll_interval) -return ; - -schedule_delayed_work (&codec->jackpoll_work, - codec->jackpoll_interval); +snd_hda_jack_set_dirty_all (codec); +snd_hda_jack_poll_all (codec); +schedule_delayed_work (&codec->jackpoll_work, codec->jackpoll_interval); +snd_hda_power_down (codec); }/* release all pincfg lists */
@@ -2926,12 +2918,12 @@ static void hda_call_codec_resume(struct hda_codec *codec)snd_hda_regmap_sync (codec); } -if (codec->jackpoll_interval) -hda_jackpoll_work (&codec->jackpoll_work.work); -else -snd_hda_jack_report_sync (codec); +snd_hda_jack_report_sync (codec); codec->core.dev.power.power_state =PMSG_ON ;snd_hdac_leave_pm (&codec->core); +if (codec->jackpoll_interval) +schedule_delayed_work (&codec->jackpoll_work, + codec->jackpoll_interval); }static int hda_codec_runtime_suspend (struct device *dev)
@@ -2943,8 +2935,6 @@ static int hda_codec_runtime_suspend(struct device *dev)if (!codec->card)return 0 ; -cancel_delayed_work_sync (&codec->jackpoll_work); - state =hda_call_codec_suspend (codec); if (codec->link_down_at_suspend || (codec_has_clkstop(codec) && codec_has_epss(codec) &&
@@ -2952,10 +2942,6 @@ static int hda_codec_runtime_suspend(struct device *dev)snd_hdac_codec_link_down (&codec->core);snd_hda_codec_display_power (codec, false); -if (codec->bus->jackpoll_in_suspend && - (dev->power.power_state.event !=PM_EVENT_SUSPEND )) -schedule_delayed_work (&codec->jackpoll_work, - codec->jackpoll_interval);return 0 ; }
@@ -3117,10 +3103,11 @@ int snd_hda_codec_build_controls(struct hda_codec *codec)if (err <0 )return err; +snd_hda_jack_report_sync (codec);/* call at the last init point */ if (codec->jackpoll_interval) -hda_jackpoll_work (&codec->jackpoll_work.work); -else -snd_hda_jack_report_sync (codec);/* call at the last init point */ +schedule_delayed_work (&codec->jackpoll_work, + codec->jackpoll_interval); +sync_power_up_states (codec);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 167/515 ALSA: hda: Disable jack polling at shutdown
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
[ Upstream commit 1adcbdf54f76e1004bdf71df4eb1888c26e7ad06 ]
Although the jack polling is canceled at shutdown in snd_hda_codec_shutdown(), it might be still re-triggered when the work is being processed at cancel_delayed_work_sync() call. This may result in the unexpected hardware access that should have been already disabled.
For assuring to stop the jack polling, clear codec->jackpoll_interval at shutdown.
--- sound/pci/hda/hda_codec.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/hda_codec.c +1 -0
@@ -3037,6 +3037,7 @@ void snd_hda_codec_shutdown(struct hda_codec *codec)if (!codec->core.registered)return ; + codec->jackpoll_interval =0 ;/* don't poll any longer */ cancel_delayed_work_sync (&codec->jackpoll_work);list_for_each_entry (cpcm, &codec->pcm_list_head, list)snd_pcm_suspend_all (cpcm->pcm);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 168/515 x86/bugs: Avoid warning when overriding return thunk
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawan Gupta <[email protected]>
[ Upstream commit 9f85fdb9fc5a1bd308a10a0a7d7e34f2712ba58b ]
The purpose of the warning is to prevent an unexpected change to the return thunk mitigation. However, there are legitimate cases where the return thunk is intentionally set more than once. For example, ITS and SRSO both can set the return thunk after retbleed has set it. In both the cases retbleed is still mitigated.
Replace the warning with an info about the active return thunk.
--- arch/x86/kernel/cpu/bugs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/bugs.c +2 -3
@@ -70,10 +70,9 @@ void (*x86_return_thunk)(void) __ro_after_init = __x86_return_thunk;static void __init set_return_thunk (void *thunk) { -if (x86_return_thunk != __x86_return_thunk) -pr_warn ("x86/bugs: return thunk changed\n" ); - x86_return_thunk = thunk; + +pr_info ("active return thunk: %ps\n" , thunk); }/* Update SPEC_CTRL MSR and its cached copy unconditionally */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 169/515 ASoC: hdac_hdmi: Rate limit logging on connection and disconnection
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Brown <[email protected]>
[ Upstream commit c4ca928a6db1593802cd945f075a7e21dd0430c1 ]
We currently log parse failures for ELD data and some disconnection events as errors without rate limiting. These log messages can be triggered very frequently in some situations, especially ELD parsing when there is nothing connected to a HDMI port which will generate:
hdmi-audio-codec hdmi-audio-codec.1.auto: HDMI: Unknown ELD version 0
While there's doubtless work that could be done on reducing the number of connection notification callbacks it's possible these may be legitimately generated by poor quality physical connections so let's use rate limiting to mitigate the log spam for the parse errors and lower the severity for disconnect logging to debug level.
--- sound/soc/codecs/hdac_hdmi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
sound/soc/codecs/hdac_hdmi.c +6 -4
@@ -1232,7 +1232,8 @@ static int hdac_hdmi_parse_eld(struct hdac_device *hdev, >> DRM_ELD_VER_SHIFT;if (ver !=ELD_VER_CEA_861D && ver !=ELD_VER_PARTIAL ) { -dev_err (&hdev->dev,"HDMI: Unknown ELD version %d\n" , ver); +dev_err_ratelimited (&hdev->dev, +"HDMI: Unknown ELD version %d\n" , ver);return -EINVAL ; }
@@ -1240,7 +1241,8 @@ static int hdac_hdmi_parse_eld(struct hdac_device *hdev, DRM_ELD_MNL_MASK) >> DRM_ELD_MNL_SHIFT;if (mnl >ELD_MAX_MNL ) { -dev_err (&hdev->dev,"HDMI: MNL Invalid %d\n" , mnl); +dev_err_ratelimited (&hdev->dev, +"HDMI: MNL Invalid %d\n" , mnl);return -EINVAL ; }
@@ -1299,8 +1301,8 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin,if (!port->eld.monitor_present || !port->eld.eld_valid) { -dev_err (&hdev->dev,"%s: disconnect for pin:port %d:%d\n" , - __func__, pin->nid, port->id); +dev_dbg (&hdev->dev,"%s: disconnect for pin:port %d:%d\n" , + __func__, pin->nid, port->id);/* * PCMs are not registered during device probe, so don't
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 170/515 ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 87aafc8580acf87fcaf1a7e30ed858d8c8d37d81 ]
code mistakenly used a hardcoded index (codec[1]) instead of iterating, over the codec array using the loop variable i. Use codec[i] instead of codec[1] to match the loop iteration.
--- sound/pci/intel8x0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/intel8x0.c +1 -1
@@ -2249,7 +2249,7 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, tmp |= chip->ac97_sdin[0 ] <<ICH_DI1L_SHIFT ;for (i =1 ; i <4 ; i++) {if (pcm->r[0 ].codec[i]) { - tmp |= chip->ac97_sdin[pcm->r[0 ].codec[1 ]->num] <<ICH_DI2L_SHIFT ; + tmp |= chip->ac97_sdin[pcm->r[0 ].codec[i]->num] <<ICH_DI2L_SHIFT ;break ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 171/515 irqchip/mips-gic: Allow forced affinity
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markus Stockhausen <[email protected]>
[ Upstream commit 2250db8628a0d8293ad2e0671138b848a185fba1 ]
Devices of the Realtek MIPS Otto platform use the official rtl-otto-timer as clock event generator and CPU clocksource. It is registered for each CPU startup via cpuhp_setup_state() and forces the affinity of the clockevent interrupts to the appropriate CPU via irq_force_affinity().
On the "smaller" devices with a vendor specific interrupt controller (supported by irq-realtek-rtl) the registration works fine. The "larger" RTL931x series is based on a MIPS interAptiv dual core with a MIPS GIC controller. Interrupt routing setup is cancelled because gic_set_affinity() does not accept the current (not yet online) CPU as a target.
Relax the checks by evaluating the force parameter that is provided for exactly this purpose like in other drivers. With this the affinity can be set as follows:
- force = false: allow to set affinity to any online cpu
- force = true: allow to set affinity to any cpu
--- drivers/irqchip/irq-mips-gic.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/irqchip/irq-mips-gic.c +6 -2
@@ -375,9 +375,13 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,/* * The GIC specifies that we can only route an interrupt to one VP(E), * ie. CPU in Linux parlance, at a time. Therefore we always route to -* the first online CPU in the mask. +* the first forced or online CPU in the mask. */ - cpu =cpumask_first_and (cpumask, cpu_online_mask); +if (force) + cpu =cpumask_first (cpumask); +else + cpu =cpumask_first_and (cpumask, cpu_online_mask); +if (cpu >=NR_CPUS )return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 172/515 ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
[ Upstream commit 6b3cb7f4341cbf62d41ccf6ea906dbe66be8aa3d ]
Parsing the dapm_widget_tokens is also needed for DSPless mode as it is
setting the snd_soc_dapm_widget.no_wname_in_kcontrol_name flag for the
kcontrol creation from DAPM widgets.
Without that flag set, the following warnings might appear because of long
control names:
ALSA: Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated to 'eqiir.2.1 Post Mixer Analog Playback IIR Eq'
ALSA: Control name 'eqfir.2.1 Post Mixer Analog Playback FIR Eq bytes' truncated to 'eqfir.2.1 Post Mixer Analog Playback FIR Eq'
ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC bytes' truncated to 'drc.2.1 Post Mixer Analog Playback DRC byte'
ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC switch' truncated to 'drc.2.1 Post Mixer Analog Playback DRC swit'
ALSA: Control name 'gain.15.1 Pre Mixer Deepbuffer HDA Analog Volume' truncated to 'gain.15.1 Pre Mixer Deepbuffer HDA Analog V'
--- sound/soc/sof/topology.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
sound/soc/sof/topology.c +13 -2
@@ -2368,14 +2368,25 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tw) { + struct snd_soc_tplg_private *priv = &tw->priv; +int ret; + +/* for snd_soc_dapm_widget.no_wname_in_kcontrol_name */ + ret =sof_parse_tokens (scomp, w, dapm_widget_tokens, +ARRAY_SIZE (dapm_widget_tokens), + priv->array,le32_to_cpu (priv->size)); +if (ret <0 ) { +dev_err (scomp->dev,"failed to parse dapm widget tokens for %s\n" , + w->name); +return ret; + } +if (WIDGET_IS_DAI (w->id)) {static const struct sof_topology_token dai_tokens[] = { {SOF_TKN_DAI_TYPE ,SND_SOC_TPLG_TUPLE_TYPE_STRING , get_token_dai_type,0 }};struct snd_sof_dev *sdev =snd_soc_component_get_drvdata (scomp); -struct snd_soc_tplg_private *priv = &tw->priv;struct snd_sof_widget *swidget;struct snd_sof_dai *sdai; -int ret; swidget =kzalloc (sizeof (*swidget),GFP_KERNEL );if (!swidget)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 173/515 tty: serial: fix print format specifiers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joseph Tilahun <[email protected]>
[ Upstream commit 33a2515abd45c64911955ff1da179589db54f99f ]
The serial info sometimes produces negative TX/RX counts. E.g.:
3: uart:FSL_LPUART mmio:0x02970000 irq:46 tx:-1595870545 rx:339619 RTS|CTS|DTR|DSR|CD
It appears that the print format specifiers don't match with the types of the respective variables. E.g.: All of the fields in struct uart_icount are u32, but the format specifier used is %d, even though u32 is unsigned and %d is for signed integers. Update drivers/tty/serial/serial_core.c to use the proper format specifiers. Reference
https://docs.kernel.org/core-api/printk-formats.html as the documentation for what format specifiers are the proper ones to use for a given C type.
--- drivers/tty/serial/serial_core.c | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/tty/serial/serial_core.c +22 -22
@@ -1337,28 +1337,28 @@ static void uart_sanitize_serial_rs485_delays(struct uart_port *port,if (!port->rs485_supported.delay_rts_before_send) {if (rs485->delay_rts_before_send) {dev_warn_ratelimited (port->dev, -"%s (%d): RTS delay before sending not supported\n" , +"%s (%u): RTS delay before sending not supported\n" , port->name, port->line); } rs485->delay_rts_before_send =0 ; }else if (rs485->delay_rts_before_send >RS485_MAX_RTS_DELAY ) { rs485->delay_rts_before_send =RS485_MAX_RTS_DELAY ;dev_warn_ratelimited (port->dev, -"%s (%d): RTS delay before sending clamped to %u ms\n" , +"%s (%u): RTS delay before sending clamped to %u ms\n" , port->name, port->line, rs485->delay_rts_before_send); }if (!port->rs485_supported.delay_rts_after_send) {if (rs485->delay_rts_after_send) {dev_warn_ratelimited (port->dev, -"%s (%d): RTS delay after sending not supported\n" , +"%s (%u): RTS delay after sending not supported\n" , port->name, port->line); } rs485->delay_rts_after_send =0 ; }else if (rs485->delay_rts_after_send >RS485_MAX_RTS_DELAY ) { rs485->delay_rts_after_send =RS485_MAX_RTS_DELAY ;dev_warn_ratelimited (port->dev, -"%s (%d): RTS delay after sending clamped to %u ms\n" , +"%s (%u): RTS delay after sending clamped to %u ms\n" , port->name, port->line, rs485->delay_rts_after_send); } }
@@ -1388,14 +1388,14 @@ static void uart_sanitize_serial_rs485(struct uart_port *port, struct serial_rs4 rs485->flags &= ~SER_RS485_RTS_AFTER_SEND ;dev_warn_ratelimited (port->dev, -"%s (%d): invalid RTS setting, using RTS_ON_SEND instead\n" , +"%s (%u): invalid RTS setting, using RTS_ON_SEND instead\n" , port->name, port->line); }else { rs485->flags |=SER_RS485_RTS_AFTER_SEND ; rs485->flags &= ~SER_RS485_RTS_ON_SEND ;dev_warn_ratelimited (port->dev, -"%s (%d): invalid RTS setting, using RTS_AFTER_SEND instead\n" , +"%s (%u): invalid RTS setting, using RTS_AFTER_SEND instead\n" , port->name, port->line); } }
@@ -1834,7 +1834,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout) expire = jiffies + timeout; -pr_debug ("uart_wait_until_sent(%d), jiffies=%lu, expire=%lu...\n" , +pr_debug ("uart_wait_until_sent(%u), jiffies=%lu, expire=%lu...\n" , port->line, jiffies, expire);/*
@@ -2029,7 +2029,7 @@ static void uart_line_info(struct seq_file *m, struct uart_state *state)return ; mmio = uport->iotype >=UPIO_MEM ; - seq_printf(m, "%d: uart:%s %s%08llX irq:%d", + seq_printf(m, "%u: uart:%s %s%08llX irq:%u", uport->line, uart_type(uport), mmio ? "mmio:0x" : "port:", mmio ? (unsigned long long)uport->mapbase
@@ -2051,18 +2051,18 @@ static void uart_line_info(struct seq_file *m, struct uart_state *state)if (pm_state !=UART_PM_STATE_ON )uart_change_pm (state, pm_state); -seq_printf (m," tx:%d rx:%d" , +seq_printf (m," tx:%u rx:%u" , uport->icount.tx, uport->icount.rx);if (uport->icount.frame) -seq_printf (m," fe:%d" , uport->icount.frame); +seq_printf (m," fe:%u" , uport->icount.frame);if (uport->icount.parity) -seq_printf (m," pe:%d" , uport->icount.parity); +seq_printf (m," pe:%u" , uport->icount.parity);if (uport->icount.brk) -seq_printf (m," brk:%d" , uport->icount.brk); +seq_printf (m," brk:%u" , uport->icount.brk);if (uport->icount.overrun) -seq_printf (m," oe:%d" , uport->icount.overrun); +seq_printf (m," oe:%u" , uport->icount.overrun);if (uport->icount.buf_overrun) -seq_printf (m," bo:%d" , uport->icount.buf_overrun); +seq_printf (m," bo:%u" , uport->icount.buf_overrun);#define INFOBIT (bit, str) \ if (uport->mctrl & (bit)) \
@@ -2554,7 +2554,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)break ; } - pr_info("%s%s%s at %s (irq = %d, base_baud = %d) is a %s\n", + pr_info("%s%s%s at %s (irq = %u, base_baud = %u) is a %s\n", port->dev ? dev_name(port->dev) : "", port->dev ? ": " : "", port->name,
@@ -2562,7 +2562,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)/* The magic multiplier feature is a bit obscure, so report it too. */ if (port->flags &UPF_MAGIC_MULTIPLIER ) - pr_info("%s%s%s extra baud rates supported: %d, %d", + pr_info("%s%s%s extra baud rates supported: %u, %u", port->dev ? dev_name(port->dev) : "", port->dev ? ": " : "", port->name,
@@ -2961,7 +2961,7 @@ static ssize_t close_delay_show(struct device *dev,struct tty_port *port =dev_get_drvdata (dev);uart_get_info (port, &tmp); -return sprintf (buf,"%d\n" , tmp.close_delay); +return sprintf (buf,"%u\n" , tmp.close_delay); } static ssize_t closing_wait_show(struct device *dev,
@@ -2971,7 +2971,7 @@ static ssize_t closing_wait_show(struct device *dev,struct tty_port *port =dev_get_drvdata (dev);uart_get_info (port, &tmp); -return sprintf (buf,"%d\n" , tmp.closing_wait); +return sprintf (buf,"%u\n" , tmp.closing_wait); } static ssize_t custom_divisor_show(struct device *dev,
@@ -2991,7 +2991,7 @@ static ssize_t io_type_show(struct device *dev,struct tty_port *port =dev_get_drvdata (dev);uart_get_info (port, &tmp); -return sprintf (buf,"%d\n" , tmp.io_type); +return sprintf (buf,"%u\n" , tmp.io_type); } static ssize_t iomem_base_show(struct device *dev,
@@ -3011,7 +3011,7 @@ static ssize_t iomem_reg_shift_show(struct device *dev,struct tty_port *port =dev_get_drvdata (dev);uart_get_info (port, &tmp); -return sprintf (buf,"%d\n" , tmp.iomem_reg_shift); +return sprintf (buf,"%u\n" , tmp.iomem_reg_shift); } static ssize_t console_show(struct device *dev,
@@ -3147,7 +3147,7 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u state->pm_state =UART_PM_STATE_UNDEFINED ;uart_port_set_cons (uport, drv->cons); uport->minor = drv->tty_driver->minor_start + uport->line; - uport->name =kasprintf (GFP_KERNEL ,"%s%d" , drv->dev_name, + uport->name =kasprintf (GFP_KERNEL ,"%s%u" , drv->dev_name, drv->tty_driver->name_base + uport->line);if (!uport->name)return -ENOMEM ;
@@ -3186,7 +3186,7 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *udevice_set_wakeup_capable (tty_dev,1 ); }else { uport->flags |=UPF_DEAD ; -dev_err (uport->dev,"Cannot register tty device on line %d\n" , +dev_err (uport->dev,"Cannot register tty device on line %u\n" , uport->line); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 174/515 ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
[ Upstream commit 2d91cb261cac6d885954b8f5da28b5c176c18131 ]
snd_soc_remove_pcm_runtime() might be called with rtd == NULL which will leads to null pointer dereference.
This was reproduced with topology loading and marking a link as ignore due to missing hardware component on the system.
On module removal the soc_tplg_remove_link() would call snd_soc_remove_pcm_runtime() with rtd == NULL since the link was ignored, no runtime was created.
--- sound/soc/soc-core.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/soc-core.c +3 -0
@@ -1139,6 +1139,9 @@ static int snd_soc_compensate_channel_connection_map(struct snd_soc_card *card,void snd_soc_remove_pcm_runtime (struct snd_soc_card *card,struct snd_soc_pcm_runtime *rtd) { +if (!rtd) +return ; +lockdep_assert_held (&client_mutex);/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 175/515 usb: typec: intel_pmc_mux: Defer probe if SCU IPC isnt present
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Michalec <[email protected]>
[ Upstream commit df9a825f330e76c72d1985bc9bdc4b8981e3d15f ]
If pmc_usb_probe is called before SCU IPC is registered, pmc_usb_probe will fail.
Return -EPROBE_DEFER when pmc_usb_probe doesn't get SCU IPC device, so the probe function can be called again after SCU IPC is initialized.
--- drivers/usb/typec/mux/intel_pmc_mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/mux/intel_pmc_mux.c +1 -1
@@ -754,7 +754,7 @@ static int pmc_usb_probe(struct platform_device *pdev) pmc->ipc =devm_intel_scu_ipc_dev_get (&pdev->dev);if (!pmc->ipc) -return -ENODEV ; +return -EPROBE_DEFER ; pmc->dev = &pdev->dev;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 176/515 usb: core: usb_submit_urb: downgrade type check
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 503bbde34cc3dd2acd231f277ba70c3f9ed22e59 ]
Checking for the endpoint type is no reason for a WARN, as that can cause a reboot. A driver not checking the endpoint type must not cause a reboot, as there is just no point in this. We cannot prevent a device from doing something incorrect as a reaction to a transfer. Hence warning for a mere assumption being wrong is not sensible.
--- drivers/usb/core/urb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/urb.c +1 -1
@@ -500,7 +500,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)/* Check that the pipe's type matches the endpoint's type */ if (usb_pipe_type_check (urb->dev, urb->pipe)) -dev_WARN (&dev->dev,"BOGUS urb xfer, pipe %x != type %x\n" , +dev_warn_once (&dev->dev,"BOGUS urb xfer, pipe %x != type %x\n" ,usb_pipetype (urb->pipe), pipetypes[xfertype]);/* Check against a simple/standard policy */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 177/515 usb: dwc3: xilinx: add shutdown callback
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Radhey Shyam Pandey <[email protected]>
[ Upstream commit 70627bf82e36e61c40c3315e1206e4ea4c02e668 ]
Adds a shutdown callback to ensure that the XHCI stack is properly shutdown in reboot/shutdown path.
In kexec flow, kernel_restart_prepare() performs actions necessary to prepare the system for a restart and invokes device_shutdown. To ensure proper shutdown attach the dwc3 shutdown implementation which mirrors the remove method.
$ kexec -e
<snip>
xhci-hcd xhci-hcd.0.auto: remove, state 1
usb usb1: USB disconnect, device number 1
usb 1-1: USB disconnect, device number 6
xhci-hcd xhci-hcd.0.auto: USB bus 1 deregisteredkexec_core: Starting new kernel
--- drivers/usb/dwc3/dwc3-xilinx.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/dwc3/dwc3-xilinx.c +1 -0
@@ -422,6 +422,7 @@ static const struct dev_pm_ops dwc3_xlnx_dev_pm_ops = {static struct platform_driver dwc3_xlnx_driver = { .probe = dwc3_xlnx_probe, .remove = dwc3_xlnx_remove, + .shutdown = dwc3_xlnx_remove, .driver = { .name ="dwc3-xilinx" , .of_match_table = dwc3_xlnx_of_match,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 178/515 pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gautham R. Shenoy <[email protected]>
[ Upstream commit cda7ac8ce7de84cf32a3871ba5f318aa3b79381e ]
In the function mperf_start(), mperf_monitor snapshots the time, tsc and finally the aperf,mperf MSRs. However, this order of snapshotting in is reversed in mperf_stop(). As a result, the C0 residency (which is computed as delta_mperf * 100 / delta_tsc) is under-reported on CPUs that is 100% busy.
Fix this by snapshotting time, tsc and then aperf,mperf in mperf_stop() in the same order as in mperf_start().
--- tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +2 -2
@@ -240,9 +240,9 @@ static int mperf_stop(void)int cpu;for (cpu =0 ; cpu < cpu_count; cpu++) { -mperf_measure_stats (cpu); -mperf_get_tsc (&tsc_at_measure_end[cpu]);clock_gettime (CLOCK_REALTIME , &time_end[cpu]); +mperf_get_tsc (&tsc_at_measure_end[cpu]); +mperf_measure_stats (cpu); }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 179/515 imx8m-blk-ctrl: set ISI panic write hurry level
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Hałasa <[email protected]>
[ Upstream commit c01fba0b4869cada5403fffff416cd1675dba078 ]
Apparently, ISI needs cache settings similar to LCDIF. Otherwise we get artefacts in the image. Tested on i.MX8MP.
--- drivers/pmdomain/imx/imx8m-blk-ctrl.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pmdomain/imx/imx8m-blk-ctrl.c +10 -0
@@ -665,6 +665,11 @@ static const struct imx8m_blk_ctrl_data imx8mn_disp_blk_ctl_dev_data = {#define LCDIF_1_RD_HURRY GENMASK(15, 13)#define LCDIF_0_RD_HURRY GENMASK(12, 10) +#define ISI_CACHE_CTRL 0x50 +#define ISI_V_WR_HURRY GENMASK(28, 26) +#define ISI_U_WR_HURRY GENMASK(25, 23) +#define ISI_Y_WR_HURRY GENMASK(22, 20) +static int imx8mp_media_power_notifier (struct notifier_block *nb,unsigned long action,void *data) {
@@ -694,6 +699,11 @@ static int imx8mp_media_power_notifier(struct notifier_block *nb,regmap_set_bits (bc->regmap,LCDIF_ARCACHE_CTRL ,FIELD_PREP (LCDIF_1_RD_HURRY ,7 ) |FIELD_PREP (LCDIF_0_RD_HURRY ,7 )); +/* Same here for ISI */ +regmap_set_bits (bc->regmap,ISI_CACHE_CTRL , +FIELD_PREP (ISI_V_WR_HURRY ,7 ) | +FIELD_PREP (ISI_U_WR_HURRY ,7 ) | +FIELD_PREP (ISI_Y_WR_HURRY ,7 )); }return NOTIFY_OK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 180/515 soc: qcom: mdt_loader: Actually use the e_phoff
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Andersson <[email protected]>
[ Upstream commit 47e339cac89143709e84a3b71ba8bd9b2fdd2368 ]
Rather than relying/assuming that the tools generating the firmware places the program headers immediately following the ELF header, use e_phoff as intended to find the program headers.
--- drivers/soc/qcom/mdt_loader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/soc/qcom/mdt_loader.c +5 -5
@@ -83,7 +83,7 @@ ssize_t qcom_mdt_get_size(const struct firmware *fw)int i; ehdr = (struct elf32_hdr *)fw->data; - phdrs = (struct elf32_phdr *)(ehdr +1 ); + phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);for (i =0 ; i < ehdr->e_phnum; i++) { phdr = &phdrs[i];
@@ -135,7 +135,7 @@ void *qcom_mdt_read_metadata(const struct firmware *fw, size_t *data_len,void *data; ehdr = (struct elf32_hdr *)fw->data; - phdrs = (struct elf32_phdr *)(ehdr +1 ); + phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);if (ehdr->e_phnum <2 )return ERR_PTR (-EINVAL );
@@ -215,7 +215,7 @@ int qcom_mdt_pas_init(struct device *dev, const struct firmware *fw,int i; ehdr = (struct elf32_hdr *)fw->data; - phdrs = (struct elf32_phdr *)(ehdr +1 ); + phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);for (i =0 ; i < ehdr->e_phnum; i++) { phdr = &phdrs[i];
@@ -270,7 +270,7 @@ static bool qcom_mdt_bins_are_split(const struct firmware *fw, const char *fw_naint i; ehdr = (struct elf32_hdr *)fw->data; - phdrs = (struct elf32_phdr *)(ehdr +1 ); + phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);for (i =0 ; i < ehdr->e_phnum; i++) {/*
@@ -312,7 +312,7 @@ static int __qcom_mdt_load(struct device *dev, const struct firmware *fw, is_split =qcom_mdt_bins_are_split (fw, fw_name); ehdr = (struct elf32_hdr *)fw->data; - phdrs = (struct elf32_phdr *)(ehdr +1 ); + phdrs = (struct elf32_phdr *)(fw->data + ehdr->e_phoff);for (i =0 ; i < ehdr->e_phnum; i++) { phdr = &phdrs[i];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 181/515 platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kees Cook <[email protected]>
[ Upstream commit 6418a8504187dc7f5b6f9d0649c03e362cb0664b ]
When KCOV is enabled all functions get instrumented, unless the __no_sanitize_coverage attribute is used. To prepare for __no_sanitize_coverage being applied to __init functions[1], we have to handle differences in how GCC's inline optimizations get resolved. For thinkpad_acpi routines, this means forcing two functions to be inline with __always_inline.
--- drivers/platform/x86/thinkpad_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +2 -2
@@ -558,12 +558,12 @@ static unsigned long __init tpacpi_check_quirks(return 0 ; } -static inline bool __pure __init tpacpi_is_lenovo (void ) +static __always_inline bool __pure __init tpacpi_is_lenovo(void) {return thinkpad_id.vendor ==PCI_VENDOR_ID_LENOVO ; } -static inline bool __pure __init tpacpi_is_ibm (void ) +static __always_inline bool __pure __init tpacpi_is_ibm(void) {return thinkpad_id.vendor ==PCI_VENDOR_ID_IBM ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 182/515 platform/chrome: cros_ec_typec: Defer probe on missing EC parent
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Michalec <[email protected]>
[ Upstream commit 8866f4e557eba43e991f99711515217a95f62d2e ]
If cros_typec_probe is called before EC device is registered, cros_typec_probe will fail. It may happen when cros-ec-typec.ko is loaded before EC bus layer module (e.g. cros_ec_lpcs.ko, cros_ec_spi.ko).
Return -EPROBE_DEFER when cros_typec_probe doesn't get EC device, so the probe function can be called again after EC device is registered.
--- drivers/platform/chrome/cros_ec_typec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/chrome/cros_ec_typec.c +2 -2
@@ -1272,8 +1272,8 @@ static int cros_typec_probe(struct platform_device *pdev) typec->ec =dev_get_drvdata (pdev->dev.parent);if (!typec->ec) { -dev_err (dev,"couldn't find parent EC device\n" ); -return -ENODEV ; +dev_warn (dev,"couldn't find parent EC device\n" ); +return -EPROBE_DEFER ; }platform_set_drvdata (pdev, typec);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 183/515 ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lucy Thrun <[email protected]>
[ Upstream commit a409c60111e6bb98fcabab2aeaa069daa9434ca0 ]
The 'sprintf' call in 'add_tuning_control' may exceed the 44-byte buffer if either string argument is too long. This triggers a compiler warning.
Replaced 'sprintf' with 'snprintf' to limit string lengths to prevent overflow.
--- sound/pci/hda/patch_ca0132.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_ca0132.c +1 -1
@@ -4410,7 +4410,7 @@ static int add_tuning_control(struct hda_codec *codec, } knew.private_value =HDA_COMPOSE_AMP_VAL (nid,1 ,0 , type); -sprintf (namestr,"%s %s Volume" , name, dirstr[dir]); +snprintf (namestr,sizeof (namestr),"%s %s Volume" , name, dirstr[dir]);return snd_hda_ctl_add (codec, nid,snd_ctl_new1 (&knew, codec)); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 184/515 ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe Leroy <[email protected]>
[ Upstream commit 92f59aeb13252265c20e7aef1379a8080c57e0a2 ]
At the time being recalculate_boundary() is implemented with a loop which shows up as costly in a perf profile, as depicted by the annotate below:
0.00 : c057e934: 3d 40 7f ff lis r10,32767
0.03 : c057e938: 61 4a ff ff ori r10,r10,65535
0.21 : c057e93c: 7d 49 50 50 subf r10,r9,r10
5.39 : c057e940: 7d 3c 4b 78 mr r28,r9
2.11 : c057e944: 55 29 08 3c slwi r9,r9,1
3.04 : c057e948: 7c 09 50 40 cmplw r9,r10
2.47 : c057e94c: 40 81 ff f4 ble c057e940 <snd_pcm_ioctl+0xee0>Total: 13.2% on that simple loop.
But what the loop does is to multiply the boundary by 2 until it is over the wanted border. This can be avoided by using fls() to get the boundary value order and shift it by the appropriate number of bits at once.
This change provides the following profile:
0.04 : c057f6e8: 3d 20 7f ff lis r9,32767
0.02 : c057f6ec: 61 29 ff ff ori r9,r9,65535
0.34 : c057f6f0: 7d 5a 48 50 subf r10,r26,r9
0.23 : c057f6f4: 7c 1a 50 40 cmplw r26,r10
0.02 : c057f6f8: 41 81 00 20 bgt c057f718 <snd_pcm_ioctl+0xf08>
0.26 : c057f6fc: 7f 47 00 34 cntlzw r7,r26
0.09 : c057f700: 7d 48 00 34 cntlzw r8,r10
0.22 : c057f704: 7d 08 38 50 subf r8,r8,r7
0.04 : c057f708: 7f 5a 40 30 slw r26,r26,r8
0.35 : c057f70c: 7c 0a d0 40 cmplw r10,r26
0.13 : c057f710: 40 80 05 f8 bge c057fd08 <snd_pcm_ioctl+0x14f8>
0.00 : c057f714: 57 5a f8 7e srwi r26,r26,1Total: 1.7% with that loopless alternative.
--- sound/core/pcm_native.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
sound/core/pcm_native.c +15 -4
@@ -24,6 +24,7 @@#include <sound/minors.h> #include <linux/uio.h> #include <linux/delay.h> +#include <linux/bitops.h> #include "pcm_local.h"
@@ -3130,13 +3131,23 @@ struct snd_pcm_sync_ptr32 {static snd_pcm_uframes_t recalculate_boundary (struct snd_pcm_runtime *runtime) {snd_pcm_uframes_t boundary; +snd_pcm_uframes_t border; +int order;if (! runtime->buffer_size)return 0 ; - boundary = runtime->buffer_size; -while (boundary *2 <=0x7fffffffUL - runtime->buffer_size) - boundary *=2 ; -return boundary; + + border =0x7fffffffUL - runtime->buffer_size; +if (runtime->buffer_size > border) +return runtime->buffer_size; + + order =__fls (border) -__fls (runtime->buffer_size); + boundary = runtime->buffer_size << order; + +if (boundary <= border) +return boundary; +else +return boundary /2 ; } static int snd_pcm_ioctl_sync_ptr_compat(struct snd_pcm_substream *substream,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 185/515 ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Ciocaltea <[email protected]>
[ Upstream commit fd3ab72e42e9871a9902b945a2bf8bb87b49c718 ]
Fix all macro related issues identified by checkpatch.pl:
CHECK: Macro argument 'x' may be better as '(x)' to avoid precedence issues
--- sound/usb/mixer_quirks.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
sound/usb/mixer_quirks.c +7 -7
@@ -2153,15 +2153,15 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer)#define SND_RME_CLK_FREQMUL_SHIFT 18#define SND_RME_CLK_FREQMUL_MASK 0x7#define SND_RME_CLK_SYSTEM (x) \ - ((x >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK) + (((x) >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK)#define SND_RME_CLK_AES (x) \ - ((x >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) + (((x) >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)#define SND_RME_CLK_SPDIF (x) \ - ((x >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK) + (((x) >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)#define SND_RME_CLK_SYNC (x) \ - ((x >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK) + (((x) >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK)#define SND_RME_CLK_FREQMUL (x) \ - ((x >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK) + (((x) >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK)#define SND_RME_CLK_AES_LOCK 0x1#define SND_RME_CLK_AES_SYNC 0x4#define SND_RME_CLK_SPDIF_LOCK 0x2
@@ -2170,9 +2170,9 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer)#define SND_RME_SPDIF_FORMAT_SHIFT 5#define SND_RME_BINARY_MASK 0x1#define SND_RME_SPDIF_IF (x) \ - ((x >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK) + (((x) >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK)#define SND_RME_SPDIF_FORMAT (x) \ - ((x >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK) + (((x) >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK)static const u32 snd_rme_rate_table[] = {32000 ,44100 ,48000 ,50000 ,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 186/515 iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Santos <[email protected]>
[ Upstream commit 7e54d932873d91a55d1b89b7389876d78aeeab32 ]
The SYNC_IN pulse width must be at least 1.5 x Tmclk, corresponding to ~2.5 µs at the lowest supported MCLK frequency. Add a 3 µs delay to ensure reliable synchronization timing even for the worst-case scenario.
--- drivers/iio/adc/ad7768-1.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/iio/adc/ad7768-1.c +19 -4
@@ -202,6 +202,24 @@ static int ad7768_spi_reg_write(struct ad7768_state *st,return spi_write (st->spi, st->data.d8,2 ); } +static int ad7768_send_sync_pulse (struct ad7768_state *st) +{ +/* +* The datasheet specifies a minimum SYNC_IN pulse width of 1.5 × Tmclk, +* where Tmclk is the MCLK period. The supported MCLK frequencies range +* from 0.6 MHz to 17 MHz, which corresponds to a minimum SYNC_IN pulse +* width of approximately 2.5 µs in the worst-case scenario (0.6 MHz). +* +* Add a delay to ensure the pulse width is always sufficient to +* trigger synchronization. +*/ +gpiod_set_value_cansleep (st->gpio_sync_in,1 ); +fsleep (3 ); +gpiod_set_value_cansleep (st->gpio_sync_in,0 ); + +return 0 ; +} +static int ad7768_set_mode (struct ad7768_state *st,enum ad7768_conv_mode mode) {
@@ -289,10 +307,7 @@ static int ad7768_set_dig_fil(struct ad7768_state *st,return ret;/* A sync-in pulse is required every time the filter dec rate changes */ -gpiod_set_value (st->gpio_sync_in,1 ); -gpiod_set_value (st->gpio_sync_in,0 ); - -return 0 ; +return ad7768_send_sync_pulse (st); } static int ad7768_set_freq(struct ad7768_state *st,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 187/515 ASoC: codecs: rt5640: Retry DEVICE_ID verification
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xinxin Wan <[email protected]>
[ Upstream commit 19f971057b2d7b99c80530ec1052b45de236a8da ]
To be more resilient to codec-detection failures when the hardware powers on slowly, add retry mechanism to the device verification check. Similar pattern is found throughout a number of Realtek codecs. Our tests show that 60ms delay is sufficient to address readiness issues on rt5640 chip.
--- sound/soc/codecs/rt5640.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/rt5640.c +5 -0
@@ -3013,6 +3013,11 @@ static int rt5640_i2c_probe(struct i2c_client *i2c) }regmap_read (rt5640->regmap,RT5640_VENDOR_ID2 , &val); +if (val !=RT5640_DEVICE_ID ) { +usleep_range (60000 ,100000 ); +regmap_read (rt5640->regmap,RT5640_VENDOR_ID2 , &val); + } +if (val !=RT5640_DEVICE_ID ) {dev_err (&i2c->dev,"Device with ID register %#x is not rt5640/39\n" , val);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 188/515 ASoC: qcom: use drvdata instead of component to keep id
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit 8167f4f42572818fa8153be2b03e4c2120846603 ]
Qcom lpass is using component->id to keep DAI ID (A).
(S) static int lpass_platform_pcmops_open(
sruct snd_soc_component *component,
struct snd_pcm_substream *substream)
{ ^^^^^^^^^(B0)
...
(B1) struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream);
(B2) struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0);
...(B3) unsigned int dai_id = cpu_dai->driver->id;
(A) component->id = dai_id; ... }
This driver can get dai_id from substream (B0 - B3).
In this driver, below functions get dai_id from component->id (A).
(X) lpass_platform_pcmops_suspend()
(Y) lpass_platform_pcmops_resume()
(Z) lpass_platform_copy()
Here, (Z) can get it from substream (B0 - B3), don't need to use component->id (A). On suspend/resume (X)(Y), dai_id can only be obtained from component->id (A), because there is no substream (B0) in function parameter.
But, component->id (A) itself should not be used for such purpose. It is intilialized at snd_soc_component_initialize(), and parsed its ID (= component->id) from device name (a).
int snd_soc_component_initialize(...)
{
...
if (!component->name) {
(a) component->name = fmt_single_name(dev, &component->id);
... ^^^^^^^^^^^^^
}
...
}Unfortunately, current code is broken to start with.
There are many regmaps that the driver cares about, however its only managing one (either dp or i2s) in component suspend/resume path.
I2S regmap is mandatory however other regmaps are setup based on flags like "hdmi_port_enable" and "codec_dma_enable".
Correct thing for suspend/resume path to handle is by checking these flags, instead of using component->id.
--- sound/soc/qcom/lpass-platform.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
sound/soc/qcom/lpass-platform.c +17 -10
@@ -202,7 +202,6 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component,struct regmap *map;unsigned int dai_id = cpu_dai->driver->id; - component->id = dai_id; data =kzalloc (sizeof (*data),GFP_KERNEL );if (!data)return -ENOMEM ;
@@ -1190,13 +1189,14 @@ static int lpass_platform_pcmops_suspend(struct snd_soc_component *component) {struct lpass_data *drvdata =snd_soc_component_get_drvdata (component);struct regmap *map; -unsigned int dai_id = component->id; -if (dai_id ==LPASS_DP_RX ) +if (drvdata->hdmi_port_enable) { map = drvdata->hdmiif_map; -else - map = drvdata->lpaif_map; +regcache_cache_only (map, true); +regcache_mark_dirty (map); + } + map = drvdata->lpaif_map;regcache_cache_only (map, true);regcache_mark_dirty (map);
@@ -1207,14 +1207,19 @@ static int lpass_platform_pcmops_resume(struct snd_soc_component *component) {struct lpass_data *drvdata =snd_soc_component_get_drvdata (component);struct regmap *map; -unsigned int dai_id = component->id; +int ret; -if (dai_id ==LPASS_DP_RX ) +if (drvdata->hdmi_port_enable) { map = drvdata->hdmiif_map; -else - map = drvdata->lpaif_map; +regcache_cache_only (map, false); + ret =regcache_sync (map); +if (ret) +return ret; + } + map = drvdata->lpaif_map;regcache_cache_only (map, false); +return regcache_sync (map); }
@@ -1224,7 +1229,9 @@ static int lpass_platform_copy(struct snd_soc_component *component, unsigned long bytes) {struct snd_pcm_runtime *rt = substream->runtime; -unsigned int dai_id = component->id; +struct snd_soc_pcm_runtime *soc_runtime =snd_soc_substream_to_rtd (substream); +struct snd_soc_dai *cpu_dai =snd_soc_rtd_to_cpu (soc_runtime,0 ); +unsigned int dai_id = cpu_dai->driver->id;int ret =0 ; void __iomem *dma_buf = (void __iomem *) (rt->dma_area + pos +
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 189/515 netfilter: nft_set_pipapo: prefer kvmalloc for scratch maps
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
[ Upstream commit 897eefee2eb73ec6c119a0ca357d7b4a3e92c5ef ]
The scratchmap size depends on the number of elements in the set. For huge sets, each scratch map can easily require very large allocations, e.g. for 100k entries each scratch map will require close to 64kbyte of memory.
--- net/netfilter/nft_set_pipapo.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/netfilter/nft_set_pipapo.c +4 -5
@@ -1219,7 +1219,7 @@ static void pipapo_free_scratch(const struct nft_pipapo_match *m, unsigned int c mem = s; mem -= s->align_off; -kfree (mem); +kvfree (mem); }/**
@@ -1240,10 +1240,9 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,void *scratch_aligned;u32 align_off;#endif - scratch =kzalloc_node (struct_size (scratch, map, - bsize_max *2 ) + -NFT_PIPAPO_ALIGN_HEADROOM , -GFP_KERNEL_ACCOUNT ,cpu_to_node (i)); + scratch =kvzalloc_node (struct_size (scratch, map, bsize_max *2 ) + +NFT_PIPAPO_ALIGN_HEADROOM , +GFP_KERNEL_ACCOUNT ,cpu_to_node (i));if (!scratch) {/* On failure, there's no need to undo previous * allocations: this means that some scratch maps have
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 190/515 selftests: netfilter: Enable CONFIG_INET_SCTP_DIAG
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit ba71a6e58b38aa6f86865d4e18579cb014903692 ]
The config snippet specifies CONFIG_SCTP_DIAG. This was never an option.
Replace CONFIG_SCTP_DIAG with the intended CONFIG_INET_SCTP_DIAG.
--- tools/testing/selftests/net/netfilter/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/netfilter/config +1 -1
@@ -91,4 +91,4 @@ CONFIG_XFRM_STATISTICS=y CONFIG_NET_PKTGEN=m CONFIG_TUN=m CONFIG_INET_DIAG=m -CONFIG_SCTP_DIAG=m +CONFIG_INET_SCTP_DIAG=m
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 191/515 powerpc/thp: tracing: Hide hugepage events under CONFIG_PPC_BOOK3S_64
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit 43cf0e05089afe23dac74fa6e1e109d49f2903c4 ]
The events hugepage_set_pmd, hugepage_set_pud, hugepage_update_pmd and hugepage_update_pud are only called when CONFIG_PPC_BOOK3S_64 is defined. As each event can take up to 5K regardless if they are used or not, it's best not to define them when they are not used. Add #ifdef around these events when they are not used.
--- include/trace/events/thp.h | 2 ++ 1 file changed, 2 insertions(+)
include/trace/events/thp.h +2 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/tracepoint.h> +#ifdef CONFIG_PPC_BOOK3S_64 DECLARE_EVENT_CLASS(hugepage_set, TP_PROTO(unsigned long addr, unsigned long pte),
@@ -66,6 +67,7 @@ DEFINE_EVENT(hugepage_update, hugepage_update_pud, TP_PROTO(unsigned long addr, unsigned long pud, unsigned long clr, unsigned long set), TP_ARGS(addr, pud, clr, set) ); +#endif /* CONFIG_PPC_BOOK3S_64 */ DECLARE_EVENT_CLASS(migration_pmd,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 192/515 verification/dot2k: Make a separate dot2k_templates/Kconfig_container
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
[ Upstream commit 214459699fd202c28b7b9f787e674acbd3af724a ]
A generated container's Kconfig has an incorrect line:
select DA_MON_EVENTS_IMPLICIT
This is due to container generation uses the same template Kconfig file as deterministic automaton monitor.
Therefore, make a separate Kconfig template for container which has only the necessaries for container.
--- tools/verification/dot2/dot2k.py | 3 ++- tools/verification/dot2/dot2k_templates/Kconfig_container | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tools/verification/dot2/dot2k_templates/Kconfig_container
tools/verification/dot2/dot2k.py +2 -1
@@ -35,6 +35,7 @@ class dot2k(Dot2c): self.states = [] self.main_c = self.__read_file(self.monitor_templates_dir + "main_container.c") self.main_h = self.__read_file(self.monitor_templates_dir + "main_container.h") + self.kconfig = self.__read_file(self.monitor_templates_dir + "Kconfig_container") else: super().__init__(file_path, extra_params.get("model_name"))
@@ -44,7 +45,7 @@ class dot2k(Dot2c): self.monitor_type = MonitorType self.main_c = self.__read_file(self.monitor_templates_dir + "main.c") self.trace_h = self.__read_file(self.monitor_templates_dir + "trace.h") - self.kconfig = self.__read_file(self.monitor_templates_dir + "Kconfig") + self.kconfig = self.__read_file(self.monitor_templates_dir + "Kconfig") self.enum_suffix = "_%s" % self.name self.description = extra_params.get("description", self.name) or "auto-generated" self.auto_patch = extra_params.get("auto_patch")
tools/verification/dot2/dot2k_templates/Kconfig_container new file +5 -0
@@ -0,0 +1,5 @@ +config RV_MON_%%MODEL_NAME_UP%% + depends on RV + bool "%%MODEL_NAME%% monitor" + help + %%DESCRIPTION%%
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 193/515 bootconfig: Fix unaligned access when building footer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
[ Upstream commit 6ed5e20466c79e3b3350bae39f678f73cf564b4e ]
Currently we add padding between the bootconfig text and footer to ensure that the footer is aligned within the initramfs image. However, because only the bootconfig data is held in memory, not the full initramfs image, the footer may not be naturally aligned in memory.
This can result in an alignment fault (SIGBUS) when writing the footer on some architectures, such as sparc.
Build the footer in a struct on the stack before adding it to the buffer.
--- tools/bootconfig/main.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
tools/bootconfig/main.c +13 -11
@@ -11,6 +11,7 @@#include <string.h> #include <errno.h> #include <endian.h> +#include <assert.h> #include <linux/bootconfig.h>
@@ -359,7 +360,12 @@ static int delete_xbc(const char *path)static int apply_xbc (const char *path,const char *xbc_path) { -char *buf, *data, *p; +struct { +uint32_t size; +uint32_t csum; +char magic[BOOTCONFIG_MAGIC_LEN ]; + } footer; +char *buf, *data;size_t total_size;struct stat stat;const char *msg;
@@ -430,17 +436,13 @@ static int apply_xbc(const char *path, const char *xbc_path) size += pad;/* Add a footer */ - p = data + size; - *(uint32_t *)p =htole32 (size); - p +=sizeof (uint32_t ); + footer.size =htole32 (size); + footer.csum =htole32 (csum); +memcpy (footer.magic,BOOTCONFIG_MAGIC ,BOOTCONFIG_MAGIC_LEN ); +static_assert (sizeof (footer) ==BOOTCONFIG_FOOTER_SIZE ); +memcpy (data + size, &footer,BOOTCONFIG_FOOTER_SIZE ); - *(uint32_t *)p =htole32 (csum); - p +=sizeof (uint32_t ); - -memcpy (p,BOOTCONFIG_MAGIC ,BOOTCONFIG_MAGIC_LEN ); - p +=BOOTCONFIG_MAGIC_LEN ; - - total_size = p - data; + total_size = size +BOOTCONFIG_FOOTER_SIZE ; ret =write (fd, data, total_size);if (ret < total_size) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 194/515 Bluetooth: btusb: Add new VID/PID 0489/e14e for MT7925
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: En-Wei Wu <[email protected]>
[ Upstream commit 942873c8137fe0015ab37f62f159d88079859c5e ]
Add VID 0489 & PID e14e 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=0489 ProdID=e14e 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
@@ -709,6 +709,8 @@ static const struct usb_device_id quirks_table[] = { BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x0489, 0xe139), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x0489, 0xe14e), .driver_info = BTUSB_MEDIATEK | + BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x0489, 0xe14f), .driver_info = BTUSB_MEDIATEK | BTUSB_WIDEBAND_SPEECH }, { USB_DEVICE(0x0489, 0xe150), .driver_info = BTUSB_MEDIATEK |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 195/515 Bluetooth: hci_event: Add support for handling LE BIG Sync Lost event
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yang Li <[email protected]>
[ Upstream commit b2a5f2e1c127cb431df22e114998ff72eb4578c8 ]
When the BIS source stops, the controller sends an LE BIG Sync Lost event (subevent 0x1E). Currently, this event is not handled, causing the BIS stream to remain active in BlueZ and preventing recovery.
--- include/net/bluetooth/hci.h | 6 +++++ include/net/bluetooth/hci_core.h | 5 ++-- net/bluetooth/hci_conn.c | 3 ++- net/bluetooth/hci_event.c | 39 +++++++++++++++++++++++++++++++- 4 files changed, 49 insertions(+), 4 deletions(-)
include/net/bluetooth/hci.h +6 -0
@@ -2851,6 +2851,12 @@ struct hci_evt_le_big_sync_estabilished {__le16 bis[]; } __packed; +#define HCI_EVT_LE_BIG_SYNC_LOST 0x1e +struct hci_evt_le_big_sync_lost { +__u8 handle; +__u8 reason; +} __packed; +#define HCI_EVT_LE_BIG_INFO_ADV_REPORT 0x22struct hci_evt_le_big_info_adv_report {__le16 sync_handle;
include/net/bluetooth/hci_core.h +3 -2
@@ -1348,7 +1348,8 @@ hci_conn_hash_lookup_big_sync_pend(struct hci_dev *hdev, }static inline struct hci_conn * -hci_conn_hash_lookup_big_state (struct hci_dev *hdev,__u8 handle,__u16 state) +hci_conn_hash_lookup_big_state (struct hci_dev *hdev,__u8 handle,__u16 state, +__u8 role) {struct hci_conn_hash *h = &hdev->conn_hash;struct hci_conn *c;
@@ -1356,7 +1357,7 @@ hci_conn_hash_lookup_big_state(struct hci_dev *hdev, __u8 handle, __u16 state)rcu_read_lock ();list_for_each_entry_rcu (c, &h->list, list) { -if (c->type !=BIS_LINK || c->state != state) +if (c->type !=BIS_LINK || c->state != state || c->role != role)continue ;if (handle == c->iso_qos.bcast.big) {
net/bluetooth/hci_conn.c +2 -1
@@ -2144,7 +2144,8 @@ struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst,struct hci_link *link;/* Look for any BIS that is open for rebinding */ - conn =hci_conn_hash_lookup_big_state (hdev, qos->bcast.big,BT_OPEN ); + conn =hci_conn_hash_lookup_big_state (hdev, qos->bcast.big,BT_OPEN , +HCI_ROLE_MASTER );if (conn) {memcpy (qos, &conn->iso_qos,sizeof (*qos)); conn->state =BT_CONNECTED ;
net/bluetooth/hci_event.c +38 -1
@@ -6880,7 +6880,8 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,/* Connect all BISes that are bound to the BIG */ while ((conn =hci_conn_hash_lookup_big_state (hdev, ev->handle, -BT_BOUND ))) { +BT_BOUND , +HCI_ROLE_MASTER ))) {if (ev->status) {hci_connect_cfm (conn, ev->status);hci_conn_del (conn);
@@ -6996,6 +6997,37 @@ static void hci_le_big_sync_established_evt(struct hci_dev *hdev, void *data,hci_dev_unlock (hdev); } +static void hci_le_big_sync_lost_evt (struct hci_dev *hdev,void *data, +struct sk_buff *skb) +{ +struct hci_evt_le_big_sync_lost *ev = data; +struct hci_conn *bis, *conn; + +bt_dev_dbg (hdev,"big handle 0x%2.2x" , ev->handle); + +hci_dev_lock (hdev); + +/* Delete the pa sync connection */ + bis =hci_conn_hash_lookup_pa_sync_big_handle (hdev, ev->handle); +if (bis) { + conn =hci_conn_hash_lookup_pa_sync_handle (hdev, + bis->sync_handle); +if (conn) +hci_conn_del (conn); + } + +/* Delete each bis connection */ +while ((bis =hci_conn_hash_lookup_big_state (hdev, ev->handle, +BT_CONNECTED , +HCI_ROLE_SLAVE ))) { +clear_bit (HCI_CONN_BIG_SYNC , &bis->flags); +hci_disconn_cfm (bis, ev->reason); +hci_conn_del (bis); + } + +hci_dev_unlock (hdev); +} +static void hci_le_big_info_adv_report_evt (struct hci_dev *hdev,void *data,struct sk_buff *skb) {
@@ -7119,6 +7151,11 @@ static const struct hci_le_ev { hci_le_big_sync_established_evt, sizeof(struct hci_evt_le_big_sync_estabilished), HCI_MAX_EVENT_SIZE), +/* [0x1e = HCI_EVT_LE_BIG_SYNC_LOST] */ +HCI_LE_EV_VL (HCI_EVT_LE_BIG_SYNC_LOST , + hci_le_big_sync_lost_evt, +sizeof (struct hci_evt_le_big_sync_lost ), +HCI_MAX_EVENT_SIZE ),/* [0x22 = HCI_EVT_LE_BIG_INFO_ADV_REPORT] */ HCI_LE_EV_VL(HCI_EVT_LE_BIG_INFO_ADV_REPORT, hci_le_big_info_adv_report_evt,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 196/515 Bluetooth: hci_sock: Reset cookie to zero in hci_sock_free_cookie()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit 4d7936e8a5b1fa803f4a631d2da4a80fa4f0f37f ]
Reset cookie value to 0 instead of 0xffffffff in hci_sock_free_cookie() since:
0 : means cookie has not been assigned yet0xffffffff: means cookie assignment failure
Also fix generating cookie failure with usage shown below:
hci_sock_gen_cookie(sk) // generate cookie hci_sock_free_cookie(sk) // free cookie hci_sock_gen_cookie(sk) // Can't generate cookie any more
--- net/bluetooth/hci_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_sock.c +1 -1
@@ -118,7 +118,7 @@ static void hci_sock_free_cookie(struct sock *sk)int id =hci_pi (sk)->cookie;if (id) { -hci_pi (sk)->cookie =0xffffffff ; +hci_pi (sk)->cookie =0 ;ida_free (&sock_cookie_ida, id); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 197/515 Bluetooth: btusb: Add support for variant of RTL8851BE (USB ID 13d3:3601)
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Uwe Kleine-König <[email protected]>
[ Upstream commit 65b0dca6f9f2c912a77a6ad6cf56f60a895a496b ]
Teach the btusb driver to recognize another variant of the RTL8851BE bluetooth radio.
/sys/kernel/debug/usb/devices reports for that device:
T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=13d3 ProdID=3601 Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA 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=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) 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=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms
--- drivers/bluetooth/btusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/bluetooth/btusb.c +1 -0
@@ -515,6 +515,7 @@ static const struct usb_device_id quirks_table[] = {/* Realtek 8851BE Bluetooth devices */ { USB_DEVICE(0x0bda, 0xb850), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x13d3, 0x3600), .driver_info = BTUSB_REALTEK }, + { USB_DEVICE(0x13d3, 0x3601), .driver_info = BTUSB_REALTEK }, /* Realtek 8851BU Bluetooth devices */ { USB_DEVICE(0x3625, 0x010b), .driver_info = BTUSB_REALTEK |
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 198/515 xen/netfront: Fix TX response spurious interrupts
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anthoine Bourgeois <[email protected]>
[ Upstream commit 114a2de6fa86d99ed9546cc9113a3cad58beef79 ]
We found at Vates that there are lot of spurious interrupts when benchmarking the xen-net PV driver frontend. This issue appeared with a patch that addresses security issue XSA-391 (b27d47950e48 "xen/netfront:
harden netfront against event channel storms"). On an iperf benchmark, spurious interrupts can represent up to 50% of the interrupts.
Spurious interrupts are interrupts that are rised for nothing, there is no work to do. This appends because the function that handles the interrupts ("xennet_tx_buf_gc") is also called at the end of the request path to garbage collect the responses received during the transmission load.
The request path is doing the work that the interrupt handler should have done otherwise. This is particurary true when there is more than one vcpu and get worse linearly with the number of vcpu/queue.
Moreover, this problem is amplifyed by the penalty imposed by a spurious interrupt. When an interrupt is found spurious the interrupt chip will delay the EOI to slowdown the backend. This delay will allow more responses to be handled by the request path and then there will be more chance the next interrupt will not find any work to do, creating a new spurious interrupt.
This causes performance issue. The solution here is to remove the calls from the request path and let the interrupt handler do the processing of the responses. This approch removes most of the spurious interrupts (<0.05%) and also has the benefit of freeing up cycles in the request path, allowing it to process more work, which improves performance compared to masking the spurious interrupt one way or another.
This optimization changes a part of the code that is present since the net frontend driver was upstreamed. There is no similar pattern in the other xen PV drivers. Since the first commit of xen-netfront is a blob that doesn't explain all the design choices I can only guess why this specific mecanism was here. This could have been introduce to compensate a slow backend at the time (maybe the backend was fixed or optimize later) or a small queue. In 18 years, both frontend and backend gain lot of features and optimizations that could have obsolete the feature of reaping completions from the TX path.
Some vif throughput performance figures from a 8 vCPUs, 4GB of RAM HVM guest(s):
Without this patch on the :
vm -> dom0: 4.5Gb/s
vm -> vm: 7.0Gb/s
Without XSA-391 patch (revert of b27d47950e48):
vm -> dom0: 8.3Gb/s
vm -> vm: 8.7Gb/s
With XSA-391 and this patch:
vm -> dom0: 11.5Gb/s
vm -> vm: 12.6Gb/s
v2:
- add revewed and tested by tags
- resend with the maintainers in the recipients list
v3:
- remove Fixes tag but keep the commit ref in the explanation
- add a paragraph on why this code was here
Message-ID: <[email protected]>
--- drivers/net/xen-netfront.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/xen-netfront.c +0 -5
@@ -637,8 +637,6 @@ static int xennet_xdp_xmit_one(struct net_device *dev, tx_stats->packets++;u64_stats_update_end (&tx_stats->syncp); -xennet_tx_buf_gc (queue); -return 0 ; }
@@ -848,9 +846,6 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev tx_stats->packets++;u64_stats_update_end (&tx_stats->syncp); -/* Note: It is not safe to access skb after xennet_tx_buf_gc()! */ -xennet_tx_buf_gc (queue); -if (!netfront_tx_slot_available (queue))netif_tx_stop_queue (netdev_get_tx_queue (dev, queue->id));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 199/515 wifi: iwlwifi: mld: use spec link id and not FW link id
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 170db5f873850a04a8eafd3401b2ea36adb20cea ]
In missed beacon handling, we compare the FW link id to the bss_param_ch_cnt_link_id, which is a spec link id. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mld/link.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mld/link.c +5 -3
@@ -863,21 +863,23 @@ void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld, {const struct iwl_missed_beacons_notif *notif = (const void *)pkt->data;union iwl_dbg_tlv_tp_data tp_data = { .fw_pkt = pkt }; -u32 link_id =le32_to_cpu (notif->link_id); +u32 fw_link_id =le32_to_cpu (notif->link_id);u32 missed_bcon =le32_to_cpu (notif->consec_missed_beacons);u32 missed_bcon_since_rx =le32_to_cpu (notif->consec_missed_beacons_since_last_rx);u32 scnd_lnk_bcn_lost =le32_to_cpu (notif->consec_missed_beacons_other_link);struct ieee80211_bss_conf *link_conf = -iwl_mld_fw_id_to_link_conf (mld, link_id); +iwl_mld_fw_id_to_link_conf (mld, fw_link_id);u32 bss_param_ch_cnt_link_id;struct ieee80211_vif *vif; +u8 link_id;if (WARN_ON (!link_conf))return ; vif = link_conf->vif; + link_id = link_conf->link_id; bss_param_ch_cnt_link_id = link_conf->bss_param_ch_cnt_link_id; IWL_DEBUG_INFO(mld,
@@ -889,7 +891,7 @@ void iwl_mld_handle_missed_beacon_notif(struct iwl_mld *mld, mld->trans->dbg.dump_file_name_ext_valid = true;snprintf (mld->trans->dbg.dump_file_name_ext,IWL_FW_INI_MAX_NAME , -"LinkId_%d_MacType_%d" , link_id, +"LinkId_%d_MacType_%d" , fw_link_id,iwl_mld_mac80211_iftype_to_fw (vif)); iwl_dbg_tlv_time_point(&mld->fwrt,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 200/515 wifi: iwlwifi: mld: avoid outdated reorder buffer head_sn
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avraham Stern <[email protected]>
[ Upstream commit 666357bf3e57c6a68be128825775aee14f9a24f7 ]
If no frames are received on a queue for a while, the reorder buffer head_sn may be an old one. When the next frame that is received on that queue and buffered is a subframe of an AMSDU but not the last subframe, it will not update the buffer's head_sn. When the frame release notification arrives, it will not release the buffered frame because it will look like the notification's NSSN is lower than the buffer's head_sn (because of a wraparound).
Fix it by updating the head_sn when the first frame is buffered.
--- drivers/net/wireless/intel/iwlwifi/mld/agg.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/intel/iwlwifi/mld/agg.c +5 -0
@@ -303,10 +303,15 @@ iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi,* already ahead and it will be dropped. * If the last sub-frame is not on this queue - we will get frame * release notification with up to date NSSN. +* If this is the first frame that is stored in the buffer, the head_sn +* may be outdated. Update it based on the last NSSN to make sure it +* will be released when the frame release notification arrives. */ if (!amsdu || last_subframe)iwl_mld_reorder_release_frames (mld, sta, napi, baid_data, buffer, nssn); +else if (buffer->num_stored ==1 ) + buffer->head_sn = nssn;return IWL_MLD_BUFFERED_SKB ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 201/515 wifi: iwlwifi: mvm: avoid outdated reorder buffer head_sn
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avraham Stern <[email protected]>
[ Upstream commit 422850b29e05e67c9145895bfe559940caa0caa8 ]
If no frames are received on a queue for a while, the reorder buffer head_sn may be an old one. When the next frame that is received on that queue and buffered is a subframe of an AMSDU but not the last subframe, it will not update the buffer's head_sn. When the frame release notification arrives, it will not release the buffered frame because it will look like the notification's NSSN is lower than the buffer's head_sn (because of a wraparound).
Fix it by updating the head_sn when the first frame is buffered.
--- drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +5 -0
@@ -854,10 +854,15 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm,* already ahead and it will be dropped. * If the last sub-frame is not on this queue - we will get frame * release notification with up to date NSSN. +* If this is the first frame that is stored in the buffer, the head_sn +* may be outdated. Update it based on the last NSSN to make sure it +* will be released when the frame release notification arrives. */ if (!amsdu || last_subframe)iwl_mvm_release_frames (mvm, sta, napi, baid_data, buffer, nssn); +else if (buffer->num_stored ==1 ) + buffer->head_sn = nssn;spin_unlock_bh (&buffer->lock);return true;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 202/515 net: usb: cdc-ncm: check for filtering capability
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
[ Upstream commit 61c3e8940f2d8b5bfeaeec4bedc2f3e7d873abb3 ]
If the decice does not support filtering, filtering must not be used and all packets delivered for the upper layers to sort.
--- drivers/net/usb/cdc_ncm.c | 20 ++++++++++++++++---- include/linux/usb/cdc_ncm.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-)
drivers/net/usb/cdc_ncm.c +16 -4
@@ -892,6 +892,10 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ } } +if (ctx->func_desc) + ctx->filtering_supported = !!(ctx->func_desc->bmNetworkCapabilities + &USB_CDC_NCM_NCAP_ETH_FILTER ); + iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber;/* Device-specific flags */
@@ -1898,6 +1902,14 @@ static void cdc_ncm_status(struct usbnet *dev, struct urb *urb) } } +static void cdc_ncm_update_filter (struct usbnet *dev) +{ +struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0 ]; + +if (ctx->filtering_supported) +usbnet_cdc_update_filter (dev); +} +static const struct driver_info cdc_ncm_info = { .description ="CDC NCM (NO ZLP)" , .flags =FLAG_POINTTOPOINT |FLAG_NO_SETINT |FLAG_MULTI_PACKET
@@ -1908,7 +1920,7 @@ static const struct driver_info cdc_ncm_info = { .status = cdc_ncm_status, .rx_fixup = cdc_ncm_rx_fixup, .tx_fixup = cdc_ncm_tx_fixup, - .set_rx_mode = usbnet_cdc_update_filter, + .set_rx_mode = cdc_ncm_update_filter, };/* Same as cdc_ncm_info, but with FLAG_SEND_ZLP */
@@ -1922,7 +1934,7 @@ static const struct driver_info cdc_ncm_zlp_info = { .status = cdc_ncm_status, .rx_fixup = cdc_ncm_rx_fixup, .tx_fixup = cdc_ncm_tx_fixup, - .set_rx_mode = usbnet_cdc_update_filter, + .set_rx_mode = cdc_ncm_update_filter, };/* Same as cdc_ncm_info, but with FLAG_SEND_ZLP */
@@ -1964,7 +1976,7 @@ static const struct driver_info wwan_info = { .status = cdc_ncm_status, .rx_fixup = cdc_ncm_rx_fixup, .tx_fixup = cdc_ncm_tx_fixup, - .set_rx_mode = usbnet_cdc_update_filter, + .set_rx_mode = cdc_ncm_update_filter, };/* Same as wwan_info, but with FLAG_NOARP */
@@ -1978,7 +1990,7 @@ static const struct driver_info wwan_noarp_info = { .status = cdc_ncm_status, .rx_fixup = cdc_ncm_rx_fixup, .tx_fixup = cdc_ncm_tx_fixup, - .set_rx_mode = usbnet_cdc_update_filter, + .set_rx_mode = cdc_ncm_update_filter, };static const struct usb_device_id cdc_devs[] = {
include/linux/usb/cdc_ncm.h +1 -0
@@ -119,6 +119,7 @@ struct cdc_ncm_ctx {u32 timer_interval;u32 max_ndp_size;u8 is_ndp16; +u8 filtering_supported;union {struct usb_cdc_ncm_ndp16 *delayed_ndp16;struct usb_cdc_ncm_ndp32 *delayed_ndp32;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 203/515 wifi: ath12k: Correct tid cleanup when tid setup fails
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit 4a2bf707270f897ab8077baee8ed5842a5321686 ]
Currently, if any error occurs during ath12k_dp_rx_peer_tid_setup(), the tid value is already incremented, even though the corresponding TID is not actually allocated. Proceed to ath12k_dp_rx_peer_tid_delete() starting from unallocated tid, which might leads to freeing unallocated TID and cause potential crash or out-of-bounds access.
Hence, fix by correctly decrementing tid before cleanup to match only the successfully allocated TIDs.
Also, remove tid-- from failure case of ath12k_dp_rx_peer_frag_setup(), as decrementing the tid before cleanup in loop will take care of this.
Compile tested only.
--- drivers/net/wireless/ath/ath12k/dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/dp.c +1 -1
@@ -101,7 +101,7 @@ int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr)return -ENOENT ; } -for (; tid >=0 ; tid--) +for (tid--; tid >=0 ; tid--)ath12k_dp_rx_peer_tid_delete (ar, peer, tid);spin_unlock_bh (&ab->base_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 204/515 ktest.pl: Prevent recursion of default variable options
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit 61f7e318e99d3b398670518dd3f4f8510d1800fc ]
If a default variable contains itself, do not recurse on it.
For example:
ADD_CONFIG := ${CONFIG_DIR}/temp_config
DEFAULTS
ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG}The above works because the temp variable ADD_CONFIG (is a temp because it is created with ":=") is already defined, it will be substituted in the variable option. But if it gets commented out:
# ADD_CONFIG := ${CONFIG_DIR}/temp_config
DEFAULTS
ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG}Then the above will go into a recursive loop where ${ADD_CONFIG} will get replaced with the current definition of ADD_CONFIG which contains the ${ADD_CONFIG} and that will also try to get converted. ktest.pl will error after 100 attempts of recursion and fail.
When replacing a variable with the default variable, if the default variable contains itself, do not replace it.
--- tools/testing/ktest/ktest.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/ktest/ktest.pl +4 -1
@@ -1371,7 +1371,10 @@ sub __eval_option { # If a variable contains itself, use the default var if (($var eq $name) && defined($opt{$var})) { $o = $opt{$var}; - $retval = "$retval$o"; + # Only append if the default doesn't contain itself + if ($o !~ m/\$\{$var\}/) { + $retval = "$retval$o"; + } } elsif (defined($opt{$o})) { $o = $opt{$o}; $retval = "$retval$o";
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 205/515 wifi: cfg80211: reject HTC bit for management frames
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit be06a8c7313943109fa870715356503c4c709cbc ]
Management frames sent by userspace should never have the order/HTC bit set, reject that. It could also cause some confusion with the length of the buffer and the header so the validation might end up wrong.
--- net/wireless/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/wireless/mlme.c +2 -1
@@ -850,7 +850,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg80211_registered_device *rdev, mgmt = (const struct ieee80211_mgmt *)params->buf; -if (!ieee80211_is_mgmt (mgmt->frame_control)) +if (!ieee80211_is_mgmt (mgmt->frame_control) || +ieee80211_has_order (mgmt->frame_control))return -EINVAL ; stype =le16_to_cpu (mgmt->frame_control) &IEEE80211_FCTL_STYPE ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 206/515 s390/sclp: Use monotonic clock in sclp_sync_wait()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
[ Upstream commit 925f0707a67cae0a974c4bd5b718f0263dc56824 ]
sclp_sync_wait() should use the monotonic clock for the delay loop. Otherwise the code won't work correctly when the clock is changed.
--- drivers/s390/char/sclp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/char/sclp.c +2 -2
@@ -719,7 +719,7 @@ sclp_sync_wait(void) timeout =0 ;if (timer_pending (&sclp_request_timer)) {/* Get timeout TOD value */ - timeout =get_tod_clock_fast () + + timeout =get_tod_clock_monotonic () +sclp_tod_from_jiffies (sclp_request_timer.expires - jiffies); }
@@ -739,7 +739,7 @@ sclp_sync_wait(void)/* Loop until driver state indicates finished request */ while (sclp_running_state != sclp_running_state_idle) {/* Check for expired request timer */ -if (get_tod_clock_fast () > timeout &&timer_delete (&sclp_request_timer)) +if (get_tod_clock_monotonic () > timeout &&timer_delete (&sclp_request_timer)) sclp_request_timer.function (&sclp_request_timer);cpu_relax (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 207/515 s390/time: Use monotonic clock in get_cycles()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
[ Upstream commit 09e7e29d2b49ba84bcefb3dc1657726d2de5bb24 ]
Otherwise the code might not work correctly when the clock is changed.
--- arch/s390/include/asm/timex.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
arch/s390/include/asm/timex.h +6 -7
@@ -196,13 +196,6 @@ static inline unsigned long get_tod_clock_fast(void) asmvolatile ("stckf %0" :"=Q" (clk) : :"cc" );return clk; } - -static inline cycles_t get_cycles (void ) -{ -return (cycles_t )get_tod_clock () >>2 ; -} -#define get_cycles get_cycles -int get_phys_clock (unsigned long *clock);void init_cpu_timer (void );
@@ -230,6 +223,12 @@ static inline unsigned long get_tod_clock_monotonic(void)return tod; } +static inline cycles_t get_cycles (void ) +{ +return (cycles_t )get_tod_clock_monotonic () >>2 ; +} +#define get_cycles get_cycles +/** * tod_to_ns - convert a TOD format value to nanoseconds * @todval: to be converted TOD format value
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 208/515 be2net: Use correct byte order and format string for TCP seq and ack_seq
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 4701ee5044fb3992f1c910630a9673c2dc600ce5 ]
The TCP header fields seq and ack_seq are 32-bit values in network byte order as (__be32). these fields were earlier printed using ntohs(), which converts only 16-bit values and produces incorrect results for 32-bit fields. This patch is changeing the conversion to ntohl(), ensuring correct interpretation of these sequence numbers.
Notably, the format specifier is updated from %d to %u to reflect the unsigned nature of these fields.
improves the accuracy of debug log messages for TCP sequence and acknowledgment numbers during TX timeouts.
--- drivers/net/ethernet/emulex/benet/be_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/emulex/benet/be_main.c +4 -4
@@ -1465,10 +1465,10 @@ static void be_tx_timeout(struct net_device *netdev, unsigned int txqueue) ntohs(tcphdr->source));dev_info (dev,"TCP dest port %d\n" ,ntohs (tcphdr->dest)); -dev_info (dev,"TCP sequence num %d\n" , -ntohs (tcphdr->seq)); -dev_info (dev,"TCP ack_seq %d\n" , -ntohs (tcphdr->ack_seq)); +dev_info (dev,"TCP sequence num %u\n" , +ntohl (tcphdr->seq)); +dev_info (dev,"TCP ack_seq %u\n" , +ntohl (tcphdr->ack_seq)); }else if (ip_hdr (skb)->protocol ==IPPROTO_UDP ) { udphdr =udp_hdr (skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 209/515 libbpf: Verify that arena map exists when adding arena relocations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eduard Zingerman <[email protected]>
[ Upstream commit 42be23e8f2dcb100cb9944b2b54b6bf41aff943d ]
Fuzzer reported a memory access error in bpf_program__record_reloc() that happens when:
- ".addr_space.1" section exists
- there is a relocation referencing this section
- there are no arena maps defined in BTF.
Sanity checks for maps existence are already present in bpf_program__record_reloc(), hence this commit adds another one.
[1] https://github.com/libbpf/libbpf/actions/runs/16375110681/job/46272998064
--- tools/lib/bpf/libbpf.c | 5 +++++ 1 file changed, 5 insertions(+)
tools/lib/bpf/libbpf.c +5 -0
@@ -4582,6 +4582,11 @@ static int bpf_program__record_reloc(struct bpf_program *prog,/* arena data relocation */ if (shdr_idx == obj->efile.arena_data_shndx) { +if (obj->arena_map_idx <0 ) { +pr_warn ("prog '%s': bad arena data relocation at insn %u, no arena maps defined\n" , + prog->name, insn_idx); +return -LIBBPF_ERRNO__RELOC ; + } reloc_desc->type =RELO_DATA ; reloc_desc->insn_idx = insn_idx; reloc_desc->map_idx = obj->arena_map_idx;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 210/515 idpf: preserve coalescing settings across resets
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ahmed Zaki <[email protected]>
[ Upstream commit e1e3fec3e34b4934a9d2c98e4ee00a4d87b19179 ]
The IRQ coalescing config currently reside only inside struct idpf_q_vector. However, all idpf_q_vector structs are de-allocated and re-allocated during resets. This leads to user-set coalesce configuration to be lost.
Add new fields to struct idpf_vport_user_config_data to save the user settings and re-apply them after reset.
--- drivers/net/ethernet/intel/idpf/idpf.h | 19 ++++++++++ .../net/ethernet/intel/idpf/idpf_ethtool.c | 36 ++++++++++++++----- drivers/net/ethernet/intel/idpf/idpf_lib.c | 18 +++++++++- drivers/net/ethernet/intel/idpf/idpf_main.c | 1 + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 13 ++++--- 5 files changed, 74 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/idpf/idpf.h +19 -0
@@ -369,10 +369,28 @@ struct idpf_rss_data {u32 *cached_lut; }; +/** +* struct idpf_q_coalesce - User defined coalescing configuration values for +* a single queue. +* @tx_intr_mode: Dynamic TX ITR or not +* @rx_intr_mode: Dynamic RX ITR or not +* @tx_coalesce_usecs: TX interrupt throttling rate +* @rx_coalesce_usecs: RX interrupt throttling rate +* +* Used to restore user coalescing configuration after a reset. +*/ +struct idpf_q_coalesce { +u32 tx_intr_mode; +u32 rx_intr_mode; +u32 tx_coalesce_usecs; +u32 rx_coalesce_usecs; +}; +/** * struct idpf_vport_user_config_data - User defined configuration values for * each vport. * @rss_data: See struct idpf_rss_data +* @q_coalesce: Array of per queue coalescing data * @num_req_tx_qs: Number of user requested TX queues through ethtool * @num_req_rx_qs: Number of user requested RX queues through ethtool * @num_req_txq_desc: Number of user requested TX queue descriptors through
@@ -386,6 +404,7 @@ struct idpf_rss_data {*/ struct idpf_vport_user_config_data {struct idpf_rss_data rss_data; +struct idpf_q_coalesce *q_coalesce;u16 num_req_tx_qs;u16 num_req_rx_qs;u32 num_req_txq_desc;
drivers/net/ethernet/intel/idpf/idpf_ethtool.c +28 -8
@@ -1089,12 +1089,14 @@ static int idpf_get_per_q_coalesce(struct net_device *netdev, u32 q_num,/** * __idpf_set_q_coalesce - set ITR values for specific queue * @ec: ethtool structure from user to update ITR settings +* @q_coal: per queue coalesce settings * @qv: queue vector for which itr values has to be set * @is_rxq: is queue type rx * * Returns 0 on success, negative otherwise. */ static int __idpf_set_q_coalesce (const struct ethtool_coalesce *ec, +struct idpf_q_coalesce *q_coal,struct idpf_q_vector *qv,bool is_rxq) {u32 use_adaptive_coalesce, coalesce_usecs;
@@ -1138,20 +1140,25 @@ static int __idpf_set_q_coalesce(const struct ethtool_coalesce *ec,if (is_rxq) { qv->rx_itr_value = coalesce_usecs; + q_coal->rx_coalesce_usecs = coalesce_usecs;if (use_adaptive_coalesce) { qv->rx_intr_mode =IDPF_ITR_DYNAMIC ; + q_coal->rx_intr_mode =IDPF_ITR_DYNAMIC ; }else { qv->rx_intr_mode = !IDPF_ITR_DYNAMIC ; -idpf_vport_intr_write_itr (qv, qv->rx_itr_value, - false); + q_coal->rx_intr_mode = !IDPF_ITR_DYNAMIC ; +idpf_vport_intr_write_itr (qv, coalesce_usecs, false); } }else { qv->tx_itr_value = coalesce_usecs; + q_coal->tx_coalesce_usecs = coalesce_usecs;if (use_adaptive_coalesce) { qv->tx_intr_mode =IDPF_ITR_DYNAMIC ; + q_coal->tx_intr_mode =IDPF_ITR_DYNAMIC ; }else { qv->tx_intr_mode = !IDPF_ITR_DYNAMIC ; -idpf_vport_intr_write_itr (qv, qv->tx_itr_value, true); + q_coal->tx_intr_mode = !IDPF_ITR_DYNAMIC ; +idpf_vport_intr_write_itr (qv, coalesce_usecs, true); } }
@@ -1164,6 +1171,7 @@ static int __idpf_set_q_coalesce(const struct ethtool_coalesce *ec,/** * idpf_set_q_coalesce - set ITR values for specific queue * @vport: vport associated to the queue that need updating +* @q_coal: per queue coalesce settings * @ec: coalesce settings to program the device with * @q_num: update ITR/INTRL (coalesce) settings for this queue number/index * @is_rxq: is queue type rx
@@ -1171,6 +1179,7 @@ static int __idpf_set_q_coalesce(const struct ethtool_coalesce *ec,* Return 0 on success, and negative on failure */ static int idpf_set_q_coalesce (const struct idpf_vport *vport, +struct idpf_q_coalesce *q_coal,const struct ethtool_coalesce *ec,int q_num,bool is_rxq) {
@@ -1179,7 +1188,7 @@ static int idpf_set_q_coalesce(const struct idpf_vport *vport, qv = is_rxq ?idpf_find_rxq_vec (vport, q_num) :idpf_find_txq_vec (vport, q_num); -if (qv &&__idpf_set_q_coalesce (ec, qv, is_rxq)) +if (qv &&__idpf_set_q_coalesce (ec, q_coal, qv, is_rxq))return -EINVAL ;return 0 ;
@@ -1200,9 +1209,13 @@ static int idpf_set_coalesce(struct net_device *netdev, struct netlink_ext_ack *extack) {struct idpf_netdev_priv *np =netdev_priv (netdev); +struct idpf_vport_user_config_data *user_config; +struct idpf_q_coalesce *q_coal;struct idpf_vport *vport;int i, err =0 ; + user_config = &np->adapter->vport_config[np->vport_idx]->user_config; +idpf_vport_ctrl_lock (netdev); vport =idpf_netdev_to_vport (netdev);
@@ -1210,13 +1223,15 @@ static int idpf_set_coalesce(struct net_device *netdev, goto unlock_mutex;for (i =0 ; i < vport->num_txq; i++) { - err =idpf_set_q_coalesce (vport, ec, i, false); + q_coal = &user_config->q_coalesce[i]; + err =idpf_set_q_coalesce (vport, q_coal, ec, i, false);if (err) goto unlock_mutex; }for (i =0 ; i < vport->num_rxq; i++) { - err =idpf_set_q_coalesce (vport, ec, i, true); + q_coal = &user_config->q_coalesce[i]; + err =idpf_set_q_coalesce (vport, q_coal, ec, i, true);if (err) goto unlock_mutex; }
@@ -1238,20 +1253,25 @@ static int idpf_set_coalesce(struct net_device *netdev,static int idpf_set_per_q_coalesce (struct net_device *netdev,u32 q_num,struct ethtool_coalesce *ec) { +struct idpf_netdev_priv *np =netdev_priv (netdev); +struct idpf_vport_user_config_data *user_config; +struct idpf_q_coalesce *q_coal;struct idpf_vport *vport;int err;idpf_vport_ctrl_lock (netdev); vport =idpf_netdev_to_vport (netdev); + user_config = &np->adapter->vport_config[np->vport_idx]->user_config; + q_coal = &user_config->q_coalesce[q_num]; - err =idpf_set_q_coalesce (vport, ec, q_num, false); + err =idpf_set_q_coalesce (vport, q_coal, ec, q_num, false);if (err) {idpf_vport_ctrl_unlock (netdev);return err; } - err =idpf_set_q_coalesce (vport, ec, q_num, true); + err =idpf_set_q_coalesce (vport, q_coal, ec, q_num, true);idpf_vport_ctrl_unlock (netdev);
drivers/net/ethernet/intel/idpf/idpf_lib.c +17 -1
@@ -1094,8 +1094,10 @@ static struct idpf_vport *idpf_vport_alloc(struct idpf_adapter *adapter,if (!vport)return vport; + num_max_q =max (max_q->max_txq, max_q->max_rxq);if (!adapter->vport_config[idx]) {struct idpf_vport_config *vport_config; +struct idpf_q_coalesce *q_coal; vport_config =kzalloc (sizeof (*vport_config),GFP_KERNEL );if (!vport_config) {
@@ -1104,6 +1106,21 @@ static struct idpf_vport *idpf_vport_alloc(struct idpf_adapter *adapter,return NULL ; } + q_coal =kcalloc (num_max_q,sizeof (*q_coal),GFP_KERNEL ); +if (!q_coal) { +kfree (vport_config); +kfree (vport); + +return NULL ; + } +for (int i =0 ; i < num_max_q; i++) { + q_coal[i].tx_intr_mode =IDPF_ITR_DYNAMIC ; + q_coal[i].tx_coalesce_usecs =IDPF_ITR_TX_DEF ; + q_coal[i].rx_intr_mode =IDPF_ITR_DYNAMIC ; + q_coal[i].rx_coalesce_usecs =IDPF_ITR_RX_DEF ; + } + vport_config->user_config.q_coalesce = q_coal; + adapter->vport_config[idx] = vport_config; }
@@ -1113,7 +1130,6 @@ static struct idpf_vport *idpf_vport_alloc(struct idpf_adapter *adapter, vport->default_vport = adapter->num_alloc_vports <idpf_get_default_vports (adapter); - num_max_q =max (max_q->max_txq, max_q->max_rxq); vport->q_vector_idxs =kcalloc (num_max_q,sizeof (u16),GFP_KERNEL );if (!vport->q_vector_idxs) goto free_vport;
drivers/net/ethernet/intel/idpf/idpf_main.c +1 -0
@@ -62,6 +62,7 @@ static void idpf_remove(struct pci_dev *pdev)destroy_workqueue (adapter->vc_event_wq);for (i =0 ; i < adapter->max_vports; i++) { +kfree (adapter->vport_config[i]->user_config.q_coalesce);kfree (adapter->vport_config[i]); adapter->vport_config[i] =NULL ; }
drivers/net/ethernet/intel/idpf/idpf_txrx.c +9 -4
@@ -4194,9 +4194,13 @@ static void idpf_vport_intr_napi_add_all(struct idpf_vport *vport)int idpf_vport_intr_alloc (struct idpf_vport *vport) {u16 txqs_per_vector, rxqs_per_vector, bufqs_per_vector; +struct idpf_vport_user_config_data *user_config;struct idpf_q_vector *q_vector; +struct idpf_q_coalesce *q_coal;u32 complqs_per_vector, v_idx; +u16 idx = vport->idx; + user_config = &vport->adapter->vport_config[idx]->user_config; vport->q_vectors =kcalloc (vport->num_q_vectors,sizeof (struct idpf_q_vector ),GFP_KERNEL );if (!vport->q_vectors)
@@ -4214,14 +4218,15 @@ int idpf_vport_intr_alloc(struct idpf_vport *vport)for (v_idx =0 ; v_idx < vport->num_q_vectors; v_idx++) { q_vector = &vport->q_vectors[v_idx]; + q_coal = &user_config->q_coalesce[v_idx]; q_vector->vport = vport; - q_vector->tx_itr_value =IDPF_ITR_TX_DEF ; - q_vector->tx_intr_mode =IDPF_ITR_DYNAMIC ; + q_vector->tx_itr_value = q_coal->tx_coalesce_usecs; + q_vector->tx_intr_mode = q_coal->tx_intr_mode; q_vector->tx_itr_idx =VIRTCHNL2_ITR_IDX_1 ; - q_vector->rx_itr_value =IDPF_ITR_RX_DEF ; - q_vector->rx_intr_mode =IDPF_ITR_DYNAMIC ; + q_vector->rx_itr_value = q_coal->rx_coalesce_usecs; + q_vector->rx_intr_mode = q_coal->rx_intr_mode; q_vector->rx_itr_idx =VIRTCHNL2_ITR_IDX_0 ; q_vector->tx = kcalloc(txqs_per_vector, sizeof(*q_vector->tx),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 211/515 libbpf: Fix warning in calloc() usage
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matteo Croce <[email protected]>
[ Upstream commit 0ee30d937c147fc14c4b49535181d437cd2fde7a ]
When compiling libbpf with some compilers, this warning is triggered:
libbpf.c: In function ‘bpf_object__gen_loader’:
libbpf.c:9209:28: error: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
9209 | gen = calloc(sizeof(*gen), 1);
| ^
libbpf.c:9209:28: note: earlier argument should specify number of elements, later size of each element
Fix this by inverting the calloc() arguments.
--- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/lib/bpf/libbpf.c +1 -1
@@ -9221,7 +9221,7 @@ int bpf_object__gen_loader(struct bpf_object *obj, struct gen_loader_opts *opts)return libbpf_err (-EFAULT );if (!OPTS_VALID (opts, gen_loader_opts))return libbpf_err (-EINVAL ); - gen =calloc (sizeof (*gen),1 ); + gen =calloc (1 ,sizeof (*gen));if (!gen)return libbpf_err (-ENOMEM ); gen->opts = opts;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 212/515 wifi: rtw89: wow: Add Basic Rate IE to probe request in scheduled scan mode
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chin-Yen Lee <[email protected]>
[ Upstream commit 37c23874d13eb369d8b384a1ce5992ff6c23d56f ]
In scheduled scan mode, the current probe request only includes the SSID IE, but omits the Basic Rate IE. Some APs do not respond to such incomplete probe requests, causing net-detect failures. To improve interoperability and ensure APs respond correctly, add the Basic Rate IE to the probe request in driver.
--- drivers/net/wireless/realtek/rtw89/wow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw89/wow.c +4 -1
@@ -1413,6 +1413,8 @@ static void rtw89_fw_release_pno_pkt_list(struct rtw89_dev *rtwdev,static int rtw89_pno_scan_update_probe_req (struct rtw89_dev *rtwdev,struct rtw89_vif_link *rtwvif_link) { +static const u8 basic_rate_ie[] = {WLAN_EID_SUPP_RATES ,0x08 , +0x0c ,0x12 ,0x18 ,0x24 ,0x30 ,0x48 ,0x60 ,0x6c };struct rtw89_wow_param *rtw_wow = &rtwdev->wow;struct cfg80211_sched_scan_request *nd_config = rtw_wow->nd_config;u8 num = nd_config->n_match_sets, i;
@@ -1424,10 +1426,11 @@ static int rtw89_pno_scan_update_probe_req(struct rtw89_dev *rtwdev, skb =ieee80211_probereq_get (rtwdev->hw, rtwvif_link->mac_addr, nd_config->match_sets[i].ssid.ssid, nd_config->match_sets[i].ssid.ssid_len, - nd_config->ie_len); + nd_config->ie_len +sizeof (basic_rate_ie));if (!skb)return -ENOMEM ; +skb_put_data (skb, basic_rate_ie,sizeof (basic_rate_ie));skb_put_data (skb, nd_config->ie, nd_config->ie_len); info =kzalloc (sizeof (*info),GFP_KERNEL );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 213/515 wifi: rtw89: Lower the timeout in rtw89_fw_read_c2h_reg() for USB
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit 671be46afd1f03de9dc6e4679c88e1a7a81cdff6 ]
This read_poll_timeout_atomic() with a delay of 1 µs and a timeout of 1000000 µs can take ~250 seconds in the worst case because sending a USB control message takes ~250 µs.
Lower the timeout to 4000 for USB in order to reduce the maximum polling time to ~1 second.
This problem was observed with RTL8851BU while suspending to RAM with WOWLAN enabled. The computer sat for 4 minutes with a black screen before suspending.
--- drivers/net/wireless/realtek/rtw89/fw.c | 9 +++++++-- drivers/net/wireless/realtek/rtw89/fw.h | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/fw.c +7 -2
@@ -6446,13 +6446,18 @@ static int rtw89_fw_read_c2h_reg(struct rtw89_dev *rtwdev,const struct rtw89_chip_info *chip = rtwdev->chip;struct rtw89_fw_info *fw_info = &rtwdev->fw;const u32 *c2h_reg = chip->c2h_regs; -u32 ret; +u32 ret, timeout;u8 i, val; info->id =RTW89_FWCMD_C2HREG_FUNC_NULL ; +if (rtwdev->hci.type ==RTW89_HCI_TYPE_USB ) + timeout =RTW89_C2H_TIMEOUT_USB ; +else + timeout =RTW89_C2H_TIMEOUT ; + ret =read_poll_timeout_atomic (rtw89_read8, val, val,1 , -RTW89_C2H_TIMEOUT , false, rtwdev, + timeout, false, rtwdev, chip->c2h_ctrl_reg);if (ret) {rtw89_warn (rtwdev,"c2h reg timeout\n" );
drivers/net/wireless/realtek/rtw89/fw.h +2 -0
@@ -112,6 +112,8 @@ struct rtw89_h2creg_sch_tx_en {#define RTW89_C2HREG_HDR_LEN 2#define RTW89_H2CREG_HDR_LEN 2#define RTW89_C2H_TIMEOUT 1000000 +#define RTW89_C2H_TIMEOUT_USB 4000 +struct rtw89_mac_c2h_info {u8 id;u8 content_len;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 214/515 et131x: Add missing check after DMA map
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit d61f6cb6f6ef3c70d2ccc0d9c85c508cb8017da9 ]
The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error.
--- drivers/net/ethernet/agere/et131x.c | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)
drivers/net/ethernet/agere/et131x.c +36 -0
@@ -2459,6 +2459,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) skb->data,skb_headlen (skb), DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) +return -ENOMEM ; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2468,6 +2472,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) skb->data,skb_headlen (skb) /2 , DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) +return -ENOMEM ; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2478,6 +2486,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)skb_headlen (skb) /2 ,skb_headlen (skb) /2 , DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, + dma_addr)) + goto unmap_first_out; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2489,6 +2501,9 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)0 , desc[frag].len_vlan, DMA_TO_DEVICE); +if (dma_mapping_error (&adapter->pdev->dev, dma_addr)) + goto unmap_out; + desc[frag].addr_lo =lower_32_bits (dma_addr); desc[frag].addr_hi =upper_32_bits (dma_addr); frag++;
@@ -2578,6 +2593,27 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb) &adapter->regs->global.watchdog_timer); }return 0 ; + +unmap_out: +// Unmap the body of the packet with map_page +while (--i) { + frag--; + dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_page (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +unmap_first_out: +// Unmap the header with map_single +while (frag--) { + dma_addr = desc[frag].addr_lo; + dma_addr |= (u64 )desc[frag].addr_hi <<32 ; +dma_unmap_single (&adapter->pdev->dev, dma_addr, + desc[frag].len_vlan,DMA_TO_DEVICE ); + } + +return -ENOMEM ; }static int send_packet (struct sk_buff *skb,struct et131x_adapter *adapter)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 215/515 net: ag71xx: Add missing check after DMA map
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 96a1e15e60216b52da0e6da5336b6d7f5b0188b0 ]
The DMA map functions can fail and should be tested for errors.
--- drivers/net/ethernet/atheros/ag71xx.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/atheros/ag71xx.c +9 -0
@@ -1213,6 +1213,11 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf, buf->rx.rx_buf = data; buf->rx.dma_addr =dma_map_single (&ag->pdev->dev, data, ag->rx_buf_size,DMA_FROM_DEVICE ); +if (dma_mapping_error (&ag->pdev->dev, buf->rx.dma_addr)) { +skb_free_frag (data); + buf->rx.rx_buf =NULL ; +return false; + } desc->data = (u32 )buf->rx.dma_addr + offset;return true; }
@@ -1511,6 +1516,10 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, dma_addr =dma_map_single (&ag->pdev->dev, skb->data, skb->len,DMA_TO_DEVICE ); +if (dma_mapping_error (&ag->pdev->dev, dma_addr)) { +netif_dbg (ag, tx_err, ndev,"DMA mapping error\n" ); + goto err_drop; + } i = ring->curr & ring_mask; desc =ag71xx_ring_desc (ring, i);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 216/515 net/mlx5e: Properly access RCU protected qdisc_sleeping variable
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leon Romanovsky <[email protected]>
[ Upstream commit 2a601b2d35623065d31ebaf697b07502d54878c9 ]
qdisc_sleeping variable is declared as "struct Qdisc __rcu" and as such needs proper annotation while accessing it.
Without rtnl_dereference(), the following error is generated by sparse:
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: warning:
incorrect type in initializer (different address spaces)drivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: expected
struct Qdisc *qdiscdrivers/net/ethernet/mellanox/mlx5/core/en/qos.c:377:40: got struct
Qdisc [noderef] __rcu *qdisc_sleeping
--- drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +1 -1
@@ -374,7 +374,7 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_quevoid mlx5e_reset_qdisc (struct net_device *dev,u16 qid) {struct netdev_queue *dev_queue =netdev_get_tx_queue (dev, qid); -struct Qdisc *qdisc = dev_queue->qdisc_sleeping; +struct Qdisc *qdisc =rtnl_dereference (dev_queue->qdisc_sleeping);if (!qdisc)return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 217/515 net: pcs: xpcs: mask readl() return value to 16 bits
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jack Ping CHNG <[email protected]>
[ Upstream commit 2b0ba7b5b010455c4e43ab557860f8b1089e7424 ]
readl() returns 32-bit value but Clause 22/45 registers are 16-bit wide. Masking with 0xFFFF avoids using garbage upper bits.
--- drivers/net/pcs/pcs-xpcs-plat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/pcs/pcs-xpcs-plat.c +2 -2
@@ -66,7 +66,7 @@ static int xpcs_mmio_read_reg_indirect(struct dw_xpcs_plat *pxpcs,switch (pxpcs->reg_width) {case 4 :writel (page, pxpcs->reg_base + (DW_VR_CSR_VIEWPORT <<2 )); - ret =readl (pxpcs->reg_base + (ofs <<2 )); + ret =readl (pxpcs->reg_base + (ofs <<2 )) &0xffff ;break ;default :writew (page, pxpcs->reg_base + (DW_VR_CSR_VIEWPORT <<1 ));
@@ -124,7 +124,7 @@ static int xpcs_mmio_read_reg_direct(struct dw_xpcs_plat *pxpcs,switch (pxpcs->reg_width) {case 4 : - ret =readl (pxpcs->reg_base + (csr <<2 )); + ret =readl (pxpcs->reg_base + (csr <<2 )) &0xffff ;break ;default : ret =readw (pxpcs->reg_base + (csr <<1 ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 218/515 arm64: Mark kernel as tainted on SAE and SError panic
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit d7ce7e3a84642aadf7c4787f7ec4f58eb163d129 ]
Set TAINT_MACHINE_CHECK when SError or Synchronous External Abort (SEA) interrupts trigger a panic to flag potential hardware faults. This tainting mechanism aids in debugging and enables correlation of hardware-related crashes in large-scale deployments.
This change aligns with similar patches[1] that mark machine check events when the system crashes due to hardware errors.
--- arch/arm64/kernel/traps.c | 1 + arch/arm64/mm/fault.c | 1 + 2 files changed, 2 insertions(+)
arch/arm64/kernel/traps.c +1 -0
@@ -931,6 +931,7 @@ void __noreturn panic_bad_stack(struct pt_regs *regs, unsigned long esr, unsignevoid __noreturn arm64_serror_panic (struct pt_regs *regs,unsigned long esr) { +add_taint (TAINT_MACHINE_CHECK ,LOCKDEP_STILL_OK );console_verbose (); pr_crit("SError Interrupt on CPU%d, code 0x%016lx -- %s\n",
arch/arm64/mm/fault.c +1 -0
@@ -838,6 +838,7 @@ static int do_sea(unsigned long far, unsigned long esr, struct pt_regs *regs)*/ siaddr =untagged_addr (far); } +add_taint (TAINT_MACHINE_CHECK ,LOCKDEP_STILL_OK );arm64_notify_die (inf->name, regs, inf->sig, inf->code, siaddr, esr);return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 219/515 drm/amd/pm: fix null pointer access
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Umio Yasuno <[email protected]>
[ Upstream commit d524d40e3a6152a3ea1125af729f8cd8ca65efde ]
Writing a string without delimiters (' ', '\n', '\0') to the under gpu_od/fan_ctrl sysfs or pp_power_profile_mode for the CUSTOM profile will result in a null pointer dereference.
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +5 -0
@@ -1398,6 +1398,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,if (ret)return -EINVAL ; parameter_size++; +if (!tmp_str) +break ;while (isspace (*tmp_str)) tmp_str++; }
@@ -3618,6 +3620,9 @@ static int parse_input_od_command_lines(const char *buf,return -EINVAL ; parameter_size++; +if (!tmp_str) +break ; +while (isspace (*tmp_str)) tmp_str++; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 220/515 rcu: Protect ->defer_qs_iw_pending from data race
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul E. McKenney <[email protected]>
[ Upstream commit 90c09d57caeca94e6f3f87c49e96a91edd40cbfd ]
On kernels built with CONFIG_IRQ_WORK=y, when rcu_read_unlock() is invoked within an interrupts-disabled region of code [1], it will invoke rcu_read_unlock_special(), which uses an irq-work handler to force the system to notice when the RCU read-side critical section actually ends. That end won't happen until interrupts are enabled at the soonest.
In some kernels, such as those booted with rcutree.use_softirq=y, the irq-work handler is used unconditionally.
The per-CPU rcu_data structure's ->defer_qs_iw_pending field is updated by the irq-work handler and is both read and updated by rcu_read_unlock_special(). This resulted in the following KCSAN splat:
------------------------------------------------------------------------
BUG: KCSAN: data-race in rcu_preempt_deferred_qs_handler / rcu_read_unlock_special
read to 0xffff96b95f42d8d8 of 1 bytes by task 90 on cpu 8:
rcu_read_unlock_special+0x175/0x260 __rcu_read_unlock+0x92/0xa0 rt_spin_unlock+0x9b/0xc0 __local_bh_enable+0x10d/0x170 __local_bh_enable_ip+0xfb/0x150 rcu_do_batch+0x595/0xc40 rcu_cpu_kthread+0x4e9/0x830 smpboot_thread_fn+0x24d/0x3b0 kthread+0x3bd/0x410 ret_from_fork+0x35/0x40 ret_from_fork_asm+0x1a/0x30
write to 0xffff96b95f42d8d8 of 1 bytes by task 88 on cpu 8:
rcu_preempt_deferred_qs_handler+0x1e/0x30 irq_work_single+0xaf/0x160 run_irq_workd+0x91/0xc0 smpboot_thread_fn+0x24d/0x3b0 kthread+0x3bd/0x410 ret_from_fork+0x35/0x40 ret_from_fork_asm+0x1a/0x30
no locks held by irq_work/8/88.
irq event stamp: 200272 hardirqs last enabled at (200272): [<ffffffffb0f56121>] finish_task_switch+0x131/0x320 hardirqs last disabled at (200271): [<ffffffffb25c7859>] __schedule+0x129/0xd70 softirqs last enabled at (0): [<ffffffffb0ee093f>] copy_process+0x4df/0x1cc0 softirqs last disabled at (0): [<0000000000000000>] 0x0
------------------------------------------------------------------------
The problem is that irq-work handlers run with interrupts enabled, which means that rcu_preempt_deferred_qs_handler() could be interrupted, and that interrupt handler might contain an RCU read-side critical section, which might invoke rcu_read_unlock_special(). In the strict KCSAN mode of operation used by RCU, this constitutes a data race on the ->defer_qs_iw_pending field.
This commit therefore disables interrupts across the portion of the rcu_preempt_deferred_qs_handler() that updates the ->defer_qs_iw_pending field. This suffices because this handler is not a fast path.
--- kernel/rcu/tree_plugin.h | 3 +++ 1 file changed, 3 insertions(+)
kernel/rcu/tree_plugin.h +3 -0
@@ -624,10 +624,13 @@ notrace void rcu_preempt_deferred_qs(struct task_struct *t)*/ static void rcu_preempt_deferred_qs_handler (struct irq_work *iwp) { +unsigned long flags;struct rcu_data *rdp; rdp = container_of(iwp, struct rcu_data, defer_qs_iw); +local_irq_save (flags); rdp->defer_qs_iw_pending = false; +local_irq_restore (flags); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 221/515 drm/amd/display: limit clear_update_flags to dcn32 and above
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlene Liu <[email protected]>
[ Upstream commit f354556e29f40ef44fa8b13dc914817db3537e20 ]
[why]
dc has some code out of sync:dc_commit_updates_for_stream handles v1/v2/v3, but dc_update_planes_and_stream makes v1 asic to use v2.
as a reression fix: limit clear_update_flags to dcn32 or newer asic. need to follow up that v1 asic using v2 issue.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +2 -3
@@ -5335,8 +5335,7 @@ bool dc_update_planes_and_stream(struct dc *dc,else ret =update_planes_and_stream_v2 (dc, srf_updates, surface_count, stream, stream_update); - -if (ret) +if (ret && dc->ctx->dce_version >=DCN_VERSION_3_2 )clear_update_flags (srf_updates, surface_count, stream);return ret;
@@ -5367,7 +5366,7 @@ void dc_commit_updates_for_stream(struct dc *dc, ret =update_planes_and_stream_v1 (dc, srf_updates, surface_count, stream, stream_update, state); -if (ret) +if (ret && dc->ctx->dce_version >=DCN_VERSION_3_2 )clear_update_flags (srf_updates, surface_count, stream); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 222/515 can: ti_hecc: fix -Woverflow compiler warning
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vincent Mailhol <[email protected]>
[ Upstream commit 7cae4d04717b002cffe41169da3f239c845a0723 ]
Fix below default (W=0) warning:
drivers/net/can/ti_hecc.c: In function 'ti_hecc_start':
drivers/net/can/ti_hecc.c:386:20: warning: conversion from 'long unsigned int' to 'u32' {aka 'unsigned int'} changes value from '18446744073709551599' to '4294967279' [-Woverflow]
386 | mbx_mask = ~BIT(HECC_RX_LAST_MBOX);
| ^--- drivers/net/can/ti_hecc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/ti_hecc.c +1 -1
@@ -383,7 +383,7 @@ static void ti_hecc_start(struct net_device *ndev)* overflows instead of the hardware silently dropping the * messages. */ - mbx_mask = ~BIT (HECC_RX_LAST_MBOX ); + mbx_mask = ~BIT_U32 (HECC_RX_LAST_MBOX );hecc_write (priv,HECC_CANOPC , mbx_mask);/* Enable interrupts */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 223/515 net: mctp: Prevent duplicate binds
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Johnston <[email protected]>
[ Upstream commit 3954502377ec05a1b37e2dc9bef0bacd4bbd71b2 ]
Disallow bind() calls that have the same arguments as existing bound sockets. Previously multiple sockets could bind() to the same type/local address, with an arbitrary socket receiving matched messages.
This is only a partial fix, a future commit will define precedence order for MCTP_ADDR_ANY versus specific EID bind(), which are allowed to exist together.
--- net/mctp/af_mctp.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
net/mctp/af_mctp.c +23 -3
@@ -73,7 +73,6 @@ static int mctp_bind(struct socket *sock, struct sockaddr *addr, int addrlen)lock_sock (sk); -/* TODO: allow rebind */ if (sk_hashed (sk)) { rc = -EADDRINUSE ; goto out_release;
@@ -629,15 +628,36 @@ static void mctp_sk_close(struct sock *sk, long timeout)static int mctp_sk_hash (struct sock *sk) {struct net *net =sock_net (sk); +struct sock *existing; +struct mctp_sock *msk; +int rc; + + msk = container_of(sk, struct mctp_sock, sk);/* Bind lookup runs under RCU, remain live during that. */ sock_set_flag (sk,SOCK_RCU_FREE );mutex_lock (&net->mctp.bind_lock); + +/* Prevent duplicate binds. */ +sk_for_each (existing, &net->mctp.binds) { +struct mctp_sock *mex = + container_of(existing, struct mctp_sock, sk); + +if (mex->bind_type == msk->bind_type && + mex->bind_addr == msk->bind_addr && + mex->bind_net == msk->bind_net) { + rc = -EADDRINUSE ; + goto out; + } + } +sk_add_node_rcu (sk, &net->mctp.binds); -mutex_unlock (&net->mctp.bind_lock); + rc =0 ; -return 0 ; +out: +mutex_unlock (&net->mctp.bind_lock); +return rc; }static void mctp_sk_unhash (struct sock *sk)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 224/515 wifi: mac80211: dont use TPE data from assoc response
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit a597432cc9e640439370d9dc95952220cc13fc2b ]
Since there's no TPE element in the (re)assoc response, trying to use the data from it just leads to using the defaults, even though the real values had been set during authentication from the discovered BSS information.
Fix this by simply not handling the TPE data in assoc response since it's not intended to be present, if it changes later the necessary changes will be made by tracking beacons later.
As a side effect, by passing the real frame subtype, now print a correct value for ML reconfiguration responses.
--- net/mac80211/mlme.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
net/mac80211/mlme.c +28 -5
@@ -1218,18 +1218,36 @@ EXPORT_SYMBOL_IF_MAC80211_KUNIT(ieee80211_determine_chan_mode);static int ieee80211_config_bw (struct ieee80211_link_data *link,struct ieee802_11_elems *elems, -bool update,u64 *changed, -const char *frame) +bool update,u64 *changed,u16 stype) {struct ieee80211_channel *channel = link->conf->chanreq.oper.chan;struct ieee80211_sub_if_data *sdata = link->sdata;struct ieee80211_chan_req chanreq = {};struct cfg80211_chan_def ap_chandef;enum ieee80211_conn_mode ap_mode; +const char *frame;u32 vht_cap_info =0 ;u16 ht_opmode;int ret; +switch (stype) { +case IEEE80211_STYPE_BEACON : + frame ="beacon" ; +break ; +case IEEE80211_STYPE_ASSOC_RESP : + frame ="assoc response" ; +break ; +case IEEE80211_STYPE_REASSOC_RESP : + frame ="reassoc response" ; +break ; +case IEEE80211_STYPE_ACTION : +/* the only action frame that gets here */ + frame ="ML reconf response" ; +break ; +default : +return -EINVAL ; + } +/* don't track any bandwidth changes in legacy/S1G modes */ if (link->u.mgd.conn.mode ==IEEE80211_CONN_MODE_LEGACY || link->u.mgd.conn.mode ==IEEE80211_CONN_MODE_S1G )
@@ -1278,7 +1296,9 @@ static int ieee80211_config_bw(struct ieee80211_link_data *link, ieee80211_min_bw_limit_from_chandef(&chanreq.oper))ieee80211_chandef_downgrade (&chanreq.oper,NULL ); -if (ap_chandef.chan->band ==NL80211_BAND_6GHZ && +/* TPE element is not present in (re)assoc/ML reconfig response */ +if (stype ==IEEE80211_STYPE_BEACON && + ap_chandef.chan->band ==NL80211_BAND_6GHZ && link->u.mgd.conn.mode >=IEEE80211_CONN_MODE_HE ) {ieee80211_rearrange_tpe (&elems->tpe, &ap_chandef, &chanreq.oper);
@@ -5290,7 +5310,9 @@ static bool ieee80211_assoc_config_link(struct ieee80211_link_data *link,/* check/update if AP changed anything in assoc response vs. scan */ if (ieee80211_config_bw (link, elems, link_id == assoc_data->assoc_link_id, - changed,"assoc response" )) { + changed, +le16_to_cpu (mgmt->frame_control) & +IEEE80211_FCTL_STYPE )) { ret = false; goto out; }
@@ -7478,7 +7500,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link, changed |=ieee80211_recalc_twt_req (sdata, sband, link, link_sta, elems); -if (ieee80211_config_bw (link, elems, true, &changed,"beacon" )) { +if (ieee80211_config_bw (link, elems, true, &changed, +IEEE80211_STYPE_BEACON )) {ieee80211_set_disassoc (sdata,IEEE80211_STYPE_DEAUTH ,WLAN_REASON_DEAUTH_LEAVING , true, deauth_buf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 225/515 wifi: mac80211: handle WLAN_HT_ACTION_NOTIFY_CHANWIDTH async
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 93370f2d37f50757a810da409efc0223c342527e ]
If this action frame, with the value of IEEE80211_HT_CHANWIDTH_ANY, arrives right after a beacon that changed the operational bandwidth from 20 MHz to 40 MHz, then updating the rate control bandwidth to 40 can race with updating the chanctx width (that happens in the beacon proccesing) back to 40 MHz:
cpu0 cpu1
ieee80211_rx_mgmt_beaconieee80211_config_bwieee80211_link_change_chanreq
(*)ieee80211_link_update_chanreq
ieee80211_rx_h_action (**)ieee80211_sta_cur_vht_bw
(***) ieee80211_recalc_chanctx_chantype
in (**), the maximum between the capability width and the bss width is returned. But the bss width was just updated to 40 in (*), so the action frame handling code will increase the width of the rate control before the chanctx was increased (in ***), leading to a FW error (at least in iwlwifi driver. But this is wrong regardless).
Fix this by simply handling the action frame async, so it won't race with the beacon proccessing.
--- net/mac80211/ht.c | 40 +++++++++++++++++++++++++++++++++++++- net/mac80211/ieee80211_i.h | 6 ++++++ net/mac80211/iface.c | 29 +++++++++++++++++++++++++++ net/mac80211/rx.c | 35 ++++++--------------------------- 4 files changed, 80 insertions(+), 30 deletions(-)
net/mac80211/ht.c +39 -1
@@ -9,7 +9,7 @@* Copyright 2007, Michael Wu <[email protected]> * Copyright 2007-2010, Intel Corporation * Copyright 2017 Intel Deutschland GmbH -* Copyright(c) 2020-2024 Intel Corporation +* Copyright(c) 2020-2025 Intel Corporation */ #include <linux/ieee80211.h>
@@ -603,3 +603,41 @@ void ieee80211_request_smps(struct ieee80211_vif *vif, unsigned int link_id, }/* this might change ... don't want non-open drivers using it */ EXPORT_SYMBOL_GPL (ieee80211_request_smps); + +void ieee80211_ht_handle_chanwidth_notif (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct sta_info *sta, +struct link_sta_info *link_sta, +u8 chanwidth,enum nl80211_band band) +{ +enum ieee80211_sta_rx_bandwidth max_bw, new_bw; +struct ieee80211_supported_band *sband; +struct sta_opmode_info sta_opmode = {}; + +lockdep_assert_wiphy (local->hw.wiphy); + +if (chanwidth ==IEEE80211_HT_CHANWIDTH_20MHZ ) + max_bw =IEEE80211_STA_RX_BW_20 ; +else + max_bw =ieee80211_sta_cap_rx_bw (link_sta); + +/* set cur_max_bandwidth and recalc sta bw */ + link_sta->cur_max_bandwidth = max_bw; + new_bw =ieee80211_sta_cur_vht_bw (link_sta); + +if (link_sta->pub->bandwidth == new_bw) +return ; + + link_sta->pub->bandwidth = new_bw; + sband = local->hw.wiphy->bands[band]; + sta_opmode.bw = +ieee80211_sta_rx_bw_to_chan_width (link_sta); + sta_opmode.changed =STA_OPMODE_MAX_BW_CHANGED ; + +rate_control_rate_update (local, sband, link_sta, +IEEE80211_RC_BW_CHANGED ); +cfg80211_sta_opmode_change_notify (sdata->dev, + sta->addr, + &sta_opmode, +GFP_KERNEL ); +}
net/mac80211/ieee80211_i.h +6 -0
@@ -2205,6 +2205,12 @@ u8 ieee80211_mcs_to_chains(const struct ieee80211_mcs_info *mcs);enum nl80211_smps_mode ieee80211_smps_mode_to_smps_mode (enum ieee80211_smps_mode smps); +void ieee80211_ht_handle_chanwidth_notif (struct ieee80211_local *local, +struct ieee80211_sub_if_data *sdata, +struct sta_info *sta, +struct link_sta_info *link_sta, +u8 chanwidth,enum nl80211_band band); +/* VHT */ void ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata,
net/mac80211/iface.c +29 -0
@@ -1521,6 +1521,35 @@ static void ieee80211_iface_process_skb(struct ieee80211_local *local,break ; } } + }else if (ieee80211_is_action (mgmt->frame_control) && + mgmt->u.action.category ==WLAN_CATEGORY_HT ) { +switch (mgmt->u.action.u.ht_smps.action) { +case WLAN_HT_ACTION_NOTIFY_CHANWIDTH : { +u8 chanwidth = mgmt->u.action.u.ht_notify_cw.chanwidth; +struct ieee80211_rx_status *status; +struct link_sta_info *link_sta; +struct sta_info *sta; + + sta =sta_info_get_bss (sdata, mgmt->sa); +if (!sta) +break ; + + status =IEEE80211_SKB_RXCB (skb); +if (!status->link_valid) + link_sta = &sta->deflink; +else + link_sta =rcu_dereference_protected (sta->link[status->link_id], +lockdep_is_held (&local->hw.wiphy->mtx)); +if (link_sta) +ieee80211_ht_handle_chanwidth_notif (local, sdata, sta, + link_sta, chanwidth, + status->band); +break ; + } +default : +WARN_ON (1 ); +break ; + } }else if (ieee80211_is_action (mgmt->frame_control) && mgmt->u.action.category ==WLAN_CATEGORY_VHT ) {switch (mgmt->u.action.u.vht_group_notif.action_code) {
net/mac80211/rx.c +6 -29
@@ -3576,41 +3576,18 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) goto handled; }case WLAN_HT_ACTION_NOTIFY_CHANWIDTH : { -struct ieee80211_supported_band *sband;u8 chanwidth = mgmt->u.action.u.ht_notify_cw.chanwidth; -enum ieee80211_sta_rx_bandwidth max_bw, new_bw; -struct sta_opmode_info sta_opmode = {}; + +if (chanwidth !=IEEE80211_HT_CHANWIDTH_20MHZ && + chanwidth !=IEEE80211_HT_CHANWIDTH_ANY ) + goto invalid;/* If it doesn't support 40 MHz it can't change ... */ if (!(rx->link_sta->pub->ht_cap.cap & -IEEE80211_HT_CAP_SUP_WIDTH_20_40 )) - goto handled; - -if (chanwidth ==IEEE80211_HT_CHANWIDTH_20MHZ ) - max_bw =IEEE80211_STA_RX_BW_20 ; -else - max_bw =ieee80211_sta_cap_rx_bw (rx->link_sta); - -/* set cur_max_bandwidth and recalc sta bw */ - rx->link_sta->cur_max_bandwidth = max_bw; - new_bw =ieee80211_sta_cur_vht_bw (rx->link_sta); - -if (rx->link_sta->pub->bandwidth == new_bw) +IEEE80211_HT_CAP_SUP_WIDTH_20_40 )) goto handled; - rx->link_sta->pub->bandwidth = new_bw; - sband = rx->local->hw.wiphy->bands[status->band]; - sta_opmode.bw = -ieee80211_sta_rx_bw_to_chan_width (rx->link_sta); - sta_opmode.changed =STA_OPMODE_MAX_BW_CHANGED ; - -rate_control_rate_update (local, sband, rx->link_sta, -IEEE80211_RC_BW_CHANGED ); -cfg80211_sta_opmode_change_notify (sdata->dev, - rx->sta->addr, - &sta_opmode, -GFP_ATOMIC ); - goto handled; + goto queue; }default : goto invalid;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 226/515 wifi: cfg80211: Fix interface type validation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilan Peer <[email protected]>
[ Upstream commit 14450be2332a49445106403492a367412b8c23f4 ]
Fix a condition that verified valid values of interface types.
--- include/net/cfg80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/cfg80211.h +1 -1
@@ -633,7 +633,7 @@ ieee80211_get_sband_iftype_data(const struct ieee80211_supported_band *sband,const struct ieee80211_sband_iftype_data *data;int i; -if (WARN_ON (iftype >=NL80211_IFTYPE_MAX )) +if (WARN_ON (iftype >=NUM_NL80211_IFTYPES ))return NULL ;if (iftype ==NL80211_IFTYPE_AP_VLAN )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 227/515 wifi: mac80211: dont unreserve never reserved chanctx
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit a6d521bafcb290294128a51b13dbf4baae5748fc ]
If a link has no chanctx, indicating it is an inactive link that we tracked CSA for, then attempting to unreserve the reserved chanctx will throw a warning and fail, since there never was a reserved chanctx. Skip the unreserve.
--- net/mac80211/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/mlme.c +2 -1
@@ -2535,7 +2535,8 @@ ieee80211_sta_abort_chanswitch(struct ieee80211_link_data *link)if (!local->ops->abort_channel_switch)return ; -ieee80211_link_unreserve_chanctx (link); +if (rcu_access_pointer (link->conf->chanctx_conf)) +ieee80211_link_unreserve_chanctx (link);ieee80211_vif_unblock_queues_csa (sdata);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 228/515 net: ipv4: fix incorrect MTU in broadcast routes
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oscar Maes <[email protected]>
[ Upstream commit 9e30ecf23b1b8f091f7d08b27968dea83aae7908 ]
Currently, __mkroute_output overrules the MTU value configured for broadcast routes.
This buggy behaviour can be reproduced with:
ip link set dev eth1 mtu 9000
ip route del broadcast 192.168.0.255 dev eth1 proto kernel scope link src 192.168.0.2 ip route add broadcast 192.168.0.255 dev eth1 proto kernel scope link src 192.168.0.2 mtu 1500
The maximum packet size should be 1500, but it is actually 8000:
ping -b 192.168.0.255 -s 8000
Fix __mkroute_output to allow MTU values to be configured for for broadcast routes (to support a mixed-MTU local-area-network).
--- net/ipv4/route.c | 1 - 1 file changed, 1 deletion(-)
net/ipv4/route.c +0 -1
@@ -2578,7 +2578,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res, do_cache = true;if (type ==RTN_BROADCAST ) { flags |=RTCF_BROADCAST |RTCF_LOCAL ; - fi =NULL ; } else if (type == RTN_MULTICAST) { flags |= RTCF_MULTICAST | RTCF_LOCAL; if (!ip_check_mc_rcu(in_dev, fl4->daddr, fl4->saddr,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 229/515 net: thunderx: Fix format-truncation warning in bgx_acpi_match_id()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 53d20606c40678d425cc03f0978c614dca51f25e ]
The buffer bgx_sel used in snprintf() was too small to safely hold the formatted string "BGX%d" for all valid bgx_id values. This caused a -Wformat-truncation warning with Werror enabled during build.
Increase the buffer size from 5 to 7 and use sizeof(bgx_sel) in snprintf() to ensure safety and suppress the warning.
Build warning:
CC drivers/net/ethernet/cavium/thunder/thunder_bgx.o
drivers/net/ethernet/cavium/thunder/thunder_bgx.c: In function
‘bgx_acpi_match_id’:
drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:27: error: ‘%d’
directive output may be truncated writing between 1 and 3 bytes into a region of size 2 [-Werror=format-truncation=]
snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id);
^~
drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:23: note:
directive argument in the range [0, 255]
snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id);
^~~~~~~
drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1434:2: note:
‘snprintf’ output between 5 and 7 bytes into a destination of size 5
snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id);compiler warning due to insufficient snprintf buffer size.
--- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/cavium/thunder/thunder_bgx.c +2 -2
@@ -1429,9 +1429,9 @@ static acpi_status bgx_acpi_match_id(acpi_handle handle, u32 lvl, {struct acpi_buffer string = {ACPI_ALLOCATE_BUFFER ,NULL };struct bgx *bgx = context; -char bgx_sel[5 ]; +char bgx_sel[7 ]; -snprintf (bgx_sel,5 ,"BGX%d" , bgx->bgx_id); +snprintf (bgx_sel,sizeof (bgx_sel),"BGX%d" , bgx->bgx_id);if (ACPI_FAILURE (acpi_get_name (handle,ACPI_SINGLE_NAME , &string))) {pr_warn ("Invalid link device\n" );return AE_OK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 230/515 net: phy: micrel: Add ksz9131_resume()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Biju Das <[email protected]>
[ Upstream commit f25a7eaa897f21396e99f90809af82ca553c9d14 ]
The Renesas RZ/G3E SMARC EVK uses KSZ9131RNXC phy. On deep power state, PHY loses the power and on wakeup the rgmii delays are not reconfigured causing it to fail.
Replace the callback kszphy_resume()->ksz9131_resume() for reconfiguring the rgmii_delay when it exits from PM suspend state.
--- drivers/net/phy/micrel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/phy/micrel.c +9 -1
@@ -5410,6 +5410,14 @@ static int lan8841_suspend(struct phy_device *phydev)return kszphy_generic_suspend (phydev); } +static int ksz9131_resume (struct phy_device *phydev) +{ +if (phydev->suspended &&phy_interface_is_rgmii (phydev)) +ksz9131_config_rgmii_delay (phydev); + +return kszphy_resume (phydev); +} +static struct phy_driver ksphy_driver[] = { { .phy_id =PHY_ID_KS8737 ,
@@ -5656,7 +5664,7 @@ static struct phy_driver ksphy_driver[] = { .get_strings = kszphy_get_strings, .get_stats = kszphy_get_stats, .suspend = kszphy_suspend, - .resume = kszphy_resume, + .resume = ksz9131_resume, .cable_test_start = ksz9x31_cable_test_start, .cable_test_get_status = ksz9x31_cable_test_get_status, .get_features = ksz9477_get_features,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 231/515 perf/cxlpmu: Remove unintended newline from IRQ name format string
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit 3e870815ccf5bc75274158f0b5e234fce6f93229 ]
The IRQ name format string used in devm_kasprintf() mistakenly included a newline character "\n".
This could lead to confusing log output or misformatted names in sysfs or debug messages.
This fix removes the newline to ensure proper IRQ naming.
--- drivers/perf/cxl_pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/perf/cxl_pmu.c +1 -1
@@ -873,7 +873,7 @@ static int cxl_pmu_probe(struct device *dev)return rc; irq = rc; - irq_name =devm_kasprintf (dev,GFP_KERNEL ,"%s_overflow\n" , dev_name); + irq_name =devm_kasprintf (dev,GFP_KERNEL ,"%s_overflow" , dev_name);if (!irq_name)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 232/515 sched/deadline: Fix accounting after global limits change
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Juri Lelli <[email protected]>
[ Upstream commit 440989c10f4e32620e9e2717ca52c3ed7ae11048 ]
A global limits change (sched_rt_handler() logic) currently leaves stale and/or incorrect values in variables related to accounting (e.g. extra_bw).
Properly clean up per runqueue variables before implementing the change and rebuild scheduling domains (so that accounting is also properly restored) after such a change is complete.
--- kernel/sched/deadline.c | 4 +++- kernel/sched/rt.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
kernel/sched/deadline.c +3 -1
@@ -3249,6 +3249,9 @@ void sched_dl_do_global(void)if (global_rt_runtime () !=RUNTIME_INF ) new_bw =to_ratio (global_rt_period (),global_rt_runtime ()); +for_each_possible_cpu (cpu) +init_dl_rq_bw_ratio (&cpu_rq (cpu)->dl); +for_each_possible_cpu (cpu) {rcu_read_lock_sched ();
@@ -3264,7 +3267,6 @@ void sched_dl_do_global(void)raw_spin_unlock_irqrestore (&dl_b->lock, flags);rcu_read_unlock_sched (); -init_dl_rq_bw_ratio (&cpu_rq (cpu)->dl); } }
kernel/sched/rt.c +6 -0
@@ -2936,6 +2936,12 @@ static int sched_rt_handler(const struct ctl_table *table, int write, void *buffsched_domains_mutex_unlock ();mutex_unlock (&mutex); +/* +* After changing maximum available bandwidth for DEADLINE, we need to +* recompute per root domain and per cpus variables accordingly. +*/ +rebuild_sched_domains (); +return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 233/515 bpf: Forget ranges when refining tnum after JSET
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
[ Upstream commit 6279846b9b2532e1b04559ef8bd0dec049f29383 ]
Syzbot reported a kernel warning due to a range invariant violation on the following BPF program.
0: call bpf_get_netns_cookie
1: if r0 == 0 goto <exit>
2: if r0 & Oxffffffff goto <exit>
The issue is on the path where we fall through both jumps.
That path is unreachable at runtime: after insn 1, we know r0 != 0, but with the sign extension on the jset, we would only fallthrough insn 2 if r0 == 0. Unfortunately, is_branch_taken() isn't currently able to figure this out, so the verifier walks all branches. The verifier then refines the register bounds using the second condition and we end up with inconsistent bounds on this unreachable path:
1: if r0 == 0 goto <exit>
r0: u64=[0x1, 0xffffffffffffffff] var_off=(0, 0xffffffffffffffff)
2: if r0 & 0xffffffff goto <exit>
r0 before reg_bounds_sync: u64=[0x1, 0xffffffffffffffff] var_off=(0, 0)
r0 after reg_bounds_sync: u64=[0x1, 0] var_off=(0, 0)Improving the range refinement for JSET to cover all cases is tricky. We also don't expect many users to rely on JSET given LLVM doesn't generate those instructions. So instead of improving the range refinement for JSETs, Eduard suggested we forget the ranges whenever we're narrowing tnums after a JSET. This patch implements that approach.
--- kernel/bpf/verifier.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/bpf/verifier.c +4 -0
@@ -16014,6 +16014,10 @@ static void regs_refine_cond_op(struct bpf_reg_state *reg1, struct bpf_reg_stateif (!is_reg_const (reg2, is_jmp32))break ; val =reg_const_value (reg2, is_jmp32); +/* Forget the ranges before narrowing tnums, to avoid invariant +* violations if we're on a dead branch. +*/ +__mark_reg_unbounded (reg1);if (is_jmp32) { t =tnum_and (tnum_subreg (reg1->var_off),tnum_const (~val)); reg1->var_off =tnum_with_subreg (reg1->var_off, t);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 234/515 wifi: iwlwifi: mvm: set gtk id also in older FWs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 61be9803f322ab46f31ba944c6ef7de195891f64 ]
We use gtk[i].id, but it is not even set in older FW APIs (iwl_wowlan_status_v6 and iwl_wowlan_status_v7). Set it also in older FWs.
--- drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/d3.c +2 -0
@@ -2387,6 +2387,7 @@ static void iwl_mvm_convert_gtk_v2(struct iwl_wowlan_status_data *status, status->gtk[0 ].len = data->key_len; status->gtk[0 ].flags = data->key_flags; + status->gtk[0 ].id = status->gtk[0 ].flags &IWL_WOWLAN_GTK_IDX_MASK ;memcpy (status->gtk[0 ].key, data->key,sizeof (data->key));
@@ -2737,6 +2738,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id)* currently used key. */ status->gtk[0 ].flags = v6->gtk.key_index |BIT (7 ); + status->gtk[0 ].id = v6->gtk.key_index; }else if (notif_ver ==7 ) {struct iwl_wowlan_status_v7 *v7 = (void *)cmd.resp_pkt->data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 235/515 wifi: iwlwifi: mld: fix scan request validation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avraham Stern <[email protected]>
[ Upstream commit d1f5f881ac2c5dc185a88c7bfe47d2b3ecbbc501 ]
The scan request validation function uses bitwise and instead of logical and. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mld/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/scan.c +1 -1
@@ -359,7 +359,7 @@ iwl_mld_scan_fits(struct iwl_mld *mld, int n_ssids, struct ieee80211_scan_ies *ies, int n_channels) {return ((n_ssids <=PROBE_OPTION_MAX ) && - (n_channels <= mld->fw->ucode_capa.n_scan_channels) & + (n_channels <= mld->fw->ucode_capa.n_scan_channels) && (ies->common_ie_len + ies->len[NL80211_BAND_2GHZ ] + ies->len[NL80211_BAND_5GHZ ] + ies->len[NL80211_BAND_6GHZ ] <=iwl_mld_scan_max_template_size ()));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 236/515 um: Re-evaluate thread flags repeatedly
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit b9e2f2246eb2b5617d53af7b5e4e1b8c916f26a8 ]
The thread flags may change during their processing.
For example a task_work can queue a new signal to be sent. This signal should be delivered before returning to usespace again.
Evaluate the flags repeatedly similar to other architectures.
--- arch/um/include/asm/thread_info.h | 4 ++++ arch/um/kernel/process.c | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-)
arch/um/include/asm/thread_info.h +4 -0
@@ -50,7 +50,11 @@ struct thread_info {#define _TIF_NOTIFY_SIGNAL (1 << TIF_NOTIFY_SIGNAL)#define _TIF_MEMDIE (1 << TIF_MEMDIE)#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) +#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)#define _TIF_SECCOMP (1 << TIF_SECCOMP)#define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) +#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL | \ + _TIF_NOTIFY_RESUME) +#endif
arch/um/kernel/process.c +12 -8
@@ -82,14 +82,18 @@ struct task_struct *__switch_to(struct task_struct *from, struct task_struct *tovoid interrupt_end (void ) {struct pt_regs *regs = ¤t->thread.regs; - -if (need_resched ()) -schedule (); -if (test_thread_flag (TIF_SIGPENDING ) || -test_thread_flag (TIF_NOTIFY_SIGNAL )) -do_signal (regs); -if (test_thread_flag (TIF_NOTIFY_RESUME )) -resume_user_mode_work (regs); +unsigned long thread_flags; + + thread_flags =read_thread_flags (); +while (thread_flags & _TIF_WORK_MASK) { +if (thread_flags & _TIF_NEED_RESCHED) +schedule (); +if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL)) +do_signal (regs); +if (thread_flags & _TIF_NOTIFY_RESUME) +resume_user_mode_work (regs); + thread_flags =read_thread_flags (); + } }int get_current_pid (void )
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 237/515 wifi: iwlwifi: mvm: fix scan request validation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avraham Stern <[email protected]>
[ Upstream commit 7c2f3ec7707188d8d5269ae2dce97d7be3e9f261 ]
The scan request validation function uses bitwise and instead of logical and. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +1 -1
@@ -835,7 +835,7 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids, int n_channels) { return ((n_ssids <= PROBE_OPTION_MAX) && - (n_channels <= mvm->fw->ucode_capa.n_scan_channels) & + (n_channels <= mvm->fw->ucode_capa.n_scan_channels) && (ies->common_ie_len + ies->len[NL80211_BAND_2GHZ] + ies->len[NL80211_BAND_5GHZ] + ies->len[NL80211_BAND_6GHZ] <=
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 238/515 drm/sched: Avoid memory leaks with cancel_job() callback
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Stanner <[email protected]>
[ Upstream commit bf8bbaefaa6ae0a07971ea57b3208df60e8ad0a4 ]
Since its inception, the GPU scheduler can leak memory if the driver calls drm_sched_fini() while there are still jobs in flight.
The simplest way to solve this in a backwards compatible manner is by adding a new callback, drm_sched_backend_ops.cancel_job(), which instructs the driver to signal the hardware fence associated with the job. Afterwards, the scheduler can safely use the established free_job() callback for freeing the job.
Implement the new backend_ops callback cancel_job().
--- drivers/gpu/drm/scheduler/sched_main.c | 34 ++++++++++++++++---------- include/drm/gpu_scheduler.h | 18 ++++++++++++++ 2 files changed, 39 insertions(+), 13 deletions(-)
drivers/gpu/drm/scheduler/sched_main.c +21 -13
@@ -1335,6 +1335,18 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, const struct drm_sched_init_ }EXPORT_SYMBOL (drm_sched_init); +static void drm_sched_cancel_remaining_jobs (struct drm_gpu_scheduler *sched) +{ +struct drm_sched_job *job, *tmp; + +/* All other accessors are stopped. No locking necessary. */ +list_for_each_entry_safe_reverse (job, tmp, &sched->pending_list, list) { + sched->ops->cancel_job (job); +list_del (&job->list); + sched->ops->free_job (job); + } +} +/** * drm_sched_fini - Destroy a gpu scheduler *
@@ -1342,19 +1354,11 @@ EXPORT_SYMBOL(drm_sched_init);* * Tears down and cleans up the scheduler. * -* This stops submission of new jobs to the hardware through -* drm_sched_backend_ops.run_job(). Consequently, drm_sched_backend_ops.free_job() -* will not be called for all jobs still in drm_gpu_scheduler.pending_list. -* There is no solution for this currently. Thus, it is up to the driver to make -* sure that: -* -* a) drm_sched_fini() is only called after for all submitted jobs -* drm_sched_backend_ops.free_job() has been called or that -* b) the jobs for which drm_sched_backend_ops.free_job() has not been called -* after drm_sched_fini() ran are freed manually. -* -* FIXME: Take care of the above problem and prevent this function from leaking -* the jobs in drm_gpu_scheduler.pending_list under any circumstances. +* This stops submission of new jobs to the hardware through &struct +* drm_sched_backend_ops.run_job. If &struct drm_sched_backend_ops.cancel_job +* is implemented, all jobs will be canceled through it and afterwards cleaned +* up through &struct drm_sched_backend_ops.free_job. If cancel_job is not +* implemented, memory could leak. */ void drm_sched_fini (struct drm_gpu_scheduler *sched) {
@@ -1384,6 +1388,10 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched)/* Confirm no work left behind accessing device structures */ cancel_delayed_work_sync (&sched->work_tdr); +/* Avoid memory leaks if supported by the driver. */ +if (sched->ops->cancel_job) +drm_sched_cancel_remaining_jobs (sched); +if (sched->own_submit_wq)destroy_workqueue (sched->submit_wq); sched->ready = false;
include/drm/gpu_scheduler.h +18 -0
@@ -466,6 +466,24 @@ struct drm_sched_backend_ops {* and it's time to clean it up. */ void (*free_job)(struct drm_sched_job *sched_job); + +/** +* @cancel_job: Used by the scheduler to guarantee remaining jobs' fences +* get signaled in drm_sched_fini(). +* +* Used by the scheduler to cancel all jobs that have not been executed +* with &struct drm_sched_backend_ops.run_job by the time +* drm_sched_fini() gets invoked. +* +* Drivers need to signal the passed job's hardware fence with an +* appropriate error code (e.g., -ECANCELED) in this callback. They +* must not free the job. +* +* The scheduler will only call this callback once it stopped calling +* all other callbacks forever, with the exception of &struct +* drm_sched_backend_ops.free_job. +*/ +void (*cancel_job)(struct drm_sched_job *sched_job); };/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 239/515 s390/stp: Remove udelay from stp_sync_clock()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sven Schnelle <[email protected]>
[ Upstream commit b367017cdac21781a74eff4e208d3d38e1f38d3f ]
When an stp sync check is handled on a system with multiple cpus each cpu gets a machine check but only the first one actually handles the sync operation. All other CPUs spin waiting for the first one to finish with a short udelay(). But udelay can't be used here as the first CPU modifies tod_clock_base before performing the sync op. During this timeframe get_tod_clock_monotonic() might return a non-monotonic time.
The time spent waiting should be very short and udelay is a busy loop anyways, therefore simply remove the udelay.
--- arch/s390/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/time.c +1 -1
@@ -580,7 +580,7 @@ static int stp_sync_clock(void *data)atomic_dec (&sync->cpus);/* Wait for in_sync to be set. */ while (READ_ONCE (sync->in_sync) ==0 ) -__udelay (1 ); + ; }if (sync->in_sync !=1 )/* Didn't work. Clear per-cpu in sync bit again. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 240/515 net: phy: bcm54811: PHY initialization
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kamil Horák - 2N <[email protected]>
[ Upstream commit 3117a11fff5af9e74f4946f07cb3ca083cbbdf4b ]
Reset the bit 12 in PHY's LRE Control register upon initialization. According to the datasheet, this bit must be written to zero after every device reset.
--- drivers/net/phy/broadcom.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/net/phy/broadcom.c +21 -4
@@ -655,7 +655,7 @@ static int bcm5481x_read_abilities(struct phy_device *phydev) {struct device_node *np = phydev->mdio.dev.of_node;struct bcm54xx_phy_priv *priv = phydev->priv; -int i, val, err; +int i, val, err, aneg;for (i =0 ; i <ARRAY_SIZE (bcm54811_linkmodes); i++)linkmode_clear_bit (bcm54811_linkmodes[i], phydev->supported);
@@ -676,9 +676,19 @@ static int bcm5481x_read_abilities(struct phy_device *phydev)if (val <0 )return val; +/* BCM54811 is not capable of LDS but the corresponding bit +* in LRESR is set to 1 and marked "Ignore" in the datasheet. +* So we must read the bcm54811 as unable to auto-negotiate +* in BroadR-Reach mode. +*/ +if (BRCM_PHY_MODEL (phydev) ==PHY_ID_BCM54811 ) + aneg =0 ; +else + aneg = val &LRESR_LDSABILITY ; +linkmode_mod_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported, - val &LRESR_LDSABILITY ); + aneg);linkmode_mod_bit (ETHTOOL_LINK_MODE_100baseT1_Full_BIT, phydev->supported, val &LRESR_100_1PAIR );
@@ -735,8 +745,15 @@ static int bcm54811_config_aneg(struct phy_device *phydev)/* Aneg firstly. */ if (priv->brr_mode) { -/* BCM54811 is only capable of autonegotiation in IEEE mode */ - phydev->autoneg =0 ; +/* BCM54811 is only capable of autonegotiation in IEEE mode. +* In BroadR-Reach mode, disable the Long Distance Signaling, +* the BRR mode autoneg as supported in other Broadcom PHYs. +* This bit is marked as "Reserved" and "Default 1, must be +* written to 0 after every device reset" in the datasheet. +*/ + ret =phy_modify (phydev,MII_BCM54XX_LRECR ,LRECR_LDSEN ,0 ); +if (ret <0 ) +return ret; ret =bcm_config_lre_aneg (phydev, false); }else { ret =genphy_config_aneg (phydev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 241/515 Add #undef TRACE_INCLUDE_FILE
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nam Cao <[email protected]>
[ Upstream commit 2d088762631b212eb0809e112642843844ef64eb ]
Without "#undef TRACE_INCLUDE_FILE", there could be a build error due to TRACE_INCLUDE_FILE being redefined. Therefore add it.
Also fix a typo while at it.
--- kernel/trace/rv/rv_trace.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/rv/rv_trace.h +2 -1
@@ -129,8 +129,9 @@ DECLARE_EVENT_CLASS(error_da_monitor_id,#endif /* CONFIG_DA_MON_EVENTS_ID */ #endif /* _TRACE_RV_H */ -/* This part ust be outside protection */ +/* This part must be outside protection */ #undef TRACE_INCLUDE_PATH#define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE#define TRACE_INCLUDE_FILE rv_trace#include <trace/define_trace.h>
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 242/515 sched/fair: Bump sd->max_newidle_lb_cost when newidle balance fails
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Mason <[email protected]>
[ Upstream commit 155213a2aed42c85361bf4f5c817f5cb68951c3b ]
schbench (https://github.com/masoncl/schbench.git) is showing a regression from previous production kernels that bisected down to:
sched/fair: Remove sysctl_sched_migration_cost condition (c5b0a7eefc)
The schbench command line was:
schbench -L -m 4 -M auto -t 256 -n 0 -r 0 -s 0
This creates 4 message threads pinned to CPUs 0-3, and 256x4 worker threads spread across the rest of the CPUs. Neither the worker threads or the message threads do any work, they just wake each other up and go back to sleep as soon as possible.
The end result is the first 4 CPUs are pegged waking up those 1024 workers, and the rest of the CPUs are constantly banging in and out of idle. If I take a v6.9 Linus kernel and revert that one commit, performance goes from 3.4M RPS to 5.4M RPS.
schedstat shows there are ~100x more new idle balance operations, and profiling shows the worker threads are spending ~20% of their CPU time on new idle balance. schedstats also shows that almost all of these new idle balance attemps are failing to find busy groups.
The fix used here is to crank up the cost of the newidle balance whenever it fails. Since we don't want sd->max_newidle_lb_cost to grow out of control, this also changes update_newidle_cost() to use sysctl_sched_migration_cost as the upper limit on max_newidle_lb_cost.
--- kernel/sched/fair.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
kernel/sched/fair.c +16 -3
@@ -12170,8 +12170,14 @@ static inline bool update_newidle_cost(struct sched_domain *sd, u64 cost)/* * Track max cost of a domain to make sure to not delay the * next wakeup on the CPU. +* +* sched_balance_newidle() bumps the cost whenever newidle +* balance fails, and we don't want things to grow out of +* control. Use the sysctl_sched_migration_cost as the upper +* limit, plus a litle extra to avoid off by ones. */ - sd->max_newidle_lb_cost = cost; + sd->max_newidle_lb_cost = +min (cost, sysctl_sched_migration_cost +200 ); sd->last_decay_max_lb_cost = jiffies; }else if (time_after (jiffies, sd->last_decay_max_lb_cost +HZ )) {/*
@@ -12863,10 +12869,17 @@ static int sched_balance_newidle(struct rq *this_rq, struct rq_flags *rf) t1 =sched_clock_cpu (this_cpu); domain_cost = t1 - t0; -update_newidle_cost (sd, domain_cost); - curr_cost += domain_cost; t0 = t1; + +/* +* Failing newidle means it is not effective; +* bump the cost so we end up doing less of it. +*/ +if (!pulled_task) + domain_cost = (3 * sd->max_newidle_lb_cost) /2 ; + +update_newidle_cost (sd, domain_cost); }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 243/515 wifi: mac80211: dont complete management TX on SAE commit
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit 6b04716cdcac37bdbacde34def08bc6fdb5fc4e2 ]
When SAE commit is sent and received in response, there's no ordering for the SAE confirm messages. As such, don't call drivers to stop listening on the channel when the confirm message is still expected.
This fixes an issue if the local confirm is transmitted later than the AP's confirm, for iwlwifi (and possibly mt76) the AP's confirm would then get lost since the device isn't on the channel at the time the AP transmit the confirm.
For iwlwifi at least, this also improves the overall timing of the authentication handshake (by about 15ms according to the report), likely since the session protection won't be aborted and rescheduled.
Note that even before this, mgd_complete_tx() wasn't always called for each call to mgd_prepare_tx() (e.g. in the case of WEP key shared authentication), and the current drivers that have the complete callback don't seem to mind. Document this as well though.
--- include/net/mac80211.h | 2 ++ net/mac80211/mlme.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
include/net/mac80211.h +2 -0
@@ -4296,6 +4296,8 @@ struct ieee80211_prep_tx_info {* @mgd_complete_tx: Notify the driver that the response frame for a previously * transmitted frame announced with @mgd_prepare_tx was received, the data * is filled similarly to @mgd_prepare_tx though the duration is not used. +* Note that this isn't always called for each mgd_prepare_tx() call, for +* example for SAE the 'confirm' messages can be on the air in any order. * * @mgd_protect_tdls_discover: Protect a TDLS discovery session. After sending * a TDLS discovery-request, we expect a reply to arrive on the AP's
net/mac80211/mlme.c +8 -1
@@ -4754,6 +4754,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,struct ieee80211_prep_tx_info info = { .subtype =IEEE80211_STYPE_AUTH , }; +bool sae_need_confirm = false;lockdep_assert_wiphy (sdata->local->hw.wiphy);
@@ -4799,6 +4800,8 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, jiffies +IEEE80211_AUTH_WAIT_SAE_RETRY ; ifmgd->auth_data->timeout_started = true;run_again (sdata, ifmgd->auth_data->timeout); +if (auth_transaction ==1 ) + sae_need_confirm = true; goto notify_driver; }
@@ -4841,6 +4844,9 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ifmgd->auth_data->expected_transaction == 2)) {if (!ieee80211_mark_sta_auth (sdata))return ;/* ignore frame -- wait for timeout */ + } else if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE && + auth_transaction == 1) { + sae_need_confirm = true; } else if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE && auth_transaction == 2) {sdata_info (sdata,"SAE peer confirmed\n" );
@@ -4849,7 +4855,8 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,cfg80211_rx_mlme_mgmt (sdata->dev, (u8 *)mgmt, len); notify_driver: -drv_mgd_complete_tx (sdata->local, sdata, &info); +if (!sae_need_confirm) +drv_mgd_complete_tx (sdata->local, sdata, &info); }#define case_WLAN (type) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 244/515 wifi: mac80211: avoid weird state in error path
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit be1ba9ed221ffb95a8bb15f4c83d0694225ba808 ]
If we get to the error path of ieee80211_prep_connection, for example because of a FW issue, then ieee80211_vif_set_links is called with 0.
But the call to drv_change_vif_links from ieee80211_vif_update_links will probably fail as well, for the same reason.
In this case, the valid_links and active_links bitmaps will be reverted to the value of the failing connection.
Then, in the next connection, due to the logic of ieee80211_set_vif_links_bitmaps, valid_links will be set to the ID of the new connection assoc link, but the active_links will remain with the ID of the old connection's assoc link.
If those IDs are different, we get into a weird state of valid_links and active_links being different. One of the consequences of this state is to call drv_change_vif_links with new_links as 0, since the & operation between the bitmaps will be 0.
Since a removal of a link should always succeed, ignore the return value of drv_change_vif_links if it was called to only remove links, which is the case for the ieee80211_prep_connection's error path. That way, the bitmaps will not be reverted to have the value from the failing connection and will have 0, so the next connection will have a good state.
--- include/net/mac80211.h | 2 ++ net/mac80211/link.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-)
include/net/mac80211.h +2 -0
@@ -4462,6 +4462,8 @@ struct ieee80211_prep_tx_info {* new links bitmaps may be 0 if going from/to a non-MLO situation. * The @old array contains pointers to the old bss_conf structures * that were already removed, in case they're needed. +* Note that removal of link should always succeed, so the return value +* will be ignored in a removal only case. * This callback can sleep. * @change_sta_links: Change the valid links of a station, similar to * @change_vif_links. This callback can sleep.
net/mac80211/link.c +8 -1
@@ -2,7 +2,7 @@/* * MLO link handling * -* Copyright (C) 2022-2024 Intel Corporation +* Copyright (C) 2022-2025 Intel Corporation */ #include <linux/slab.h> #include <linux/kernel.h>
@@ -368,6 +368,13 @@ static int ieee80211_vif_update_links(struct ieee80211_sub_if_data *sdata,ieee80211_update_apvlan_links (sdata); } +/* +* Ignore errors if we are only removing links as removal should +* always succeed +*/ +if (!new_links) + ret =0 ; +if (ret) {/* restore config */ memcpy (sdata->link, old_data,sizeof (old_data));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 245/515 s390/early: Copy last breaking event address to pt_regs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
[ Upstream commit 7cf636c99b257c1b4b12066ab34fd5f06e8d892f ]
In case of an early crash the early program check handler also prints the last breaking event address which is contained within the pt_regs structure. However it is not initialized, and therefore a more or less random value is printed in case of a crash.
Copy the last breaking event address from lowcore to pt_regs in case of an early program check to address this. This also makes it easier to analyze early crashes.
--- arch/s390/kernel/early.c | 1 + 1 file changed, 1 insertion(+)
arch/s390/kernel/early.c +1 -0
@@ -154,6 +154,7 @@ void __init __do_early_pgm_check(struct pt_regs *regs) regs->int_code = lc->pgm_int_code; regs->int_parm_long = lc->trans_exc_code; + regs->last_break = lc->pgm_last_break; ip =__rewind_psw (regs->psw, regs->int_code >>16 );/* Monitor Event? Might be a warning */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 246/515 (powerpc/512) Fix possible `dma_unmap_single()` on uninitialized pointer
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 760b9b4f6de9a33ca56a05f950cabe82138d25bd ]
If the device configuration fails (if dma_dev->device_config()), sg_dma_address(&sg) is not initialized and the jump to err_dma_prep leads to calling dma_unmap_single() on sg_dma_address(&sg).
--- arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/powerpc/platforms/512x/mpc512x_lpbfifo.c +2 -4
@@ -240,10 +240,8 @@ static int mpc512x_lpbfifo_kick(void) dma_conf.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ;/* Make DMA channel work with LPB FIFO data register */ -if (dma_dev->device_config (lpbfifo.chan, &dma_conf)) { - ret = -EINVAL ; - goto err_dma_prep; - } +if (dma_dev->device_config (lpbfifo.chan, &dma_conf)) +return -EINVAL ;sg_init_table (&sg,1 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 247/515 ipv6: mcast: Check inet6_dev->dead under idev->mc_lock in __ipv6_dev_mc_inc().
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit dbd40f318cf2f59759bd170c401adc20ba360a3e ]
Since commit 63ed8de4be81 ("mld: add mc_lock for protecting per-interface mld data"), every multicast resource is protected by inet6_dev->mc_lock.
RTNL is unnecessary in terms of protection but still needed for synchronisation between addrconf_ifdown() and __ipv6_dev_mc_inc().
Once we removed RTNL, there would be a race below, where we could add a multicast address to a dead inet6_dev.
CPU1 CPU2
==== ====
addrconf_ifdown() __ipv6_dev_mc_inc()
if (idev->dead) <-- false
dead = true return -ENODEV;
ipv6_mc_destroy_dev() / ipv6_mc_down()
mutex_lock(&idev->mc_lock)
...
mutex_unlock(&idev->mc_lock)
mutex_lock(&idev->mc_lock)
...
mutex_unlock(&idev->mc_lock)The race window can be easily closed by checking inet6_dev->dead under inet6_dev->mc_lock in __ipv6_dev_mc_inc() as addrconf_ifdown() will acquire it after marking inet6_dev dead.
Let's check inet6_dev->dead under mc_lock in __ipv6_dev_mc_inc().
Note that now __ipv6_dev_mc_inc() no longer depends on RTNL and we can remove ASSERT_RTNL() there and the RTNL comment above addrconf_join_solict().
--- net/ipv6/addrconf.c | 7 +++---- net/ipv6/mcast.c | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-)
net/ipv6/addrconf.c +3 -4
@@ -2229,13 +2229,12 @@ void addrconf_dad_failure(struct sk_buff *skb, struct inet6_ifaddr *ifp)in6_ifa_put (ifp); } -/* Join to solicited addr multicast group. -* caller must hold RTNL */ +/* Join to solicited addr multicast group. */ void addrconf_join_solict (struct net_device *dev,const struct in6_addr *addr) {struct in6_addr maddr; -if (dev->flags&(IFF_LOOPBACK |IFF_NOARP )) +if (READ_ONCE (dev->flags) & (IFF_LOOPBACK |IFF_NOARP ))return ;addrconf_addr_solict_mult (addr, &maddr);
@@ -3860,7 +3859,7 @@ static int addrconf_ifdown(struct net_device *dev, bool unregister)* Do not dev_put! */ if (unregister) { - idev->dead =1 ; +WRITE_ONCE (idev->dead,1 );/* protected by rtnl_lock */ RCU_INIT_POINTER (dev->ip6_ptr,NULL );
net/ipv6/mcast.c +5 -6
@@ -945,23 +945,22 @@ static void inet6_ifmcaddr_notify(struct net_device *dev,static int __ipv6_dev_mc_inc (struct net_device *dev,const struct in6_addr *addr,unsigned int mode) { -struct ifmcaddr6 *mc;struct inet6_dev *idev; - -ASSERT_RTNL (); +struct ifmcaddr6 *mc;/* we need to take a reference on idev */ idev =in6_dev_get (dev); -if (!idev)return -EINVAL ; -if (idev->dead) { +mutex_lock (&idev->mc_lock); + +if (READ_ONCE (idev->dead)) { +mutex_unlock (&idev->mc_lock);in6_dev_put (idev);return -ENODEV ; } -mutex_lock (&idev->mc_lock);for_each_mc_mclock (idev, mc) {if (ipv6_addr_equal (&mc->mca_addr, addr)) { mc->mca_users++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 248/515 rcu/nocb: Fix possible invalid rdps->nocb_cb_kthread pointer access
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zqiang <[email protected]>
[ Upstream commit 1bba3900ca18bdae28d1b9fa10f16a8f8cb2ada1 ]
In the preparation stage of CPU online, if the corresponding the rdp's->nocb_cb_kthread does not exist, will be created, there is a situation where the rdp's rcuop kthreads creation fails, and then de-offload this CPU's rdp, does not assign this CPU's rdp->nocb_cb_kthread pointer, but this rdp's->nocb_gp_rdp and rdp's->rdp_gp->nocb_gp_kthread is still valid.
This will cause the subsequent re-offload operation of this offline CPU, which will pass the conditional check and the kthread_unpark() will access invalid rdp's->nocb_cb_kthread pointer.
This commit therefore use rdp's->nocb_gp_kthread instead of rdp_gp's->nocb_gp_kthread for safety check.
--- kernel/rcu/tree_nocb.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/rcu/tree_nocb.h +2 -3
@@ -1152,7 +1152,6 @@ static bool rcu_nocb_rdp_offload_wait_cond(struct rcu_data *rdp)static int rcu_nocb_rdp_offload (struct rcu_data *rdp) {int wake_gp; -struct rcu_data *rdp_gp = rdp->nocb_gp_rdp;WARN_ON_ONCE (cpu_online (rdp->cpu));/*
@@ -1162,7 +1161,7 @@ static int rcu_nocb_rdp_offload(struct rcu_data *rdp)if (!rdp->nocb_gp_rdp)return -EINVAL ; -if (WARN_ON_ONCE (!rdp_gp->nocb_gp_kthread)) +if (WARN_ON_ONCE (!rdp->nocb_gp_kthread))return -EINVAL ;pr_info ("Offloading %d\n" , rdp->cpu);
@@ -1172,7 +1171,7 @@ static int rcu_nocb_rdp_offload(struct rcu_data *rdp) wake_gp =rcu_nocb_queue_toggle_rdp (rdp);if (wake_gp) -wake_up_process (rdp_gp->nocb_gp_kthread); +wake_up_process (rdp->nocb_gp_kthread);swait_event_exclusive (rdp->nocb_state_wq,rcu_nocb_rdp_offload_wait_cond (rdp));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 249/515 wifi: mac80211: fix rx link assignment for non-MLO stations
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Chandrakanthan <[email protected]>
[ Upstream commit cc2b722132893164bcb3cee4f08ed056e126eb6c ]
Currently, ieee80211_rx_data_set_sta() does not correctly handle the case where the interface supports multiple links (MLO), but the station does not (non-MLO). This can lead to incorrect link assignment or unexpected warnings when accessing link information.
Hence, add a fix to check if the station lacks valid link support and use its default link ID for rx->link assignment. If the station unexpectedly has valid links, fall back to the default link.
This ensures correct link association and prevents potential issues in mixed MLO/non-MLO environments.
--- net/mac80211/rx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/mac80211/rx.c +9 -3
@@ -4211,10 +4211,16 @@ static bool ieee80211_rx_data_set_sta(struct ieee80211_rx_data *rx, rx->link_sta =NULL ; } -if (link_id <0 ) - rx->link = &rx->sdata->deflink; -else if (!ieee80211_rx_data_set_link (rx, link_id)) +if (link_id <0 ) { +if (ieee80211_vif_is_mld (&rx->sdata->vif) && + sta && !sta->sta.valid_links) + rx->link = +rcu_dereference (rx->sdata->link[sta->deflink.link_id]); +else + rx->link = &rx->sdata->deflink; + }else if (!ieee80211_rx_data_set_link (rx, link_id)) {return false; + }return true; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 250/515 wifi: mt76: mt7996: Fix mlink lookup in mt7996_tx_prepare_skb
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lorenzo Bianconi <[email protected]>
[ Upstream commit 59ea7af6f9ce218b86f9f46520819247c3a5f97b ]
Use proper link_id in mt7996_tx_prepare_skb routine for mlink lookup.
--- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7996/mac.c +2 -2
@@ -1059,9 +1059,9 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,if (wcid->offchannel) mlink =rcu_dereference (mvif->mt76.offchannel_link);if (!mlink) - mlink = &mvif->deflink.mt76; + mlink =rcu_dereference (mvif->mt76.link[wcid->link_id]); - txp->fw.bss_idx = mlink->idx; + txp->fw.bss_idx = mlink ? mlink->idx : mvif->deflink.mt76.idx; } txp->fw.token =cpu_to_le16 (id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 251/515 wifi: mt76: fix vif link allocation
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
[ Upstream commit 53a5d72bdd70e262623b6009cc4754927b428bad ]
Reuse the vif deflink for link_id = 0 in order to avoid confusion with vif->bss_conf, which also gets a link id of 0.
--- drivers/net/wireless/mediatek/mt76/channel.c | 4 ++-- drivers/net/wireless/mediatek/mt76/mt76.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/channel.c +2 -2
@@ -173,13 +173,13 @@ void mt76_unassign_vif_chanctx(struct ieee80211_hw *hw,if (!mlink) goto out; -if (link_conf != &vif->bss_conf) +if (mlink != (struct mt76_vif_link *)vif->drv_priv)rcu_assign_pointer (mvif->link[link_id],NULL ); dev->drv->vif_link_remove (phy, vif, link_conf, mlink); mlink->ctx =NULL ; -if (link_conf != &vif->bss_conf) +if (mlink != (struct mt76_vif_link *)vif->drv_priv)kfree_rcu (mlink, rcu_head); out:
drivers/net/wireless/mediatek/mt76/mt76.h +4 -1
@@ -1852,6 +1852,9 @@ mt76_vif_link(struct mt76_dev *dev, struct ieee80211_vif *vif, int link_id)struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif->drv_priv;struct mt76_vif_data *mvif = mlink->mvif; +if (!link_id) +return mlink; +return mt76_dereference (mvif->link[link_id], dev); }
@@ -1862,7 +1865,7 @@ mt76_vif_conf_link(struct mt76_dev *dev, struct ieee80211_vif *vif,struct mt76_vif_link *mlink = (struct mt76_vif_link *)vif->drv_priv;struct mt76_vif_data *mvif = mlink->mvif; -if (link_conf == &vif->bss_conf) +if (link_conf == &vif->bss_conf || !link_conf->link_id)return mlink;return mt76_dereference (mvif->link[link_conf->link_id], dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 252/515 drm/fbdev-client: Skip DRM clients if modesetting is absent
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thierry Reding <[email protected]>
[ Upstream commit cce91f29c088ba902dd2abfc9c3216ba9a2fb2fe ]
Recent generations of Tegra have moved the display components outside of host1x, leading to a device that has no CRTCs attached and hence doesn't support any of the modesetting functionality. When this is detected, the driver clears the DRIVER_MODESET and DRIVER_ATOMIC flags for the device.
Unfortunately, this causes the following errors during boot:
[ 15.418958] ERR KERN drm drm: [drm] *ERROR* Failed to register client: -95
[ 15.425311] WARNING KERN drm drm: [drm] Failed to set up DRM client; error -95These originate from the fbdev client checking for the presence of the DRIVER_MODESET flag and returning -EOPNOTSUPP. However, if a driver does not support DRIVER_MODESET this is entirely expected and the error isn't helpful.
Prevent this misleading error message by setting up the DRM clients only if modesetting is enabled.
Changes in v2:
- use DRIVER_MODESET check to avoid registering any clients
--- drivers/gpu/drm/clients/drm_client_setup.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/clients/drm_client_setup.c +5 -0
@@ -2,6 +2,7 @@#include <drm/clients/drm_client_setup.h> #include <drm/drm_device.h> +#include <drm/drm_drv.h> #include <drm/drm_fourcc.h> #include <drm/drm_print.h>
@@ -31,6 +32,10 @@ MODULE_PARM_DESC(active,*/ void drm_client_setup (struct drm_device *dev,const struct drm_format_info *format) { +if (!drm_core_check_feature (dev,DRIVER_MODESET )) { +drm_dbg (dev,"driver does not support mode-setting, skipping DRM clients\n" ); +return ; + }#ifdef CONFIG_DRM_FBDEV_EMULATION if (!strcmp (drm_client_default,"fbdev" )) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 253/515 drm/msm: Update register xml
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 6733d8276ac02a8790e571d2af4a69a9039d0522 ]
Sync register xml from mesa commit eb3e0b7164a3 ("freedreno/a6xx: Split descriptors out into their own file").
Patchwork: https://patchwork.freedesktop.org/patch/662470/
--- drivers/gpu/drm/msm/Makefile | 5 + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 4 + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 2 +- .../drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 4 +- drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 3582 +++-------------- .../msm/registers/adreno/a6xx_descriptors.xml | 198 + .../drm/msm/registers/adreno/a6xx_enums.xml | 383 ++ .../msm/registers/adreno/a6xx_perfcntrs.xml | 600 +++ .../drm/msm/registers/adreno/a7xx_enums.xml | 223 + .../msm/registers/adreno/a7xx_perfcntrs.xml | 1030 +++++ .../drm/msm/registers/adreno/adreno_pm4.xml | 302 +- 14 files changed, 3312 insertions(+), 3027 deletions(-) create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_descriptors.xml create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_perfcntrs.xml create mode 100644 drivers/gpu/drm/msm/registers/adreno/a7xx_enums.xml create mode 100644 drivers/gpu/drm/msm/registers/adreno/a7xx_perfcntrs.xml
drivers/gpu/drm/msm/Makefile +5 -0
@@ -196,6 +196,11 @@ ADRENO_HEADERS = \ generated/a4xx.xml.h \ generated/a5xx.xml.h \ generated/a6xx.xml.h \ + generated/a6xx_descriptors.xml.h \ + generated/a6xx_enums.xml.h \ + generated/a6xx_perfcntrs.xml.h \ + generated/a7xx_enums.xml.h \ + generated/a7xx_perfcntrs.xml.h \ generated/a6xx_gmu.xml.h \ generated/adreno_common.xml.h \ generated/adreno_pm4.xml.h \
drivers/gpu/drm/msm/adreno/a6xx_catalog.c +1 -1
@@ -1343,7 +1343,7 @@ static const uint32_t a7xx_pwrup_reglist_regs[] = {REG_A6XX_RB_NC_MODE_CNTL ,REG_A6XX_RB_CMP_DBG_ECO_CNTL ,REG_A7XX_GRAS_NC_MODE_CNTL , -REG_A6XX_RB_CONTEXT_SWITCH_GMEM_SAVE_RESTORE , +REG_A6XX_RB_CONTEXT_SWITCH_GMEM_SAVE_RESTORE_ENABLE ,REG_A6XX_UCHE_GBIF_GX_CONFIG ,REG_A6XX_UCHE_CLIENT_PF , REG_A6XX_TPL1_DBG_ECO_CNTL1,
drivers/gpu/drm/msm/adreno/a6xx_gpu.h +4 -0
@@ -6,6 +6,10 @@#include "adreno_gpu.h" +#include "a6xx_enums.xml.h" +#include "a7xx_enums.xml.h" +#include "a6xx_perfcntrs.xml.h" +#include "a7xx_perfcntrs.xml.h" #include "a6xx.xml.h" #include "a6xx_gmu.h"
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +1 -1
@@ -158,7 +158,7 @@ static int a6xx_crashdumper_run(struct msm_gpu *gpu,/* Make sure all pending memory writes are posted */ wmb (); -gpu_write64 (gpu,REG_A6XX_CP_CRASH_SCRIPT_BASE , dumper->iova); +gpu_write64 (gpu,REG_A6XX_CP_CRASH_DUMP_SCRIPT_BASE , dumper->iova);gpu_write (gpu,REG_A6XX_CP_CRASH_DUMP_CNTL ,1 );
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h +1 -1
@@ -212,7 +212,7 @@ static const struct a6xx_shader_block {SHADER (A6XX_SP_LB_5_DATA ,0x200 ),SHADER (A6XX_SP_CB_BINDLESS_DATA ,0x800 ),SHADER (A6XX_SP_CB_LEGACY_DATA ,0x280 ), -SHADER (A6XX_SP_UAV_DATA ,0x80 ), +SHADER (A6XX_SP_GFX_UAV_BASE_DATA ,0x80 ),SHADER (A6XX_SP_INST_TAG ,0x80 ),SHADER (A6XX_SP_CB_BINDLESS_TAG ,0x80 ), SHADER(A6XX_SP_TMO_UMO_TAG, 0x80),
drivers/gpu/drm/msm/adreno/a6xx_preempt.c +1 -1
@@ -209,7 +209,7 @@ void a6xx_preempt_hw_init(struct msm_gpu *gpu)gpu_write64 (gpu,REG_A6XX_CP_CONTEXT_SWITCH_SMMU_INFO ,0 );/* Enable the GMEM save/restore feature for preemption */ -gpu_write (gpu,REG_A6XX_RB_CONTEXT_SWITCH_GMEM_SAVE_RESTORE ,0x1 ); +gpu_write (gpu,REG_A6XX_RB_CONTEXT_SWITCH_GMEM_SAVE_RESTORE_ENABLE ,0x1 );/* Reset the preemption state */ set_preempt_state (a6xx_gpu,PREEMPT_NONE );
drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h +2 -2
@@ -1311,8 +1311,8 @@ static struct a6xx_indexed_registers gen7_9_0_cp_indexed_reg_list[] = { REG_A7XX_CP_BV_SQE_UCODE_DBG_DATA, 0x08000}, {"CP_BV_SQE_STAT_ADDR" ,REG_A7XX_CP_BV_SQE_STAT_ADDR , REG_A7XX_CP_BV_SQE_STAT_DATA, 0x00040}, - { "CP_RESOURCE_TBL", REG_A7XX_CP_RESOURCE_TBL_DBG_ADDR, - REG_A7XX_CP_RESOURCE_TBL_DBG_DATA, 0x04100}, + { "CP_RESOURCE_TBL", REG_A7XX_CP_RESOURCE_TABLE_DBG_ADDR, + REG_A7XX_CP_RESOURCE_TABLE_DBG_DATA, 0x04100}, { "CP_LPAC_DRAW_STATE_ADDR", REG_A7XX_CP_LPAC_DRAW_STATE_ADDR, REG_A7XX_CP_LPAC_DRAW_STATE_DATA, 0x00200}, { "CP_LPAC_ROQ", REG_A7XX_CP_LPAC_ROQ_DBG_ADDR,
drivers/gpu/drm/msm/registers/adreno/a6xx.xml +650 -2932
2,937 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a6xx_descriptors.xml new file +198 -0
198 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml new file +383 -0
383 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a6xx_perfcntrs.xml new file +600 -0
600 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a7xx_enums.xml new file +223 -0
223 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/a7xx_perfcntrs.xml new file +1030 -0
1,030 lines not on this page · raw message
drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml +213 -89
302 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.5
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 254/515 drm/msm: use trylock for debugfs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Clark <[email protected]>
[ Upstream commit 0a1ff88ec5b60b41ba830c5bf08b6cd8f45ab411 ]
This resolves a potential deadlock vs msm_gem_vm_close(). Otherwise for _NO_SHARE buffers msm_gem_describe() could be trying to acquire the shared vm resv, while already holding priv->obj_lock. But _vm_close() might drop the last reference to a GEM obj while already holding the vm resv, and msm_gem_free_object() needs to grab priv->obj_lock, a locking inversion.
OTOH this is only for debugfs and it isn't critical if we undercount by skipping a locked obj. So just use trylock() and move along if we can't get the lock.
Patchwork: https://patchwork.freedesktop.org/patch/661525/
--- drivers/gpu/drm/msm/msm_gem.c | 3 ++- drivers/gpu/drm/msm/msm_gem.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem.c +2 -1
@@ -963,7 +963,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,uint64_t off =drm_vma_node_start (&obj->vma_node);const char *madv; -msm_gem_lock (obj); +if (!msm_gem_trylock (obj)) +return ; stats->all.count++; stats->all.size += obj->size;
drivers/gpu/drm/msm/msm_gem.h +6 -0
@@ -188,6 +188,12 @@ msm_gem_lock(struct drm_gem_object *obj)dma_resv_lock (obj->resv,NULL ); } +static inline bool __must_check +msm_gem_trylock (struct drm_gem_object *obj) +{ +return dma_resv_trylock (obj->resv); +} +static inline int msm_gem_lock_interruptible (struct drm_gem_object *obj) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 255/515 drm/msm: Add error handling for krealloc in metadata setup
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Chen <[email protected]>
[ Upstream commit 1c8c354098ea9d4376a58c96ae6b65288a6f15d8 ]
Function msm_ioctl_gem_info_set_metadata() now checks for krealloc failure and returns -ENOMEM, avoiding potential NULL pointer dereference. Explicitly avoids __GFP_NOFAIL due to deadlock risks and allocation constraints.
Patchwork: https://patchwork.freedesktop.org/patch/661235/
--- drivers/gpu/drm/msm/msm_drv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +8 -1
@@ -551,6 +551,7 @@ static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj, u32 metadata_size) {struct msm_gem_object *msm_obj =to_msm_bo (obj); +void *new_metadata;void *buf;int ret;
@@ -568,8 +569,14 @@ static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj,if (ret) goto out; - msm_obj->metadata = + new_metadata =krealloc (msm_obj->metadata, metadata_size,GFP_KERNEL ); +if (!new_metadata) { + ret = -ENOMEM ; + goto out; + } + + msm_obj->metadata = new_metadata; msm_obj->metadata_size = metadata_size;memcpy (msm_obj->metadata, buf, metadata_size);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 256/515 perf/arm: Add missing .suppress_bind_attrs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Murphy <[email protected]>
[ Upstream commit 860a831de138a7ad6bc86019adaf10eb84c02655 ]
PMU drivers should set .suppress_bind_attrs so that userspace is denied the opportunity to pull the driver out from underneath an in-use PMU (with predictably unpleasant consequences). Somehow both the CMN and NI drivers have managed to miss this; put that right.
--- drivers/perf/arm-cmn.c | 1 + drivers/perf/arm-ni.c | 1 + 2 files changed, 2 insertions(+)
drivers/perf/arm-cmn.c +1 -0
@@ -2662,6 +2662,7 @@ static struct platform_driver arm_cmn_driver = { .name = "arm-cmn", .of_match_table = of_match_ptr(arm_cmn_of_match), .acpi_match_table = ACPI_PTR(arm_cmn_acpi_match), + .suppress_bind_attrs = true, }, .probe = arm_cmn_probe, .remove = arm_cmn_remove,
drivers/perf/arm-ni.c +1 -0
@@ -709,6 +709,7 @@ static struct platform_driver arm_ni_driver = { .name = "arm-ni", .of_match_table = of_match_ptr(arm_ni_of_match), .acpi_match_table = ACPI_PTR(arm_ni_acpi_match), + .suppress_bind_attrs = true, }, .probe = arm_ni_probe, .remove = arm_ni_remove,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 257/515 drm/imagination: Clear runtime PM errors while resetting the GPU
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alessio Belle <[email protected]>
[ Upstream commit 551507e0d0bf32ce1d7d27533c4b98307380804c ]
The runtime PM might be left in error state if one of the callbacks returned an error, e.g. if the (auto)suspend callback failed following a firmware crash.
When that happens, any further attempt to acquire or release a power reference will then also fail, making it impossible to do anything else with the GPU. The driver logic will eventually reach the reset code.
In pvr_power_reset(), replace pvr_power_get() with a new API pvr_power_get_clear() which also attempts to clear any runtime PM error state if acquiring a power reference is not possible.
--- drivers/gpu/drm/imagination/pvr_power.c | 59 ++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-)
drivers/gpu/drm/imagination/pvr_power.c +58 -1
@@ -317,6 +317,63 @@ pvr_power_device_idle(struct device *dev)return pvr_power_is_idle (pvr_dev) ?0 : -EBUSY ; } +static int +pvr_power_clear_error (struct pvr_device *pvr_dev) +{ +struct device *dev =from_pvr_device (pvr_dev)->dev; +int err; + +/* Ensure the device state is known and nothing is happening past this point */ +pm_runtime_disable (dev); + +/* Attempt to clear the runtime PM error by setting the current state again */ +if (pm_runtime_status_suspended (dev)) + err =pm_runtime_set_suspended (dev); +else + err =pm_runtime_set_active (dev); + +if (err) { +drm_err (from_pvr_device (pvr_dev), +"%s: Failed to clear runtime PM error (new error %d)\n" , + __func__, err); + } + +pm_runtime_enable (dev); + +return err; +} + +/** +* pvr_power_get_clear() - Acquire a power reference, correcting any errors +* @pvr_dev: Device pointer +* +* Attempt to acquire a power reference on the device. If the runtime PM +* is in error state, attempt to clear the error and retry. +* +* Returns: +* * 0 on success, or +* * Any error code returned by pvr_power_get() or the runtime PM API. +*/ +static int +pvr_power_get_clear (struct pvr_device *pvr_dev) +{ +int err; + + err =pvr_power_get (pvr_dev); +if (err ==0 ) +return err; + +drm_warn (from_pvr_device (pvr_dev), +"%s: pvr_power_get returned error %d, attempting recovery\n" , + __func__, err); + + err =pvr_power_clear_error (pvr_dev); +if (err) +return err; + +return pvr_power_get (pvr_dev); +} +/** * pvr_power_reset() - Reset the GPU * @pvr_dev: Device pointer
@@ -341,7 +398,7 @@ pvr_power_reset(struct pvr_device *pvr_dev, bool hard_reset)* Take a power reference during the reset. This should prevent any interference with the * power state during reset. */ -WARN_ON (pvr_power_get (pvr_dev)); +WARN_ON (pvr_power_get_clear (pvr_dev));down_write (&pvr_dev->reset_sem);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 258/515 wifi: rtw89: Fix rtw89_mac_power_switch() for USB
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit e2b71603333a9dd73ee88347d8894fffc3456ac1 ]
Clear some bits in some registers in order to allow RTL8851BU to power on. This is done both when powering on and when powering off because that's what the vendor driver does.
Also tested with RTL8832BU and RTL8832CU.
--- drivers/net/wireless/realtek/rtw89/mac.c | 19 +++++++++++++++++++ drivers/net/wireless/realtek/rtw89/reg.h | 1 + 2 files changed, 20 insertions(+)
drivers/net/wireless/realtek/rtw89/mac.c +19 -0
@@ -1441,6 +1441,23 @@ void rtw89_mac_notify_wake(struct rtw89_dev *rtwdev)rtw89_mac_send_rpwm (rtwdev, state, true); } +static void rtw89_mac_power_switch_boot_mode (struct rtw89_dev *rtwdev) +{ +u32 boot_mode; + +if (rtwdev->hci.type !=RTW89_HCI_TYPE_USB ) +return ; + + boot_mode =rtw89_read32_mask (rtwdev,R_AX_GPIO_MUXCFG ,B_AX_BOOT_MODE ); +if (!boot_mode) +return ; + +rtw89_write32_clr (rtwdev,R_AX_SYS_PW_CTRL ,B_AX_APFN_ONMAC ); +rtw89_write32_clr (rtwdev,R_AX_SYS_STATUS1 ,B_AX_AUTO_WLPON ); +rtw89_write32_clr (rtwdev,R_AX_GPIO_MUXCFG ,B_AX_BOOT_MODE ); +rtw89_write32_clr (rtwdev,R_AX_RSV_CTRL ,B_AX_R_DIS_PRST ); +} +static int rtw89_mac_power_switch (struct rtw89_dev *rtwdev,bool on) {#define PWR_ACT 1
@@ -1451,6 +1468,8 @@ static int rtw89_mac_power_switch(struct rtw89_dev *rtwdev, bool on)int ret;u8 val; +rtw89_mac_power_switch_boot_mode (rtwdev); +if (on) { cfg_seq = chip->pwr_on_seq; cfg_func = chip->ops->pwr_on_func;
drivers/net/wireless/realtek/rtw89/reg.h +1 -0
@@ -182,6 +182,7 @@#define R_AX_SYS_STATUS1 0x00F4#define B_AX_SEL_0XC0_MASK GENMASK(17, 16) +#define B_AX_AUTO_WLPON BIT(10)#define B_AX_PAD_HCI_SEL_V2_MASK GENMASK(5, 3)#define MAC_AX_HCI_SEL_SDIO_UART 0#define MAC_AX_HCI_SEL_MULTI_USB 1
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 259/515 wifi: rtw89: Disable deep power saving for USB/SDIO
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bitterblue Smith <[email protected]>
[ Upstream commit a3b871a0f7c083c2a632a31da8bc3de554ae8550 ]
Disable deep power saving for USB and SDIO because rtw89_mac_send_rpwm() is called in atomic context and accessing hardware registers results in "scheduling while atomic" errors.
--- drivers/net/wireless/realtek/rtw89/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/realtek/rtw89/core.c +3 -0
@@ -2788,6 +2788,9 @@ static enum rtw89_ps_mode rtw89_update_ps_mode(struct rtw89_dev *rtwdev) {const struct rtw89_chip_info *chip = rtwdev->chip; +if (rtwdev->hci.type !=RTW89_HCI_TYPE_PCIE ) +return RTW89_PS_MODE_NONE ; +if (rtw89_disable_ps_mode || !chip->ps_mode_supported ||RTW89_CHK_FW_FEATURE (NO_DEEP_PS , &rtwdev->fw))return RTW89_PS_MODE_NONE ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 260/515 wifi: mt76: mt7915: mcu: re-init MCU before loading FW patch
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Bauer <[email protected]>
[ Upstream commit ac9c50c79eaef5fca0f165e45d0c5880606db53e ]
Restart the MCU and release the patch semaphore before loading the MCU patch firmware from the host.
This fixes failures upon error recovery in case the semaphore was previously taken and never released by the host.
This happens from time to time upon triggering a full-chip error recovery. Under this circumstance, the hardware restart fails and the radio is rendered inoperational.
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +15 -10
@@ -2092,16 +2092,21 @@ static int mt7915_load_firmware(struct mt7915_dev *dev) {int ret; -/* make sure fw is download state */ -if (mt7915_firmware_state (dev, false)) { -/* restart firmware once */ -mt76_connac_mcu_restart (&dev->mt76); - ret =mt7915_firmware_state (dev, false); -if (ret) { -dev_err (dev->mt76.dev, -"Firmware is not ready for download\n" ); -return ret; - } +/* Release Semaphore if taken by previous failed attempt */ + ret =mt76_connac_mcu_patch_sem_ctrl (&dev->mt76, false); +if (ret !=PATCH_REL_SEM_SUCCESS ) { +dev_err (dev->mt76.dev,"Could not release semaphore\n" ); +/* Continue anyways */ + } + +/* Always restart MCU firmware */ +mt76_connac_mcu_restart (&dev->mt76); + +/* Check if MCU is ready */ + ret =mt7915_firmware_state (dev, false); +if (ret) { +dev_err (dev->mt76.dev,"Firmware did not enter download state\n" ); +return ret; } ret =mt76_connac2_load_patch (&dev->mt76,fw_name_var (dev,ROM_PATCH ));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 261/515 wifi: mt76: mt7915: mcu: increase eeprom command timeout
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Bauer <[email protected]>
[ Upstream commit efd31873cdb3e5580fb76eeded6314856f52b06e ]
Increase the timeout for MCU_EXT_CMD_EFUSE_BUFFER_MODE command.
Regular retries upon hardware-recovery have been observed. Increasing the timeout slightly remedies this problem.
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +3 -0
@@ -208,6 +208,9 @@ mt7915_mcu_set_timeout(struct mt76_dev *mdev, int cmd)case MCU_EXT_CMD_BSS_INFO_UPDATE : mdev->mcu.timeout =2 *HZ ;return ; +case MCU_EXT_CMD_EFUSE_BUFFER_MODE : + mdev->mcu.timeout =10 *HZ ; +return ;default :break ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 262/515 kselftest/arm64: Specify SVE data when testing VL set in sve-ptrace
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Brown <[email protected]>
[ Upstream commit 9e8ebfe677f9101bbfe1f75d548a5aec581e8213 ]
Since f916dd32a943 ("arm64/fpsimd: ptrace: Mandate SVE payload for streaming-mode state") we reject attempts to write to the streaming mode regset even if there is no register data supplied, causing the tests for setting vector lengths and setting SVE_VL_INHERIT in sve-ptrace to spuriously fail. Set the flag to avoid the issue, we still support not supplying register data.
--- tools/testing/selftests/arm64/fp/sve-ptrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/arm64/fp/sve-ptrace.c +2 -1
@@ -170,7 +170,7 @@ static void ptrace_set_get_inherit(pid_t child, const struct vec_type *type)memset (&sve,0 ,sizeof (sve)); sve.size =sizeof (sve); sve.vl =sve_vl_from_vq (SVE_VQ_MIN ); - sve.flags =SVE_PT_VL_INHERIT ; + sve.flags =SVE_PT_VL_INHERIT |SVE_PT_REGS_SVE ; ret =set_sve (child, type, &sve);if (ret !=0 ) { ksft_test_result_fail("Failed to set %s SVE_PT_VL_INHERIT\n",
@@ -235,6 +235,7 @@ static void ptrace_set_get_vl(pid_t child, const struct vec_type *type,/* Set the VL by doing a set with no register payload */ memset (&sve,0 ,sizeof (sve)); sve.size =sizeof (sve); + sve.flags =SVE_PT_REGS_SVE ; sve.vl = vl; ret =set_sve (child, type, &sve);if (ret !=0 ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 263/515 drm/xe/xe_query: Use separate iterator while filling GT list
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Roper <[email protected]>
[ Upstream commit d4eb4a010262ea7801e576d1033b355910f2f7d4 ]
The 'id' value updated by for_each_gt() is the uapi GT ID of the GTs being iterated over, and may skip over values if a GT is not present on the device. Use a separate iterator for GT list array assignments to ensure that the array will be filled properly on future platforms where index in the GT query list may not match the uapi ID.
v2:
- Include the missing increment of the iterator. (Jonathan)
--- drivers/gpu/drm/xe/xe_query.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/gpu/drm/xe/xe_query.c +15 -12
@@ -368,6 +368,7 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *querystruct drm_xe_query_gt_list __user *query_ptr =u64_to_user_ptr (query->data);struct drm_xe_query_gt_list *gt_list; +int iter =0 ;u8 id;if (query->size ==0 ) {
@@ -385,12 +386,12 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *queryfor_each_gt (gt, xe, id) {if (xe_gt_is_media_type (gt)) - gt_list->gt_list[id].type =DRM_XE_QUERY_GT_TYPE_MEDIA ; + gt_list->gt_list[iter].type =DRM_XE_QUERY_GT_TYPE_MEDIA ;else - gt_list->gt_list[id].type =DRM_XE_QUERY_GT_TYPE_MAIN ; - gt_list->gt_list[id].tile_id =gt_to_tile (gt)->id; - gt_list->gt_list[id].gt_id = gt->info.id; - gt_list->gt_list[id].reference_clock = gt->info.reference_clock; + gt_list->gt_list[iter].type =DRM_XE_QUERY_GT_TYPE_MAIN ; + gt_list->gt_list[iter].tile_id =gt_to_tile (gt)->id; + gt_list->gt_list[iter].gt_id = gt->info.id; + gt_list->gt_list[iter].reference_clock = gt->info.reference_clock;/* * The mem_regions indexes in the mask below need to * directly identify the struct
@@ -406,19 +407,21 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query* assumption. */ if (!IS_DGFX (xe)) - gt_list->gt_list[id].near_mem_regions =0x1 ; + gt_list->gt_list[iter].near_mem_regions =0x1 ;else - gt_list->gt_list[id].near_mem_regions = + gt_list->gt_list[iter].near_mem_regions =BIT (gt_to_tile (gt)->id) <<1 ; - gt_list->gt_list[id].far_mem_regions = xe->info.mem_region_mask ^ - gt_list->gt_list[id].near_mem_regions; + gt_list->gt_list[iter].far_mem_regions = xe->info.mem_region_mask ^ + gt_list->gt_list[iter].near_mem_regions; - gt_list->gt_list[id].ip_ver_major = + gt_list->gt_list[iter].ip_ver_major =REG_FIELD_GET (GMD_ID_ARCH_MASK , gt->info.gmdid); - gt_list->gt_list[id].ip_ver_minor = + gt_list->gt_list[iter].ip_ver_minor =REG_FIELD_GET (GMD_ID_RELEASE_MASK , gt->info.gmdid); - gt_list->gt_list[id].ip_ver_rev = + gt_list->gt_list[iter].ip_ver_rev =REG_FIELD_GET (GMD_ID_REVID , gt->info.gmdid); + + iter++; }if (copy_to_user (query_ptr, gt_list, size)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 264/515 net: thunderbolt: Enable end-to-end flow control also in transmit
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: zhangjianrong <[email protected]>
[ Upstream commit a8065af3346ebd7c76ebc113451fb3ba94cf7769 ]
According to USB4 specification, if E2E flow control is disabled for the Transmit Descriptor Ring, the Host Interface Adapter Layer shall not require any credits to be available before transmitting a Tunneled Packet from this Transmit Descriptor Ring, so e2e flow control should be enabled in both directions.
--- drivers/net/thunderbolt/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/thunderbolt/main.c +6 -7
@@ -924,8 +924,12 @@ static int tbnet_open(struct net_device *dev)netif_carrier_off (dev); - ring =tb_ring_alloc_tx (xd->tb->nhi,-1 ,TBNET_RING_SIZE , -RING_FLAG_FRAME ); + flags =RING_FLAG_FRAME ; +/* Only enable full E2E if the other end supports it too */ +if (tbnet_e2e && net->svc->prtcstns &TBNET_E2E ) + flags |=RING_FLAG_E2E ; + + ring =tb_ring_alloc_tx (xd->tb->nhi,-1 ,TBNET_RING_SIZE , flags);if (!ring) {netdev_err (dev,"failed to allocate Tx ring\n" );return -ENOMEM ;
@@ -944,11 +948,6 @@ static int tbnet_open(struct net_device *dev) sof_mask =BIT (TBIP_PDF_FRAME_START ); eof_mask =BIT (TBIP_PDF_FRAME_END ); - flags =RING_FLAG_FRAME ; -/* Only enable full E2E if the other end supports it too */ -if (tbnet_e2e && net->svc->prtcstns &TBNET_E2E ) - flags |=RING_FLAG_E2E ; - ring =tb_ring_alloc_rx (xd->tb->nhi,-1 ,TBNET_RING_SIZE , flags, net->tx_ring.ring->hop, sof_mask, eof_mask, tbnet_start_poll, net);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 265/515 net: thunderbolt: Fix the parameter passing of tb_xdomain_enable_paths()/tb_xdomain_disable_paths()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: zhangjianrong <[email protected]>
[ Upstream commit 8ec31cb17cd355cea25cdb8496d9b3fbf1321647 ]
According to the description of tb_xdomain_enable_paths(), the third parameter represents the transmit ring and the fifth parameter represents the receive ring. tb_xdomain_disable_paths() is the same case.
[Jakub] Mika says: it works now because both rings ->hop is the same
--- drivers/net/thunderbolt/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/thunderbolt/main.c +4 -4
@@ -396,9 +396,9 @@ static void tbnet_tear_down(struct tbnet *net, bool send_logout) ret =tb_xdomain_disable_paths (net->xd, net->local_transmit_path, - net->rx_ring.ring->hop, + net->tx_ring.ring->hop, net->remote_transmit_path, - net->tx_ring.ring->hop); + net->rx_ring.ring->hop);if (ret)netdev_warn (net->dev,"failed to disable DMA paths\n" );
@@ -662,9 +662,9 @@ static void tbnet_connected_work(struct work_struct *work) goto err_free_rx_buffers; ret =tb_xdomain_enable_paths (net->xd, net->local_transmit_path, - net->rx_ring.ring->hop, + net->tx_ring.ring->hop, net->remote_transmit_path, - net->tx_ring.ring->hop); + net->rx_ring.ring->hop);if (ret) {netdev_err (net->dev,"failed to enable DMA paths\n" ); goto err_free_tx_buffers;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 266/515 xfrm: Duplicate SPI Handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aakash Kumar S <[email protected]>
[ Upstream commit 94f39804d891cffe4ce17737d295f3b195bc7299 ]
The issue originates when Strongswan initiates an XFRM_MSG_ALLOCSPI Netlink message, which triggers the kernel function xfrm_alloc_spi(). This function is expected to ensure uniqueness of the Security Parameter Index (SPI) for inbound Security Associations (SAs). However, it can return success even when the requested SPI is already in use, leading to duplicate SPIs assigned to multiple inbound SAs, differentiated only by their destination addresses.
This behavior causes inconsistencies during SPI lookups for inbound packets. Since the lookup may return an arbitrary SA among those with the same SPI, packet processing can fail, resulting in packet drops.
According to RFC 4301 section 4.4.2 , for inbound processing a unicast SA is uniquely identified by the SPI and optionally protocol.
Reproducing the Issue Reliably:
To consistently reproduce the problem, restrict the available SPI range in charon.conf : spi_min = 0x10000000 spi_max = 0x10000002
This limits the system to only 2 usable SPI values.
Next, create more than 2 Child SA. each using unique pair of src/dst address. As soon as the 3rd Child SA is initiated, it will be assigned a duplicate SPI, since the SPI pool is already exhausted.
With a narrow SPI range, the issue is consistently reproducible. With a broader/default range, it becomes rare and unpredictable.
Current implementation:xfrm_spi_hash() lookup function computes hash using daddr, proto, and family. So if two SAs have the same SPI but different destination addresses, then they will:
a. Hash into different buckets
b. Be stored in different linked lists (byspi + h)
c. Not be seen in the same hlist_for_each_entry_rcu() iteration.
As a result, the lookup will result in NULL and kernel allows that Duplicate SPI
Proposed Change:xfrm_state_lookup_spi_proto() does a truly global search - across all states, regardless of hash bucket and matches SPI and proto.
--- net/xfrm/xfrm_state.c | 72 ++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 29 deletions(-)
net/xfrm/xfrm_state.c +43 -29
@@ -1702,6 +1702,26 @@ struct xfrm_state *xfrm_state_lookup_byspi(struct net *net, __be32 spi, }EXPORT_SYMBOL (xfrm_state_lookup_byspi); +static struct xfrm_state *xfrm_state_lookup_spi_proto (struct net *net,__be32 spi,u8 proto) +{ +struct xfrm_state *x; +unsigned int i; + +rcu_read_lock (); +for (i =0 ; i <= net->xfrm.state_hmask; i++) { +hlist_for_each_entry_rcu (x, &net->xfrm.state_byspi[i], byspi) { +if (x->id.spi == spi && x->id.proto == proto) { +if (!xfrm_state_hold_rcu (x)) +continue ; +rcu_read_unlock (); +return x; + } + } + } +rcu_read_unlock (); +return NULL ; +} +static void __xfrm_state_insert (struct xfrm_state *x) {struct net *net =xs_net (x);
@@ -2538,10 +2558,8 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high,unsigned int h;struct xfrm_state *x0;int err = -ENOENT ; -__be32 minspi =htonl (low); -__be32 maxspi =htonl (high); +u32 range = high - low +1 ;__be32 newspi =0 ; -u32 mark = x->mark.v & x->mark.m;spin_lock_bh (&x->lock);if (x->km.state ==XFRM_STATE_DEAD ) {
@@ -2555,38 +2573,34 @@ int xfrm_alloc_spi(struct xfrm_state *x, u32 low, u32 high, err = -ENOENT ; -if (minspi == maxspi) { - x0 =xfrm_state_lookup (net, mark, &x->id.daddr, minspi, x->id.proto, x->props.family); -if (x0) { -NL_SET_ERR_MSG (extack,"Requested SPI is already in use" ); -xfrm_state_put (x0); +for (h =0 ; h < range; h++) { +u32 spi = (low == high) ? low :get_random_u32_inclusive (low, high); + newspi =htonl (spi); + +spin_lock_bh (&net->xfrm.xfrm_state_lock); + x0 =xfrm_state_lookup_spi_proto (net, newspi, x->id.proto); +if (!x0) { + x->id.spi = newspi; + h =xfrm_spi_hash (net, &x->id.daddr, newspi, x->id.proto, x->props.family); +XFRM_STATE_INSERT (byspi, &x->byspi, net->xfrm.state_byspi + h, x->xso.type); +spin_unlock_bh (&net->xfrm.xfrm_state_lock); + err =0 ; goto unlock; } - newspi = minspi; - }else { -u32 spi =0 ; -for (h =0 ; h < high-low+1 ; h++) { - spi =get_random_u32_inclusive (low, high); - x0 =xfrm_state_lookup (net, mark, &x->id.daddr,htonl (spi), x->id.proto, x->props.family); -if (x0 ==NULL ) { - newspi =htonl (spi); -break ; - } -xfrm_state_put (x0); +xfrm_state_put (x0); +spin_unlock_bh (&net->xfrm.xfrm_state_lock); + +if (signal_pending (current)) { + err = -ERESTARTSYS ; + goto unlock; } + +if (low == high) +break ; } -if (newspi) { -spin_lock_bh (&net->xfrm.xfrm_state_lock); - x->id.spi = newspi; - h =xfrm_spi_hash (net, &x->id.daddr, x->id.spi, x->id.proto, x->props.family); -XFRM_STATE_INSERT (byspi, &x->byspi, net->xfrm.state_byspi + h, - x->xso.type); -spin_unlock_bh (&net->xfrm.xfrm_state_lock); - err =0 ; - }else { +if (err)NL_SET_ERR_MSG (extack,"No SPI available in the requested range" ); - } unlock:spin_unlock_bh (&x->lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 267/515 net: atlantic: add set_power to fw_ops for atl2 to fix wol
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Work <[email protected]>
[ Upstream commit fad9cf216597a71936ac87143d1618fbbcf97cbe ]
Aquantia AQC113(C) using ATL2FW doesn't properly prepare the NIC for enabling wake-on-lan. The FW operation set_power was only implemented for hw_atl and not hw_atl2. Implement the set_power functionality for hw_atl2.
Tested with both AQC113 and AQC113C devices. Confirmed you can shutdown the system and wake from S5 using magic packets. NIC was previously powered off when entering S5. If the NIC was configured for WOL by the Windows driver, loading the atlantic driver would disable WOL.
Partially cherry-picks changes from commit,
https://github.com/Aquantia/AQtion/commit/37bd5cc
Attributing original authors from Marvell for the referenced commit.
--- .../net/ethernet/aquantia/atlantic/aq_hw.h | 2 + .../atlantic/hw_atl2/hw_atl2_utils_fw.c | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +2 -0
@@ -113,6 +113,8 @@ struct aq_stats_s {#define AQ_HW_POWER_STATE_D0 0U#define AQ_HW_POWER_STATE_D3 3U +#define AQ_FW_WAKE_ON_LINK_RTPM BIT(10) +#define AQ_HW_FLAG_STARTED 0x00000004U#define AQ_HW_FLAG_STOPPING 0x00000008U#define AQ_HW_FLAG_RESETTING 0x00000010U
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +39 -0
@@ -462,6 +462,44 @@ static int aq_a2_fw_get_mac_temp(struct aq_hw_s *self, int *temp)return aq_a2_fw_get_phy_temp (self, temp); } +static int aq_a2_fw_set_wol_params (struct aq_hw_s *self,const u8 *mac,u32 wol) +{ +struct mac_address_aligned_s mac_address; +struct link_control_s link_control; +struct wake_on_lan_s wake_on_lan; + +memcpy (mac_address.aligned.mac_address, mac,ETH_ALEN ); +hw_atl2_shared_buffer_write (self, mac_address, mac_address); + +memset (&wake_on_lan,0 ,sizeof (wake_on_lan)); + +if (wol &WAKE_MAGIC ) + wake_on_lan.wake_on_magic_packet =1U ; + +if (wol & (WAKE_PHY |AQ_FW_WAKE_ON_LINK_RTPM )) + wake_on_lan.wake_on_link_up =1U ; + +hw_atl2_shared_buffer_write (self, sleep_proxy, wake_on_lan); + +hw_atl2_shared_buffer_get (self, link_control, link_control); + link_control.mode =AQ_HOST_MODE_SLEEP_PROXY ; +hw_atl2_shared_buffer_write (self, link_control, link_control); + +return hw_atl2_shared_buffer_finish_ack (self); +} + +static int aq_a2_fw_set_power (struct aq_hw_s *self,unsigned int power_state, +const u8 *mac) +{ +u32 wol = self->aq_nic_cfg->wol; +int err =0 ; + +if (wol) + err =aq_a2_fw_set_wol_params (self, mac, wol); + +return err; +} +static int aq_a2_fw_set_eee_rate (struct aq_hw_s *self,u32 speed) {struct link_options_s link_options;
@@ -605,6 +643,7 @@ const struct aq_fw_ops aq_a2_fw_ops = { .set_state = aq_a2_fw_set_state, .update_link_status = aq_a2_fw_update_link_status, .update_stats = aq_a2_fw_update_stats, + .set_power = aq_a2_fw_set_power, .get_mac_temp = aq_a2_fw_get_mac_temp, .get_phy_temp = aq_a2_fw_get_phy_temp, .set_eee_rate = aq_a2_fw_set_eee_rate,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 268/515 ACPI: Suppress misleading SPCR console message when SPCR table is absent
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Chen <[email protected]>
[ Upstream commit bad3fa2fb9206f4dcec6ddef094ec2fbf6e8dcb2 ]
The kernel currently alway prints:
"Use ACPI SPCR as default console: No/Yes "
even on systems that lack an SPCR table. This can mislead users into thinking the SPCR table exists on the machines without SPCR.
With this change, the "Yes" is only printed if the SPCR table is present, parsed and !param_acpi_nospcr. This avoids user confusion on SPCR-less systems.
--- arch/arm64/kernel/acpi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm64/kernel/acpi.c +7 -3
@@ -197,6 +197,8 @@ static int __init acpi_fadt_sanity_check(void)*/ void __init acpi_boot_table_init (void ) { +int ret; +/* * Enable ACPI instead of device tree unless * - ACPI has been disabled explicitly (acpi=off), or
@@ -250,10 +252,12 @@ void __init acpi_boot_table_init(void)* behaviour, use acpi=nospcr to disable console in ACPI SPCR * table as default serial console. */ -acpi_parse_spcr (earlycon_acpi_spcr_enable, + ret =acpi_parse_spcr (earlycon_acpi_spcr_enable, !param_acpi_nospcr); -pr_info ("Use ACPI SPCR as default console: %s\n" , - param_acpi_nospcr ?"No" :"Yes" ); +if (!ret || param_acpi_nospcr || !IS_ENABLED (CONFIG_ACPI_SPCR_TABLE )) +pr_info ("Use ACPI SPCR as default console: No\n" ); +else +pr_info ("Use ACPI SPCR as default console: Yes\n" );if (IS_ENABLED (CONFIG_ACPI_BGRT ))acpi_table_parse (ACPI_SIG_BGRT , acpi_parse_bgrt);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 269/515 net: ieee8021q: fix insufficient table-size assertion
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: RubenKelevra <[email protected]>
[ Upstream commit 21deb2d966920f0d4dd098ca6c3a55efbc0b2f23 ]
_Static_assert(ARRAY_SIZE(map) != IEEE8021Q_TT_MAX - 1) rejects only a length of 7 and allows any other mismatch. Replace it with a strict equality test via a helper macro so that every mapping table must have exactly IEEE8021Q_TT_MAX (8) entries.
--- net/core/ieee8021q_helpers.c | 44 +++++++++++------------------------- 1 file changed, 13 insertions(+), 31 deletions(-)
net/core/ieee8021q_helpers.c +13 -31
@@ -7,6 +7,11 @@#include <net/dscp.h> #include <net/ieee8021q.h> +/* verify that table covers all 8 traffic types */ +#define TT_MAP_SIZE_OK (tbl) \ + compiletime_assert(ARRAY_SIZE(tbl) == IEEE8021Q_TT_MAX, \ + #tbl " size mismatch") +/* The following arrays map Traffic Types (TT) to traffic classes (TC) for * different number of queues as shown in the example provided by * IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic class mapping" and
@@ -101,51 +106,28 @@ int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt, unsigned int num_queues)switch (num_queues) {case 8 : -compiletime_assert (ARRAY_SIZE (ieee8021q_8queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_8queue_tt_tc_map != max - 1" ); +TT_MAP_SIZE_OK (ieee8021q_8queue_tt_tc_map);return ieee8021q_8queue_tt_tc_map[tt];case 7 : -compiletime_assert (ARRAY_SIZE (ieee8021q_7queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_7queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_7queue_tt_tc_map);return ieee8021q_7queue_tt_tc_map[tt];case 6 : -compiletime_assert (ARRAY_SIZE (ieee8021q_6queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_6queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_6queue_tt_tc_map);return ieee8021q_6queue_tt_tc_map[tt];case 5 : -compiletime_assert (ARRAY_SIZE (ieee8021q_5queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_5queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_5queue_tt_tc_map);return ieee8021q_5queue_tt_tc_map[tt];case 4 : -compiletime_assert (ARRAY_SIZE (ieee8021q_4queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_4queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_4queue_tt_tc_map);return ieee8021q_4queue_tt_tc_map[tt];case 3 : -compiletime_assert (ARRAY_SIZE (ieee8021q_3queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_3queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_3queue_tt_tc_map);return ieee8021q_3queue_tt_tc_map[tt];case 2 : -compiletime_assert (ARRAY_SIZE (ieee8021q_2queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_2queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_2queue_tt_tc_map);return ieee8021q_2queue_tt_tc_map[tt];case 1 : -compiletime_assert (ARRAY_SIZE (ieee8021q_1queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_1queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_1queue_tt_tc_map);return ieee8021q_1queue_tt_tc_map[tt]; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 270/515 net: fec: allow disable coalescing
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Rebmann <[email protected]>
[ Upstream commit b7ad21258f9e9a7f58b19595d5ceed2cde3bed68 ]
In the current implementation, IP coalescing is always enabled and cannot be disabled.
As setting maximum frames to 0 or 1, or setting delay to zero implies immediate delivery of single packets/IRQs, disable coalescing in hardware in these cases.
This also guarantees that coalescing is never enabled with ICFT or ICTT set to zero, a configuration that could lead to unpredictable behaviour according to i.MX8MP reference manual.
--- drivers/net/ethernet/freescale/fec_main.c | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +16 -18
@@ -3124,27 +3124,25 @@ static int fec_enet_us_to_itr_clock(struct net_device *ndev, int us)static void fec_enet_itr_coal_set (struct net_device *ndev) {struct fec_enet_private *fep =netdev_priv (ndev); -int rx_itr, tx_itr; +u32 rx_itr =0 , tx_itr =0 ; +int rx_ictt, tx_ictt; -/* Must be greater than zero to avoid unpredictable behavior */ -if (!fep->rx_time_itr || !fep->rx_pkts_itr || - !fep->tx_time_itr || !fep->tx_pkts_itr) -return ; - -/* Select enet system clock as Interrupt Coalescing -* timer Clock Source -*/ - rx_itr =FEC_ITR_CLK_SEL ; - tx_itr =FEC_ITR_CLK_SEL ; + rx_ictt =fec_enet_us_to_itr_clock (ndev, fep->rx_time_itr); + tx_ictt =fec_enet_us_to_itr_clock (ndev, fep->tx_time_itr); -/* set ICFT and ICTT */ - rx_itr |=FEC_ITR_ICFT (fep->rx_pkts_itr); - rx_itr |=FEC_ITR_ICTT (fec_enet_us_to_itr_clock (ndev, fep->rx_time_itr)); - tx_itr |=FEC_ITR_ICFT (fep->tx_pkts_itr); - tx_itr |=FEC_ITR_ICTT (fec_enet_us_to_itr_clock (ndev, fep->tx_time_itr)); +if (rx_ictt >0 && fep->rx_pkts_itr >1 ) { +/* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ + rx_itr =FEC_ITR_EN |FEC_ITR_CLK_SEL ; + rx_itr |=FEC_ITR_ICFT (fep->rx_pkts_itr); + rx_itr |=FEC_ITR_ICTT (rx_ictt); + } - rx_itr |=FEC_ITR_EN ; - tx_itr |=FEC_ITR_EN ; +if (tx_ictt >0 && fep->tx_pkts_itr >1 ) { +/* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ + tx_itr =FEC_ITR_EN |FEC_ITR_CLK_SEL ; + tx_itr |=FEC_ITR_ICFT (fep->tx_pkts_itr); + tx_itr |=FEC_ITR_ICTT (tx_ictt); + }writel (tx_itr, fep->hwp +FEC_TXIC0 );writel (rx_itr, fep->hwp +FEC_RXIC0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 271/515 drm/amdgpu: Use correct severity for BP threshold exceed event
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Liu <[email protected]>
[ Upstream commit 4a33ca3f6ee9a013a423a867426704e9c9d785bd ]
The severity of CPER for BP threshold exceed event should be set as CPER_SEV_FATAL to match the OOB implementation.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c +4 -2
@@ -212,7 +212,7 @@ int amdgpu_cper_entry_fill_bad_page_threshold_section(struct amdgpu_device *adev NONSTD_SEC_OFFSET(hdr->sec_cnt, idx));amdgpu_cper_entry_fill_section_desc (adev, section_desc, true, false, -CPER_SEV_NUM ,RUNTIME ,NONSTD_SEC_LEN , +CPER_SEV_FATAL ,RUNTIME ,NONSTD_SEC_LEN ,NONSTD_SEC_OFFSET (hdr->sec_cnt, idx)); section->hdr.valid_bits.err_info_cnt =1 ;
@@ -326,7 +326,9 @@ int amdgpu_cper_generate_bp_threshold_record(struct amdgpu_device *adev)return -ENOMEM ; } -amdgpu_cper_entry_fill_hdr (adev, bp_threshold,AMDGPU_CPER_TYPE_BP_THRESHOLD ,CPER_SEV_NUM ); +amdgpu_cper_entry_fill_hdr (adev, bp_threshold, +AMDGPU_CPER_TYPE_BP_THRESHOLD , +CPER_SEV_FATAL ); ret =amdgpu_cper_entry_fill_bad_page_threshold_section (adev, bp_threshold,0 );if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 272/515 drm/amd/display: Separate set_gsl from set_gsl_source_select
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Bakoulin <[email protected]>
[ Upstream commit 660a467a5e7366cd6642de61f1aaeaf0d253ee68 ]
[Why/How]
Separate the checks for set_gsl and set_gsl_source_select, since source_select may not be implemented/necessary.
--- drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +4 -5
@@ -273,14 +273,13 @@ void dcn20_setup_gsl_group_as_lock( }/* at this point we want to program whether it's to enable or disable */ -if (pipe_ctx->stream_res.tg->funcs->set_gsl !=NULL && - pipe_ctx->stream_res.tg->funcs->set_gsl_source_select !=NULL ) { +if (pipe_ctx->stream_res.tg->funcs->set_gsl !=NULL ) { pipe_ctx->stream_res.tg->funcs->set_gsl ( pipe_ctx->stream_res.tg, &gsl); - - pipe_ctx->stream_res.tg->funcs->set_gsl_source_select ( - pipe_ctx->stream_res.tg, group_idx, enable ?4 :0 ); +if (pipe_ctx->stream_res.tg->funcs->set_gsl_source_select !=NULL ) + pipe_ctx->stream_res.tg->funcs->set_gsl_source_select ( + pipe_ctx->stream_res.tg, group_idx, enable ?4 :0 ); }else BREAK_TO_DEBUGGER (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 273/515 drm/amd/display: add null check
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peichen Huang <[email protected]>
[ Upstream commit 158b9201c17fc93ed4253c2f03b77fd2671669a1 ]
[WHY]
Prevents null pointer dereferences to enhance function robustness
[HOW]
Adds early null check and return false if invalid.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -2
@@ -6265,11 +6265,13 @@ struct dc_power_profile dc_get_power_profile_for_dc_state(const struct dc_state*/ bool dc_get_host_router_index (const struct dc_link *link,unsigned int *host_router_index) { -struct dc *dc = link->ctx->dc; +struct dc *dc; -if (link->ep_type !=DISPLAY_ENDPOINT_USB4_DPIA ) +if (!link || !host_router_index || link->ep_type !=DISPLAY_ENDPOINT_USB4_DPIA )return false; + dc = link->ctx->dc; +if (link->link_index < dc->lowest_dpia_link_index)return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 274/515 wifi: ath10k: shutdown driver when hardware is unreliable
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kang Yang <[email protected]>
[ Upstream commit c256a94d1b1b15109740306f7f2a7c2173e12072 ]
In rare cases, ath10k may lose connection with the PCIe bus due to some unknown reasons, which could further lead to system crashes during resuming due to watchdog timeout:
ath10k_pci 0000:01:00.0: wmi command 20486 timeout, restarting hardware ath10k_pci 0000:01:00.0: already restartingath10k_pci 0000:01:00.0: failed to stop WMI vdev 0: -11 ath10k_pci 0000:01:00.0: failed to stop vdev 0: -11 ieee80211 phy0: PM: **** DPM device timeout ****
Call Trace: panic+0x125/0x315 dpm_watchdog_set+0x54/0x54 dpm_watchdog_handler+0x57/0x57 call_timer_fn+0x31/0x13c
At this point, all WMI commands will timeout and attempt to restart device. So set a threshold for consecutive restart failures. If the threshold is exceeded, consider the hardware is unreliable and all ath10k operations should be skipped to avoid system crash.
fail_cont_count and pending_recovery are atomic variables, and do not involve complex conditional logic. Therefore, even if recovery check and reconfig complete are executed concurrently, the recovery mechanism will not be broken.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1
--- drivers/net/wireless/ath/ath10k/core.c | 48 +++++++++++++++++++++++--- drivers/net/wireless/ath/ath10k/core.h | 11 ++++-- drivers/net/wireless/ath/ath10k/mac.c | 7 +++- drivers/net/wireless/ath/ath10k/wmi.c | 6 ++++ 4 files changed, 63 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +43 -5
@@ -2491,12 +2491,50 @@ static int ath10k_init_hw_params(struct ath10k *ar)return 0 ; } +static bool ath10k_core_needs_recovery (struct ath10k *ar) +{ +long time_left; + +/* Sometimes the recovery will fail and then the next all recovery fail, +* so avoid infinite recovery. +*/ +if (atomic_read (&ar->fail_cont_count) >=ATH10K_RECOVERY_MAX_FAIL_COUNT ) { +ath10k_err (ar,"consecutive fail %d times, will shutdown driver!" , +atomic_read (&ar->fail_cont_count)); + ar->state =ATH10K_STATE_WEDGED ; +return false; + } + +ath10k_dbg (ar,ATH10K_DBG_BOOT ,"total recovery count: %d" , ++ar->recovery_count); + +if (atomic_read (&ar->pending_recovery)) { +/* Sometimes it happened another recovery work before the previous one +* completed, then the second recovery work will destroy the previous +* one, thus below is to avoid that. +*/ + time_left =wait_for_completion_timeout (&ar->driver_recovery, +ATH10K_RECOVERY_TIMEOUT_HZ ); +if (time_left) { +ath10k_warn (ar,"previous recovery succeeded, skip this!\n" ); +return false; + } + +/* Record the continuous recovery fail count when recovery failed. */ +atomic_inc (&ar->fail_cont_count); + +/* Avoid having multiple recoveries at the same time. */ +return false; + } + +atomic_inc (&ar->pending_recovery); + +return true; +} +void ath10k_core_start_recovery (struct ath10k *ar) { -if (test_and_set_bit (ATH10K_FLAG_RESTARTING , &ar->dev_flags)) { -ath10k_warn (ar,"already restarting\n" ); +if (!ath10k_core_needs_recovery (ar))return ; - }queue_work (ar->workqueue, &ar->restart_work); }
@@ -2532,6 +2570,8 @@ static void ath10k_core_restart(struct work_struct *work) struct ath10k *ar = container_of(work, struct ath10k, restart_work);int ret; +reinit_completion (&ar->driver_recovery); +set_bit (ATH10K_FLAG_CRASH_FLUSH , &ar->dev_flags);/* Place a barrier to make sure the compiler doesn't reorder
@@ -2596,8 +2636,6 @@ static void ath10k_core_restart(struct work_struct *work)if (ret)ath10k_warn (ar,"failed to send firmware crash dump via devcoredump: %d" , ret); - -complete (&ar->driver_recovery); }static void ath10k_core_set_coverage_class_work (struct work_struct *work)
drivers/net/wireless/ath/ath10k/core.h +8 -3
@@ -4,6 +4,7 @@* Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #ifndef _CORE_H_
@@ -87,6 +88,8 @@ IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER)#define ATH10K_ITER_RESUME_FLAGS (IEEE80211_IFACE_ITER_RESUME_ALL |\ IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER) +#define ATH10K_RECOVERY_TIMEOUT_HZ (5 * HZ) +#define ATH10K_RECOVERY_MAX_FAIL_COUNT 4struct ath10k ;
@@ -865,9 +868,6 @@ enum ath10k_dev_flags {/* Per Station statistics service */ ATH10K_FLAG_PEER_STATS , -/* Indicates that ath10k device is during recovery process and not complete */ -ATH10K_FLAG_RESTARTING , -/* protected by conf_mutex */ ATH10K_FLAG_NAPI_ENABLED, };
@@ -1211,6 +1211,11 @@ struct ath10k {struct work_struct bundle_tx_work;struct work_struct tx_complete_work; +atomic_t pending_recovery; +unsigned int recovery_count; +/* continuous recovery fail count */ +atomic_t fail_cont_count; +/* cycle count is reported twice for each visited channel during scan. * access protected by data_lock */
drivers/net/wireless/ath/ath10k/mac.c +6 -1
@@ -8139,7 +8139,12 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,ath10k_info (ar,"device successfully recovered\n" ); ar->state =ATH10K_STATE_ON ;ieee80211_wake_queues (ar->hw); -clear_bit (ATH10K_FLAG_RESTARTING , &ar->dev_flags); + +/* Clear recovery state. */ +complete (&ar->driver_recovery); +atomic_set (&ar->fail_cont_count,0 ); +atomic_set (&ar->pending_recovery,0 ); +if (ar->hw_params.hw_restart_disconnect) {list_for_each_entry (arvif, &ar->arvifs, list) {if (arvif->is_up && arvif->vdev_type ==WMI_VDEV_TYPE_STA )
drivers/net/wireless/ath/ath10k/wmi.c +6 -0
@@ -4,6 +4,7 @@* Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include <linux/skbuff.h>
@@ -1941,6 +1942,11 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id) } wait_event_timeout(ar->wmi.tx_credits_wq, ({ + if (ar->state == ATH10K_STATE_WEDGED) { + ret = -ESHUTDOWN; + ath10k_dbg(ar, ATH10K_DBG_WMI, + "drop wmi command %d, hardware is wedged\n", cmd_id); + } /* try to send pending beacons first. they take priority */ ath10k_wmi_tx_beacons_nowait(ar);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 275/515 drm/panel: raydium-rm67200: Move initialization from enable() to prepare stage
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 691674a282bdbf8f8bce4094369a2d1e4b5645e9 ]
The DSI host has different modes in prepare() and enable() functions, prepare() is in LP command mode and enable() is in HS video mode.
Quoted 1 line
From our experience, generally the initialization sequence needs to be
sent in the LP command mode.
Move the setup init function from enable() to prepare() to fix a display shift on rk3568 evb.
Tested on rk3568/rk3576/rk3588 EVB.
--- drivers/gpu/drm/panel/panel-raydium-rm67200.c | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/gpu/drm/panel/panel-raydium-rm67200.c +7 -15
@@ -318,6 +318,7 @@ static void w552793baa_setup(struct mipi_dsi_multi_context *ctx)static int raydium_rm67200_prepare (struct drm_panel *panel) {struct raydium_rm67200 *ctx =to_raydium_rm67200 (panel); +struct mipi_dsi_multi_context mctx = { .dsi = ctx->dsi };int ret; ret =regulator_bulk_enable (ctx->num_supplies, ctx->supplies);
@@ -328,6 +329,12 @@ static int raydium_rm67200_prepare(struct drm_panel *panel)msleep (60 ); + ctx->panel_info->panel_setup (&mctx); +mipi_dsi_dcs_exit_sleep_mode_multi (&mctx); +mipi_dsi_msleep (&mctx,120 ); +mipi_dsi_dcs_set_display_on_multi (&mctx); +mipi_dsi_msleep (&mctx,30 ); +return 0 ; }
@@ -343,20 +350,6 @@ static int raydium_rm67200_unprepare(struct drm_panel *panel)return 0 ; } -static int raydium_rm67200_enable (struct drm_panel *panel) -{ -struct raydium_rm67200 *rm67200 =to_raydium_rm67200 (panel); -struct mipi_dsi_multi_context ctx = { .dsi = rm67200->dsi }; - - rm67200->panel_info->panel_setup (&ctx); -mipi_dsi_dcs_exit_sleep_mode_multi (&ctx); -mipi_dsi_msleep (&ctx,120 ); -mipi_dsi_dcs_set_display_on_multi (&ctx); -mipi_dsi_msleep (&ctx,30 ); - -return ctx.accum_err; -} -static int raydium_rm67200_disable (struct drm_panel *panel) {struct raydium_rm67200 *rm67200 =to_raydium_rm67200 (panel);
@@ -381,7 +374,6 @@ static const struct drm_panel_funcs raydium_rm67200_funcs = { .prepare = raydium_rm67200_prepare, .unprepare = raydium_rm67200_unprepare, .get_modes = raydium_rm67200_get_modes, - .enable = raydium_rm67200_enable, .disable = raydium_rm67200_disable, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 276/515 wifi: ath12k: Add memset and update default rate value in wmi tx completion
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit 9903c0986f782dfc511d7638b6f15fb6e8600cd3 ]
When both AP/STA and monitor interfaces are enabled, ieee80211_tx_status() is invoked from two paths: the TX completion handler for data frames and the WMI TX completion handler for management frames.
In the data path, the skb->cb is properly zeroed using memset, but in the WMI path, this step is missing.
As a result, mac80211 encountered uninitialized (junk) values in skb->cb when generating the radiotap header for monitor mode, leading to invalid radiotap lengths.
Hence, explicitly zero the status field in the skb->cb using memset in WMI TX completion path to ensure consistent and correct behavior during WMI tx completion path.
Additionally, set info->status.rates[0].idx = -1 to indicate that no valid rate information is available, avoiding misinterpretation of garbage values.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/wmi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath12k/wmi.c +5 -0
@@ -5465,6 +5465,11 @@ static int wmi_process_mgmt_tx_comp(struct ath12k *ar, u32 desc_id,dma_unmap_single (ar->ab->dev, skb_cb->paddr, msdu->len,DMA_TO_DEVICE ); info =IEEE80211_SKB_CB (msdu); +memset (&info->status,0 ,sizeof (info->status)); + +/* skip tx rate update from ieee80211_status*/ + info->status.rates[0 ].idx =-1 ; +if ((!(info->flags &IEEE80211_TX_CTL_NO_ACK )) && !status) info->flags |=IEEE80211_TX_STAT_ACK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 277/515 wifi: ath12k: Fix station association with MBSSID Non-TX BSS
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Chandrakanthan <[email protected]>
[ Upstream commit 70eeacc1a92a444f4b5777ab19e1c378a5edc8dd ]
ath12k station is unable to associate with non-transmitting BSSes in a Multiple BSS set because the user-space does not receive information about the non-transmitting BSSes from mac80211's scan results.
The ath12k driver does not advertise its MBSSID capability to mac80211, resulting in wiphy->support_mbssid not being set. Consequently, the information about non-transmitting BSS is not parsed from received Beacon/Probe response frames and is therefore not included in the scan results.
Fix this by advertising the MBSSID capability of ath12k driver to mac80211.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath12k/mac.c +1 -0
@@ -11337,6 +11337,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) wiphy->mbssid_max_interfaces = mbssid_max_interfaces; wiphy->ema_max_profile_periodicity =TARGET_EMA_MAX_PROFILE_PERIOD ; +ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID );if (is_6ghz) { wiphy_ext_feature_set(wiphy,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 278/515 lib: packing: Include necessary headers
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Lynch <[email protected]>
[ Upstream commit 8bd0af3154b2206ce19f8b1410339f7a2a56d0c3 ]
packing.h uses ARRAY_SIZE(), BUILD_BUG_ON_MSG(), min(), max(), and sizeof_field() without including the headers where they are defined, potentially causing build failures.
Fix this in packing.h and sort the result.
--- include/linux/packing.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/packing.h +5 -1
@@ -5,8 +5,12 @@#ifndef _LINUX_PACKING_H#define _LINUX_PACKING_H -#include <linux/types.h> +#include <linux/array_size.h> #include <linux/bitops.h> +#include <linux/build_bug.h> +#include <linux/minmax.h> +#include <linux/stddef.h> +#include <linux/types.h> #define GEN_PACKED_FIELD_STRUCT (__type) \ struct packed_field_ ## __type { \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 279/515 wifi: iwlwifi: dvm: fix potential overflow in rs_fill_link_cmd()
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rand Deeb <[email protected]>
[ Upstream commit e3ad987e9dc7d1e12e3f2f1e623f0e174cd0ca78 ]
The 'index' variable in the rs_fill_link_cmd() function can reach LINK_QUAL_MAX_RETRY_NUM during the execution of the inner loop. This variable is used as an index for the lq_cmd->rs_table array, which has a size of LINK_QUAL_MAX_RETRY_NUM, without proper validation.
Modify the condition of the inner loop to ensure that the 'index' variable does not exceed LINK_QUAL_MAX_RETRY_NUM - 1, thereby preventing any potential overflow issues.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/dvm/rs.c +1 -1
@@ -2899,7 +2899,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,/* Repeat initial/next rate. * For legacy IWL_NUMBER_TRY == 1, this loop will not execute. * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */ -while (repeat_rate >0 && (index <LINK_QUAL_MAX_RETRY_NUM )) { +while (repeat_rate >0 && index < (LINK_QUAL_MAX_RETRY_NUM -1 )) {if (is_legacy (tbl_type.lq_type)) {if (ant_toggle_cnt <NUM_TRY_BEFORE_ANT_TOGGLE ) ant_toggle_cnt++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 280/515 wifi: iwlwifi: mld: dont exit EMLSR when we shouldnt
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 0cdb8ff6ebbac55f38933f4621215784887b400e ]
There is a requirement to exit EMLSR if there wasn't enough throughput in the secondary link.
This is checked in check_tpt_wk, which runs every 5 seconds in a high throughput scenario (when the throughput blocker isn't set)
It can happen that this worker is running immediately after we entered EMLSR, and in that case the secondary link didn't have a chance to have throughput. In that case we will exit EMLSR for no good reason.
Fix this by tracking the time we entered EMLSR, and in the worker make sure that 5 seconds passed from when we entered EMLSR. If not, don't check the secondary link throughput.
--- drivers/net/wireless/intel/iwlwifi/mld/iface.h | 3 +++ drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 1 + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mld/iface.h +3 -0
@@ -84,6 +84,8 @@ enum iwl_mld_emlsr_exit {* @last_exit_reason: Reason for the last EMLSR exit * @last_exit_ts: Time of the last EMLSR exit (if @last_exit_reason is non-zero) * @exit_repeat_count: Number of times EMLSR was exited for the same reason +* @last_entry_ts: the time of the last EMLSR entry (if iwl_mld_emlsr_active() +* is true) * @unblock_tpt_wk: Unblock EMLSR because the throughput limit was reached * @check_tpt_wk: a worker to check if IWL_MLD_EMLSR_BLOCKED_TPT should be * added, for example if there is no longer enough traffic.
@@ -102,6 +104,7 @@ struct iwl_mld_emlsr {enum iwl_mld_emlsr_exit last_exit_reason;unsigned long last_exit_ts;u8 exit_repeat_count; +unsigned long last_entry_ts; );struct wiphy_work unblock_tpt_wk;
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +1 -0
@@ -995,6 +995,7 @@ int iwl_mld_assign_vif_chanctx(struct ieee80211_hw *hw,/* Indicate to mac80211 that EML is enabled */ vif->driver_flags |=IEEE80211_VIF_EML_ACTIVE ; + mld_vif->emlsr.last_entry_ts = jiffies;if (vif->active_links &BIT (mld_vif->emlsr.selected_links)) mld_vif->emlsr.primary = mld_vif->emlsr.selected_primary;
drivers/net/wireless/intel/iwlwifi/mld/mlo.c +5 -3
@@ -508,10 +508,12 @@ void iwl_mld_emlsr_check_tpt(struct wiphy *wiphy, struct wiphy_work *wk)/* * TPT is unblocked, need to check if the TPT criteria is still met. * -* If EMLSR is active, then we also need to check the secondar link -* requirements. +* If EMLSR is active for at least 5 seconds, then we also +* need to check the secondary link requirements. */ -if (iwl_mld_emlsr_active (vif)) { +if (iwl_mld_emlsr_active (vif) && +time_is_before_jiffies (mld_vif->emlsr.last_entry_ts + +IWL_MLD_TPT_COUNT_WINDOW )) { sec_link_id =iwl_mld_get_other_link (vif,iwl_mld_get_primary_link (vif)); sec_link =iwl_mld_link_dereference_check (mld_vif, sec_link_id);if (WARN_ON_ONCE (!sec_link))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 281/515 wifi: iwlwifi: mld: fix last_mlo_scan_time type
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit f26281c1b727b90ec18ae90044d5f429d2250e82 ]
This should be u64, otherwise it rolls over quickly on 32-bit systems.
--- drivers/net/wireless/intel/iwlwifi/mld/scan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/scan.h +1 -1
@@ -130,7 +130,7 @@ struct iwl_mld_scan {void *cmd;unsigned long last_6ghz_passive_jiffies;unsigned long last_start_time_jiffies; - unsigned long last_mlo_scan_time; + u64 last_mlo_scan_time; };#endif /* __iwl_mld_scan_h__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 282/515 wifi: iwlwifi: fw: Fix possible memory leak in iwl_fw_dbg_collect
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pagadala Yesu Anjaneyulu <[email protected]>
[ Upstream commit cc8d9cbf269dab363c768bfa9312265bc807fca5 ]
Ensure descriptor is freed on error to avoid memory leak.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +6 -1
@@ -3006,6 +3006,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,struct iwl_fw_dump_desc *desc;unsigned int delay =0 ;bool monitor_only = false; +int ret;if (trigger) {u16 occurrences =le16_to_cpu (trigger->occurrences) -1 ;
@@ -3036,7 +3037,11 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, desc->trig_desc.type =cpu_to_le32 (trig);memcpy (desc->trig_desc.data, str, len); -return iwl_fw_dbg_collect_desc (fwrt, desc, monitor_only, delay); + ret =iwl_fw_dbg_collect_desc (fwrt, desc, monitor_only, delay); +if (ret) +kfree (desc); + +return ret; }IWL_EXPORT_SYMBOL (iwl_fw_dbg_collect);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 283/515 rcutorture: Fix rcutorture_one_extend_check() splat in RT kernels
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zqiang <[email protected]>
[ Upstream commit 8d71351d88e478d3c4e945e3218e97ec677fd807 ]
For built with CONFIG_PREEMPT_RT=y kernels, running rcutorture tests resulted in the following splat:
[ 68.797425] rcutorture_one_extend_check during change: Current 0x1 To add 0x1 To remove 0x0 preempt_count() 0x0 [ 68.797533] WARNING: CPU: 2 PID: 512 at kernel/rcu/rcutorture.c:1993 rcutorture_one_extend_check+0x419/0x560 [rcutorture] [ 68.797601] Call Trace: [ 68.797602] <TASK> [ 68.797619] ? lockdep_softirqs_off+0xa5/0x160 [ 68.797631] rcutorture_one_extend+0x18e/0xcc0 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797646] ? local_clock+0x19/0x40 [ 68.797659] rcu_torture_one_read+0xf0/0x280 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797678] ? __pfx_rcu_torture_one_read+0x10/0x10 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797804] ? __pfx_rcu_torture_timer+0x10/0x10 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797815] rcu-torture: rcu_torture_reader task started [ 68.797824] rcu-torture: Creating rcu_torture_reader task [ 68.797824] rcu_torture_reader+0x238/0x580 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797836] ? kvm_sched_clock_read+0x15/0x30
Disable BH does not change the SOFTIRQ corresponding bits in preempt_count() for RT kernels, this commit therefore use softirq_count() to check the if BH is disabled.
--- kernel/rcu/rcutorture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/rcu/rcutorture.c +6 -3
@@ -458,7 +458,7 @@ rcu_read_delay(struct torture_random_state *rrsp, struct rt_read_seg *rtrsp) !(torture_random(rrsp) % (nrealreaders * 2000 * longdelay_ms))) { started = cur_ops->get_gp_seq (); ts =rcu_trace_clock_local (); -if (preempt_count () & (SOFTIRQ_MASK |HARDIRQ_MASK )) +if ((preempt_count () &HARDIRQ_MASK ) ||softirq_count ()) longdelay_ms =5 ;/* Avoid triggering BH limits. */ mdelay (longdelay_ms); rtrsp->rt_delay_ms = longdelay_ms;
@@ -1922,7 +1922,7 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,return ;WARN_ONCE ((curstate & (RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH )) && - !(preempt_count () &SOFTIRQ_MASK ),ROEC_ARGS ); + !softirq_count (),ROEC_ARGS );WARN_ONCE ((curstate & (RCUTORTURE_RDR_PREEMPT |RCUTORTURE_RDR_SCHED )) && !(preempt_count () &PREEMPT_MASK ),ROEC_ARGS ); WARN_ONCE(cur_ops->readlock_nesting &&
@@ -1936,7 +1936,7 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,WARN_ONCE (cur_ops->extendables && !(curstate & (RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH )) && - (preempt_count () &SOFTIRQ_MASK ),ROEC_ARGS ); +softirq_count (),ROEC_ARGS );/* * non-preemptible RCU in a preemptible kernel uses preempt_disable()
@@ -1957,6 +1957,9 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,if (!IS_ENABLED (CONFIG_PREEMPT_RCU )) mask |=RCUTORTURE_RDR_PREEMPT |RCUTORTURE_RDR_SCHED ; +if (IS_ENABLED (CONFIG_PREEMPT_RT ) &&softirq_count ()) + mask |=RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH ; +WARN_ONCE (cur_ops->readlock_nesting && !(curstate & mask) && cur_ops->readlock_nesting () >0 ,ROEC_ARGS ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 284/515 drm/amd/display: Fix failed to blank crtc!
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Chen <[email protected]>
[ Upstream commit 01f60348d8fb6b3fbcdfc7bdde5d669f95b009a4 ]
[why]
DCN35 is having “DC: failed to blank crtc!” when running HPO test cases. It's caused by not having sufficient udelay time.
[how]
Replace the old wait_for_blank_complete function with fsleep function to sleep just until the next frame should come up. This way it doesn't poll in case the pixel clock or other clock was bugged or until vactive and the vblank are hit again.
--- drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +1 -1
@@ -945,7 +945,7 @@ enum dc_status dcn20_enable_stream_timing(return DC_ERROR_UNEXPECTED ; } - hws->funcs.wait_for_blank_complete (pipe_ctx->stream_res.opp); +fsleep (stream->timing.v_total * (stream->timing.h_total *10000u / stream->timing.pix_clk_100hz)); params.vertical_total_min = stream->adjust.v_total_min; params.vertical_total_max = stream->adjust.v_total_max;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 285/515 drm/amd/display: Initialize mode_select to 0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit 592ddac93f8c02e13f19175745465f8c4d0f56cd ]
[WHAT]mode_select was supposed to be initialized in mpc_read_gamut_remap but is not set in default case. This can cause indeterminate behaviors.
This is reported as an UNINIT error by Coverity.
--- drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c +1 -1
@@ -571,7 +571,7 @@ void mpc401_get_gamut_remap(struct mpc *mpc, struct mpc_grph_gamut_adjustment *adjust) {uint16_t arr_reg_val[12 ] = {0 }; -uint32_t mode_select; +uint32_t mode_select =MPCC_GAMUT_REMAP_MODE_SELECT_0 ;read_gamut_remap (mpc, mpcc_id, arr_reg_val, adjust->mpcc_gamut_remap_block_id, &mode_select);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 286/515 wifi: mac80211: update radar_required in channel context after channel switch
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ramya Gnanasekar <[email protected]>
[ Upstream commit 140c6a61d83cbd85adba769b5ef8d61acfa5b392 ]
Currently, when a non-DFS channel is brought up and the bandwidth is expanded from 80 MHz to 160 MHz, where the primary 80 MHz is non-DFS and the secondary 80 MHz consists of DFS channels, radar detection fails if radar occurs in the secondary 80 MHz.
When the channel is switched from 80 MHz to 160 MHz, with the primary 80 MHz being non-DFS and the secondary 80 MHz consisting of DFS channels, the radar required flag in the channel switch parameters is set to true. However, when using a reserved channel context, it is not updated in sdata, which disables radar detection in the secondary 80 MHz DFS channels.
Update the radar required flag in sdata to fix this issue when using a reserved channel context.
--- net/mac80211/chan.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/chan.c +1 -0
@@ -1381,6 +1381,7 @@ ieee80211_link_use_reserved_reassign(struct ieee80211_link_data *link) goto out; } + link->radar_required = link->reserved_radar_required;list_move (&link->assigned_chanctx_list, &new_ctx->assigned_links);rcu_assign_pointer (link_conf->chanctx_conf, &new_ctx->conf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 287/515 wifi: rtlwifi: fix possible skb memory leak in `_rtl_pci_rx_interrupt()`.
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 44c0e191004f0e3aa1bdee3be248be14dbe5b020 ]
The function _rtl_pci_init_one_rxdesc() can fail even when the new skb is passed because of a DMA mapping error. If it fails, the skb is not saved in the rx ringbuffer and thus lost.
Compile tested only
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +12 -6
@@ -802,13 +802,19 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) skb = new_skb; no_new:if (rtlpriv->use_new_trx_flow) { -_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)buffer_desc, - rxring_idx, - rtlpci->rx_ring[rxring_idx].idx); +if (!_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)buffer_desc, + rxring_idx, + rtlpci->rx_ring[rxring_idx].idx)) { +if (new_skb) +dev_kfree_skb_any (skb); + } }else { -_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)pdesc, - rxring_idx, - rtlpci->rx_ring[rxring_idx].idx); +if (!_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)pdesc, + rxring_idx, + rtlpci->rx_ring[rxring_idx].idx)) { +if (new_skb) +dev_kfree_skb_any (skb); + }if (rtlpci->rx_ring[rxring_idx].idx == rtlpci->rxringcount -1 ) rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 288/515 wifi: rtw89: coex: Not to set slot duration to zero to avoid firmware issue
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ching-Te Ku <[email protected]>
[ Upstream commit a7feafea4ce80d5fa5284d05d54b4f108d2ab575 ]
If the duration set to zero, Wi-Fi firmware will trigger some unexpected issue when firmware try to enable timer.
--- drivers/net/wireless/realtek/rtw89/coex.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +6 -6
@@ -3836,13 +3836,13 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)switch (policy_type) {case BTC_CXP_OFFE_2GBWISOB :/* for normal-case */ -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_2GISOB :/* for bt no-link */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);
@@ -3868,15 +3868,15 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)break ;case BTC_CXP_OFFE_2GBWMIXB :if (a2dp->exist) -_slot_set (btc,CXST_E2G ,0 , cxtbl[2 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[2 ],SLOT_MIX );else -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_MIX );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);break ;case BTC_CXP_OFFE_WL :/* for 4-way */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_MIX ); -_slot_set (btc,CXST_EBT ,0 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_EBT ,5 , cxtbl[1 ],SLOT_MIX );break ;default :break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 289/515 wifi: ath12k: Enable REO queue lookup table feature on QCN9274 hw2.0
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raj Kumar Bhagat <[email protected]>
[ Upstream commit b79742b84e16e41c4a09f3126436f39f36e75c06 ]
The commit 89ac53e96217 ("wifi: ath12k: Enable REO queue lookup table feature on QCN9274") originally intended to enable the reoq_lut_support hardware parameter flag for both QCN9274 hw1.0 and hw2.0. However, it enabled it only for QCN9274 hw1.0.
Hence, enable REO queue lookup table feature on QCN9274 hw2.0.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/hw.c +1 -1
@@ -1090,7 +1090,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = { .download_calib = true, .supports_suspend = false, .tcl_ring_retry = true, - .reoq_lut_support = false, + .reoq_lut_support = true, .supports_shadow_regs = false, .num_tcl_banks = 48,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 290/515 wifi: ath12k: Decrement TID on RX peer frag setup error handling
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit 7c0884fcd2ddde0544d2e77f297ae461e1f53f58 ]
Currently, TID is not decremented before peer cleanup, during error handling path of ath12k_dp_rx_peer_frag_setup(). This could lead to out-of-bounds access in peer->rx_tid[].
Hence, add a decrement operation for TID, before peer cleanup to ensures proper cleanup and prevents out-of-bounds access issues when the RX peer frag setup fails.
Found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath12k/dp.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath12k/dp.c +1 -0
@@ -84,6 +84,7 @@ int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr) ret =ath12k_dp_rx_peer_frag_setup (ar, addr, vdev_id);if (ret) {ath12k_warn (ab,"failed to setup rx defrag context\n" ); + tid--; goto peer_clean; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 291/515 powerpc: floppy: Add missing checks after DMA map
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit cf183c1730f2634245da35e9b5d53381b787d112 ]
The DMA map functions can fail and should be tested for errors.
--- arch/powerpc/include/asm/floppy.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/floppy.h +4 -1
@@ -144,9 +144,12 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) bus_addr =0 ; } -if (!bus_addr)/* need to map it */ +if (!bus_addr) {/* need to map it */ bus_addr =dma_map_single (&isa_bridge_pcidev->dev, addr, size, dir); +if (dma_mapping_error (&isa_bridge_pcidev->dev, bus_addr)) +return -ENOMEM ; + }/* remember this one as prev */ prev_addr = addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 292/515 netmem: fix skb_frag_address_safe with unreadable skbs
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mina Almasry <[email protected]>
[ Upstream commit 4672aec56d2e8edabcb74c3e2320301d106a377e ]
skb_frag_address_safe() needs a check that the skb_frag_page exists check similar to skb_frag_address().
--- include/linux/skbuff.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
include/linux/skbuff.h +7 -1
@@ -3687,7 +3687,13 @@ static inline void *skb_frag_address(const skb_frag_t *frag)*/ static inline void *skb_frag_address_safe (const skb_frag_t *frag) { -void *ptr =page_address (skb_frag_page (frag)); +struct page *page =skb_frag_page (frag); +void *ptr; + +if (!page) +return NULL ; + + ptr =page_address (page);if (unlikely (!ptr))return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 293/515 arm64: stacktrace: Check kretprobe_find_ret_addr() return value
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
[ Upstream commit beecfd6a88a675e20987e70ec532ba734b230fa4 ]
If kretprobe_find_ret_addr() fails to find the original return address, it returns 0. Check for this case so that a reliable stacktrace won't silently ignore it.
--- arch/arm64/kernel/stacktrace.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kernel/stacktrace.c +2 -0
@@ -152,6 +152,8 @@ kunwind_recover_return_address(struct kunwind_state *state) orig_pc =kretprobe_find_ret_addr (state->task, (void *)state->common.fp, &state->kr_cur); +if (!orig_pc) +return -EINVAL ; state->common.pc = orig_pc; state->flags.kretprobe =1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 294/515 wifi: iwlegacy: Check rate_idx range after addition
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
[ Upstream commit 0de19d5ae0b2c5b18b88c5c7f0442f707a207409 ]
Limit rate_idx to IL_LAST_OFDM_RATE for 5GHz band for thinkable case the index is incorrect.
--- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlegacy/4965-mac.c +4 -1
@@ -1575,8 +1575,11 @@ il4965_tx_cmd_build_rate(struct il_priv *il, || rate_idx > RATE_COUNT_LEGACY) rate_idx =rate_lowest_index (&il->bands[info->band], sta);/* For 5 GHZ band, remap mac80211 rate indices into driver indices */ -if (info->band ==NL80211_BAND_5GHZ ) +if (info->band ==NL80211_BAND_5GHZ ) { rate_idx +=IL_FIRST_OFDM_RATE ; +if (rate_idx >IL_LAST_OFDM_RATE ) + rate_idx =IL_LAST_OFDM_RATE ; + }/* Get PLCP rate for tx_cmd->rate_n_flags */ rate_plcp = il_rates[rate_idx].plcp;/* Zero out flags for this packet */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 295/515 dpaa_eth: dont use fixed_phy_change_carrier
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit d8155c1df5c8b717052567b188455d41fa7a8908 ]
This effectively reverts 6e8b0ff1ba4c ("dpaa_eth: Add change_carrier() for Fixed PHYs"). Usage of fixed_phy_change_carrier() requires that fixed_phy_register() has been called before, directly or indirectly. And that's not the case in this driver.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +0 -2
@@ -28,7 +28,6 @@#include <linux/percpu.h> #include <linux/dma-mapping.h> #include <linux/sort.h> -#include <linux/phy_fixed.h> #include <linux/bpf.h> #include <linux/bpf_trace.h> #include <soc/fsl/bman.h>
@@ -3151,7 +3150,6 @@ static const struct net_device_ops dpaa_ops = { .ndo_stop = dpaa_eth_stop, .ndo_tx_timeout = dpaa_tx_timeout, .ndo_get_stats64 = dpaa_get_stats64, - .ndo_change_carrier = fixed_phy_change_carrier, .ndo_set_mac_address = dpaa_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = dpaa_set_rx_mode,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 296/515 drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to manual
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 2d1ec1e955414e8e8358178011c35afca1a1c0b1 ]
Several other ASICs allow printing OD SCLK levels without setting DPM control to manual. When OD is disabled it will show the range the hardware supports. When OD is enabled it will show what values have been programmed. Adjust VanGogh to work the same.
--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +15 -22
@@ -666,7 +666,6 @@ static int vangogh_print_clk_levels(struct smu_context *smu, {DpmClocks_t *clk_table = smu->smu_table.clocks_table;SmuMetrics_t metrics; -struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);int i, idx, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 ;bool cur_value_match_level = false;
@@ -682,31 +681,25 @@ static int vangogh_print_clk_levels(struct smu_context *smu,switch (clk_type) {case SMU_OD_SCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq);break ;case SMU_OD_CCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq);break ;case SMU_OD_RANGE : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , - smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); - size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , - smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , + smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); + size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , + smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq);break ;case SMU_SOCCLK :/* the level 3 ~ 6 of socclk use the same frequency for vangogh */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 297/515 drm/amd/display: Stop storing failures into adev->dm.cached_state
In reply to Greg Kroah-Hartman6.15-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 709a37ab9c63297da2194dc36f604537f9d2d417 ]
If drm_atomic_helper_suspend() has failed for any reason, it's stored in adev->dm.cached_state. This isn't expected because the resume (or complete()) sequence will attempt to use the stored state to resume.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +18 -7
@@ -2998,6 +2998,19 @@ static void hpd_rx_irq_work_suspend(struct amdgpu_display_manager *dm) } } +static int dm_cache_state (struct amdgpu_device *adev) +{ +int r; + + adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); +if (IS_ERR (adev->dm.cached_state)) { + r =PTR_ERR (adev->dm.cached_state); + adev->dm.cached_state =NULL ; + } + +return adev->dm.cached_state ?0 : r; +} +static int dm_prepare_suspend (struct amdgpu_ip_block *ip_block) {struct amdgpu_device *adev = ip_block->adev;
@@ -3006,11 +3019,8 @@ static int dm_prepare_suspend(struct amdgpu_ip_block *ip_block)return 0 ;WARN_ON (adev->dm.cached_state); - adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); -if (IS_ERR (adev->dm.cached_state)) -return PTR_ERR (adev->dm.cached_state); -return 0 ; +return dm_cache_state (adev); }static int dm_suspend (struct amdgpu_ip_block *ip_block)
@@ -3044,9 +3054,10 @@ static int dm_suspend(struct amdgpu_ip_block *ip_block) }if (!adev->dm.cached_state) { - adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); -if (IS_ERR (adev->dm.cached_state)) -return PTR_ERR (adev->dm.cached_state); +int r =dm_cache_state (adev); + +if (r) +return r; }s3_handle_hdmi_cec (adev_to_drm (adev), true);
Signature · 1 line
2.39.5