Unverified Commit 6a2cf930 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3315 Backport 6.6.5 LTS Patches

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Zengkai <zhengzengkai@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OZXVJG7JKUIZ6R3PTI2HK23JZLTZK2CT/ 
Backport linux-6.6.5 LTS patches from upstream.
git cherry-pick v6.6.4..v6.6.5~1 -s
No conflicts.

Build and boot test passed.

Abdul Halim, Mohd Syazwan (1):
  iommu/vt-d: Add MTL to quirk list to skip TE disabling

Adrian Hunter (6):
  mmc: cqhci: Increase recovery halt timeout
  mmc: cqhci: Warn of halt or task clear failure
  mmc: cqhci: Fix task clearing in CQE error recovery
  mmc: block: Retry commands in CQE error recovery
  mmc: block: Do not lose cache flush during CQE error recovery
  mmc: block: Be sure to wait while busy in CQE error recovery

Agustin Gutierrez (1):
  drm/amd/display: Remove power sequencing check

Alex Sierra (1):
  drm/amdgpu: Force order between a read and write to the same address

Alvin Lee (2):
  drm/amd/display: Include udelay when waiting for INBOX0 ACK
  drm/amd/display: Use DRAM speed from validation for dummy p-state

Antonio Borneo (1):
  pinctrl: stm32: fix array read out of bound

Ayush Jain (1):
  cpufreq/amd-pstate: Only print supported EPP values for performance
    governor

Bragatheswaran Manickavel (1):
  btrfs: ref-verify: fix memory leaks in btrfs_ref_tree_mod()

Brett Creeley (2):
  vfio/pds: Fix mutex lock->magic != lock warning
  vfio/pds: Fix possible sleep while in atomic context

Camille Cho (1):
  drm/amd/display: Simplify brightness initialization

Candice Li (1):
  drm/amdgpu: Update EEPROM I2C address for smu v13_0_0

Chen Ni (1):
  pinctrl: stm32: Add check for devm_kcalloc

Christian König (1):
  dma-buf: fix check in dma_resv_add_fence

Christoph Niedermaier (1):
  cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily

Claudiu Beznea (6):
  net: ravb: Check return value of reset_control_deassert()
  net: ravb: Use pm_runtime_resume_and_get()
  net: ravb: Make write access to CXR35 first before accessing other
    EMAC registers
  net: ravb: Start TX queues after HW initialization succeeded
  net: ravb: Stop DMA in case of failures on ravb_open()
  net: ravb: Keep reverse order of operations in ravb_remove()

Damien Le Moal (2):
  scsi: Change SCSI device boolean fields to single bit flags
  scsi: sd: Fix system start for ATA devices

Dan Carpenter (2):
  media: v4l2-subdev: Fix a 64bit bug
  wifi: iwlwifi: mvm: fix an error code in iwl_mvm_mld_add_sta()

Daniel Mentz (1):
  iommu: Fix printk arg in of_iommu_get_resv_regions()

Dave Airlie (1):
  nouveau: find the smallest page allocation to cover a buffer alloc.

Dave Ertman (1):
  ice: Fix VF Reset paths when interface in a failed over aggregate

David Howells (2):
  cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved
  cifs: Fix FALLOC_FL_INSERT_RANGE by setting i_size after EOF moved

David Sterba (1):
  btrfs: fix 64bit compat send ioctl arguments not initializing version
    member

Dinghao Liu (1):
  drm/amd/pm: fix a memleak in aldebaran_tables_init

Dmitry Antipov (1):
  uapi: propagate __struct_group() attributes to the container union

Elena Salomatkina (1):
  octeontx2-af: Fix possible buffer overflow

Ewan D. Milne (1):
  nvme: check for valid nvme_identify_ns() before using it

Filipe Manana (2):
  btrfs: fix off-by-one when checking chunk map includes logical address
  btrfs: make error messages more clear when getting a chunk map

Furong Xu (1):
  net: stmmac: xgmac: Disable FPE MMC interrupts

Gaurav Batra (1):
  powerpc/pseries/iommu: enable_ddw incorrectly returns direct mapping
    for SR-IOV device

