Unverified Commit 83581b56 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12286 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.49-6.6.50 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.49..v6.6.50 | wc -l
131
102+23+6
Merged commits(22)

 spi: hisi-kunpeng: Add validation for the minimum value of speed_hz
 selftests: mptcp: userspace pm create id 0 subflow
 drm/amd/display: Assign linear_pitch_alignment even for VM
 drm/amd/pm: Fix negative array index read
 drm/amd/pm: fix the Out-of-bounds read warning
 drm/amd/display: Check gpio_id before used as array index
 drm/amd/display: Check index for aux_rd_interval before using
 drm/amd/display: Add array index check for hdcp ddc access
 drm/amd/display: Check msg_id before processing transcation
 drm/amd/display: Skip inactive planes within ModeSupportAndSystemConfiguration
 drm/amd/display: Fix index may exceed array range within fpu_update_bw_bounding_box
 drm/amdgpu: Fix out-of-bounds write warning
 drm/amdgpu: fix ucode out-of-bounds read warning
 apparmor: fix possible NULL pointer dereference
 drm/amdgpu: Fix the warning division or modulo by zero
 drm/amdgpu: fix dereference after null check
 drm/amdgpu: fix the waring dereferencing hive
 drm/amdgpu: the warning dereferencing obj for nbio_v7_4
 net/mlx5e: SHAMPO, Fix incorrect page release
 drm/bridge: tc358767: Check if fully initialized before signalling HPD event via IRQ
 driver: iio: add missing checks on iio_info's callback access
 drm/amd/display: Skip wbscl_set_scaler_filter if filter is null
 drm/amd/display: Ensure index calculation will not overflow 

conflicts commits(6)

 selftests: mptcp: add mptcp_lib_events helper
 selftests: mptcp: join: validate event numbers
 selftests: mptcp: join: check re-re-adding ID 0 signal
 mptcp: avoid duplicated SUB_CLOSED events
 mptcp: pr_debug: add missing \n at the end
 hwmon: (k10temp) Check return value of amd_smn_read() 
 
Link:https://gitee.com/openeuler/kernel/pulls/12286

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 6d34ac24 fe18990e

Documentation/locking/hwspinlock.rst

+11 −0
Original line number Diff line number Diff line
@@ -85,6 +85,17 @@ is already free). 


Should be called from a process context (might sleep).



::



  int hwspin_lock_bust(struct hwspinlock *hwlock, unsigned int id);



After verifying the owner of the hwspinlock, release a previously acquired

hwspinlock; returns 0 on success, or an appropriate error code on failure

(e.g. -EOPNOTSUPP if the bust operation is not defined for the specific

hwspinlock).



Should be called from a process context (might sleep).



::



  int hwspin_lock_timeout(struct hwspinlock *hwlock, unsigned int timeout);

block/blk-integrity.c

+0 −2
Original line number Diff line number Diff line
@@ -396,8 +396,6 @@ void blk_integrity_unregister(struct gendisk *disk) 
	if (!bi->profile)

		return;



	/* ensure all bios are off the integrity workqueue */

	blk_flush_integrity();

	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);

	memset(bi, 0, sizeof(*bi));

}

drivers/base/regmap/regmap-spi.c

+1 −2
Original line number Diff line number Diff line
@@ -122,8 +122,7 @@ static const struct regmap_bus *regmap_get_spi_bus(struct spi_device *spi, 
			return ERR_PTR(-ENOMEM);



		max_msg_size = spi_max_message_size(spi);

		reg_reserve_size = config->reg_bits / BITS_PER_BYTE

				 + config->pad_bits / BITS_PER_BYTE;

		reg_reserve_size = (config->reg_bits + config->pad_bits) / BITS_PER_BYTE;

		if (max_size + reg_reserve_size > max_msg_size)

			max_size -= reg_reserve_size;

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ static unsigned int scmi_cpufreq_fast_switch(struct cpufreq_policy *policy, 
					     unsigned int target_freq)

{

	struct scmi_data *priv = policy->driver_data;

	unsigned long freq = target_freq;



	if (!perf_ops->freq_set(ph, priv->domain_id,

				target_freq * 1000, true))

	if (!perf_ops->freq_set(ph, priv->domain_id, freq * 1000, true))

		return target_freq;



	return 0;

drivers/crypto/stm32/stm32-cryp.c

+5 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <crypto/internal/des.h>

#include <crypto/internal/skcipher.h>

#include <crypto/scatterwalk.h>

#include <linux/bottom_half.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/err.h>
@@ -1665,8 +1666,11 @@ static irqreturn_t stm32_cryp_irq_thread(int irq, void *arg) 
		it_mask &= ~IMSCR_OUT;

	stm32_cryp_write(cryp, cryp->caps->imsc, it_mask);



	if (!cryp->payload_in && !cryp->header_in && !cryp->payload_out)

	if (!cryp->payload_in && !cryp->header_in && !cryp->payload_out) {

		local_bh_disable();

		stm32_cryp_finish_req(cryp, 0);

		local_bh_enable();

	}



	return IRQ_HANDLED;

}