Gautham R. Shenoy (1):
  cpufreq/amd-pstate: Fix the return value of amd_pstate_fast_switch()

Geetha sowjanya (1):
  octeontx2-pf: Fix adding mbox work queue entry when num_vfs > 64

Greg Ungerer (2):
  net: dsa: mv88e6xxx: fix marvell 6350 switch probing
  net: dsa: mv88e6xxx: fix marvell 6350 probe crash

Gustavo A. R. Silva (1):
  neighbour: Fix __randomize_layout crash in struct neighbour

Hamza Mahfooz (1):
  drm/amd/display: fix ABM disablement

Hans de Goede (1):
  ACPI: video: Use acpi_video_device for cooling-dev driver data

Heiko Carstens (1):
  s390/cmma: fix handling of swapper_pg_dir and invalid_pg_dir

Heiner Kallweit (2):
  r8169: prevent potential deadlock in rtl8169_close

Helge Deller (8):
  parisc: Mark ex_table entries 32-bit aligned in assembly.h
  parisc: Mark ex_table entries 32-bit aligned in uaccess.h
  parisc: Use natural CPU alignment for bug_table
  parisc: Mark lock_aligned variables 16-byte aligned on SMP
  parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes
  parisc: Mark jump_table naturally aligned
  parisc: Ensure 32-bit alignment on parisc unwind section
  parisc: Mark altinstructions read-only and 32-bit aligned

Hou Tao (1):
  bpf: Add missed allocation hint for bpf_mem_cache_alloc_flags()

Ian Chen (1):
  drm/amd/display: Refactor edp power control

Ilya Bakoulin (1):
  drm/amd/display: Fix MPCC 1DLUT programming

Ioana Ciornei (2):
  dpaa2-eth: increase the needed headroom to account for alignment
  dpaa2-eth: recycle the RX buffer only after all processing done

Jakub Kicinski (1):
  ethtool: don't propagate EOPNOTSUPP from dumps

Jann Horn (1):
  btrfs: send: ensure send_fd is writable

Jens Axboe (6):
  io_uring: don't allow discontig pages for IORING_SETUP_NO_MMAP
  io_uring: free io_buffer_list entries via RCU
  io_uring: don't guard IORING_OFF_PBUF_RING with SETUP_NO_MMAP
  io_uring: enable io_mem_alloc/free to be used in other parts
  io_uring/kbuf: defer release of mapped buffer rings
  io_uring/kbuf: recycle freed mapped buffer ring entries

Jiawen Wu (1):
  net: libwx: fix memory leak on msix entry

Johannes Berg (1):
  wifi: cfg80211: fix CQM for non-range use

John Fastabend (1):
  bpf, sockmap: af_unix stream sockets need to hold ref for pair sock

Juergen Gross (1):
  x86/xen: fix percpu vcpu_info allocation

Kailang Yang (2):
  ALSA: hda/realtek: Headset Mic VREF to 100%
  ALSA: hda/realtek: Add supported ALC257 for ChromeOS

Kornel Dulęba (1):
  mmc: sdhci-pci-gli: Disable LPM during initialization

Lu Baolu (4):
  iommu/vt-d: Fix incorrect cache invalidation for mm notification
  iommu/vt-d: Omit devTLB invalidation requests when TES=0
  iommu/vt-d: Make context clearing consistent with context mapping

Lukasz Luba (1):
  powercap: DTPM: Fix unneeded conversions to micro-Watts

Maria Yu (1):
  pinctrl: avoid reload of p state in list iteration

Mario Limonciello (1):
  drm/amd: Enable PCIe PME from D3

Markus Weippert (1):
  bcache: revert replacing IS_ERR_OR_NULL with IS_ERR

Michael Roth (1):
  efi/unaccepted: Fix off-by-one when checking for overlapping ranges

Mikulas Patocka (1):
  dm-verity: align struct dm_verity_fec_io properly

Namjae Jeon (1):
  ksmbd: fix possible deadlock in smb2_open

Nicholas Kazlauskas (2):
  drm/amd/display: Remove min_dst_y_next_start check for Z8
  drm/amd/display: Update min Z8 residency time to 2100 for DCN314

Nicholas Piggin (1):
  KVM: PPC: Book3S HV: Fix KVM_RUN clobbering FP/VEC user registers

Oldřich Jedlička (1):
  wifi: mac80211: do not pass AP_VLAN vif pointer to drivers during
    flush

Paulo Alcantara (2):
  smb: client: report correct st_size for SMB and NFS symlinks

Peter Wang (1):

Prike Liang (1):
  drm/amdgpu: correct the amdgpu runtime dereference usage count

Qu Wenruo (2):
  btrfs: add dmesg output for first mount and last unmount of a
    filesystem
  btrfs: free the allocated memory if btrfs_alloc_page_array() fails

Ritesh Harjani (IBM) (1):
  ext2: Fix ki_pos update for DIO buffered-io fallback case

Robin Murphy (1):
  iommu: Avoid more races around device probe

Sean Christopherson (1):
  vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart

Sherry Wang (1):
  drm/amd/display: refactor ILR to make it work

Stanislav Fomichev (1):
  netdevsim: Don't accept device bound programs

Subbaraya Sundeep (1):
  octeontx2-pf: Restore TC ingress police rules when interface is up

Swapnil Patel (1):
  drm/amd/display: Reduce default backlight min from 5 nits to 1 nits

Takashi Iwai (2):
  leds: class: Don't expose color sysfs entry
  ALSA: hda: Disable power-save on KONTRON SinglePC

Tim Huang (1):
  drm/amdgpu: fix memory overflow in the IB test

Timothy Pearson (1):
  powerpc: Don't clobber f0/vs0 during fp|altivec register save

Tvrtko Ursulin (1):
  drm/i915/gsc: Mark internal GSC engine with reserved uabi class

Ville Syrjälä (1):
  drm/i915: Also check for VGA converter in eDP probe

Wenchao Chen (1):
  mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled

Willem de Bruijn (4):
  selftests/net: ipsec: fix constant out of range
  selftests/net: fix a char signedness issue
  selftests/net: unix: fix unused variable compiler warning
  selftests/net: mptcp: fix uninitialized variable warnings

Wu Bo (2):
  dm verity: initialize fec io before freeing it
  dm verity: don't perform FEC for failed readahead IO

Wyes Karny (1):
  cpufreq/amd-pstate: Fix scaling_min_freq and scaling_max_freq update

Yang Yingliang (2):
  firewire: core: fix possible memory leak in create_units()
  drm/panel: nt36523: fix return value check in nt36523_probe()

Yoshihiro Shimoda (4):
  net: rswitch: Fix type of ret in rswitch_start_xmit()
  net: rswitch: Fix return value in rswitch_start_xmit()
  net: rswitch: Fix missing dev_kfree_skb_any() in error path
  ravb: Fix races between ravb_tx_timeout_work() and net related ops

Zhengchao Shao (1):
  ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet

Zhongwei (1):
  drm/amd/display: force toggle rate wa for first link training for a
    retimer

xiazhengqiao (1):
  drm/panel: starry-2081101qfh032011-53g: Fine tune the panel power
    sequence


-- 
2.20.1
 
https://gitee.com/openeuler/kernel/issues/I8N21P 
 
Link:https://gitee.com/openeuler/kernel/pulls/3315

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 2becceb1 edaa89a3
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ Description:
		brightness. Reading this file when no hw brightness change
		event has happened will return an ENODATA error.

What:		/sys/class/leds/<led>/color
Date:		June 2023
KernelVersion:	6.5
Description:
		Color of the LED.

		This is a read-only file. Reading this file returns the color
		of the LED as a string (e.g: "red", "green", "multicolor").

What:		/sys/class/leds/<led>/trigger
Date:		March 2006
KernelVersion:	2.6.17
+6 −3
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

/* Alternative SMP implementation. */
#define ALTERNATIVE(cond, replacement)		"!0:"	\
	".section .altinstructions, \"aw\"	!"	\
	".section .altinstructions, \"a\"	!"	\
	".align 4				!"	\
	".word (0b-4-.)				!"	\
	".hword 1, " __stringify(cond) "	!"	\
	".word " __stringify(replacement) "	!"	\
@@ -44,7 +45,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

/* to replace one single instructions by a new instruction */
#define ALTERNATIVE(from, to, cond, replacement)\
	.section .altinstructions, "aw"	!	\
	.section .altinstructions, "a"	!	\
	.align 4			!	\
	.word (from - .)		!	\
	.hword (to - from)/4, cond	!	\
	.word replacement		!	\
@@ -52,7 +54,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end,

/* to replace multiple instructions by new code */
#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\
	.section .altinstructions, "aw"	!	\
	.section .altinstructions, "a"	!	\
	.align 4			!	\
	.word (from - .)		!	\
	.hword -num_instructions, cond	!	\
	.word (new_instr_ptr - .)	!	\
+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@
	 */
#define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr)	\
	.section __ex_table,"aw"			!	\
	.align 4					!	\
	.word (fault_addr - .), (except_addr - .)	!	\
	.previous

+18 −12
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@
	do {								\
		asm volatile("\n"					\
			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
			     "\t.pushsection __bug_table,\"aw\"\n"	\
			     "\t.pushsection __bug_table,\"a\"\n"	\
			     "\t.align %4\n"				\
			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\
			     "\t.short %c1, %c2\n"			\
			     "\t.org 2b+%c3\n"				\
			     "\t.short %1, %2\n"			\
			     "\t.blockz %3-2*%4-2*2\n"			\
			     "\t.popsection"				\
			     : : "i" (__FILE__), "i" (__LINE__),	\
			     "i" (0), "i" (sizeof(struct bug_entry)) ); \
			     "i" (0), "i" (sizeof(struct bug_entry)),	\
			     "i" (sizeof(long)) );			\
		unreachable();						\
	} while(0)

@@ -51,27 +53,31 @@
	do {								\
		asm volatile("\n"					\
			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
			     "\t.pushsection __bug_table,\"aw\"\n"	\
			     "\t.pushsection __bug_table,\"a\"\n"	\
			     "\t.align %4\n"				\
			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\
			     "\t.short %c1, %c2\n"			\
			     "\t.org 2b+%c3\n"				\
			     "\t.short %1, %2\n"			\
			     "\t.blockz %3-2*%4-2*2\n"			\
			     "\t.popsection"				\
			     : : "i" (__FILE__), "i" (__LINE__),	\
			     "i" (BUGFLAG_WARNING|(flags)),		\
			     "i" (sizeof(struct bug_entry)) );		\
			     "i" (sizeof(struct bug_entry)),		\
			     "i" (sizeof(long)) );			\
	} while(0)
#else
#define __WARN_FLAGS(flags)						\
	do {								\
		asm volatile("\n"					\
			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\
			     "\t.pushsection __bug_table,\"aw\"\n"	\
			     "\t.pushsection __bug_table,\"a\"\n"	\
			     "\t.align %2\n"				\
			     "2:\t" ASM_WORD_INSN "1b\n"		\
			     "\t.short %c0\n"				\
			     "\t.org 2b+%c1\n"				\
			     "\t.short %0\n"				\
			     "\t.blockz %1-%2-2\n"			\
			     "\t.popsection"				\
			     : : "i" (BUGFLAG_WARNING|(flags)),		\
			     "i" (sizeof(struct bug_entry)) );		\
			     "i" (sizeof(struct bug_entry)),		\
			     "i" (sizeof(long)) );			\
	} while(0)
#endif

+6 −2
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
	asm_volatile_goto("1:\n\t"
		 "nop\n\t"
		 ".pushsection __jump_table,  \"aw\"\n\t"
		 ".align %1\n\t"
		 ".word 1b - ., %l[l_yes] - .\n\t"
		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
		 ".popsection\n\t"
		 : :  "i" (&((char *)key)[branch]) :  : l_yes);
		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))
		 : : l_yes);

	return false;
l_yes:
@@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
	asm_volatile_goto("1:\n\t"
		 "b,n %l[l_yes]\n\t"
		 ".pushsection __jump_table,  \"aw\"\n\t"
		 ".align %1\n\t"
		 ".word 1b - ., %l[l_yes] - .\n\t"
		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"
		 ".popsection\n\t"
		 : :  "i" (&((char *)key)[branch]) :  : l_yes);
		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))
		 : : l_yes);

	return false;
l_yes:
Loading