June 2022 - Linux-stable-mirror

[PATCH v1 1/6] powerpc/64e: Fix early TLB miss with KUAP

by Christophe Leroy

With KUAP, the TLB miss handler bails out when an access to user memory is performed with a nul TID. But the normal TLB miss routine which is only used early during boot does the check regardless for all memory areas, not only user memory. By chance there is no early IO or vmalloc access, but when KASAN come we will start having early TLB misses. Fix it by creating a special branch for user accesses similar to the one in the 'bolted' TLB miss handlers. Unfortunately SPRN_MAS1 is now read too early and there are no registers available to preserve it so it will be read a second time. Fixes: 57bc963837f5 ("powerpc/kuap: Wire-up KUAP on book3e/64") Cc: stable(a)vger.kernel.org Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- arch/powerpc/mm/nohash/tlb_low_64e.S | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/mm/nohash/tlb_low_64e.S b/arch/powerpc/mm/nohash/tlb_low_64e.S index 8b97c4acfebf..9e9ab3803fb2 100644 --- a/arch/powerpc/mm/nohash/tlb_low_64e.S +++ b/arch/powerpc/mm/nohash/tlb_low_64e.S @@ -583,7 +583,7 @@ itlb_miss_fault_e6500: */ rlwimi r11,r14,32-19,27,27 rlwimi r11,r14,32-16,19,19 - beq normal_tlb_miss + beq normal_tlb_miss_user /* XXX replace the RMW cycles with immediate loads + writes */ 1: mfspr r10,SPRN_MAS1 cmpldi cr0,r15,8 /* Check for vmalloc region */ @@ -626,7 +626,7 @@ itlb_miss_fault_e6500: cmpldi cr0,r15,0 /* Check for user region */ std r14,EX_TLB_ESR(r12) /* write crazy -1 to frame */ - beq normal_tlb_miss + beq normal_tlb_miss_user li r11,_PAGE_PRESENT|_PAGE_BAP_SX /* Base perm */ oris r11,r11,_PAGE_ACCESSED@h @@ -653,6 +653,12 @@ itlb_miss_fault_e6500: * r11 = PTE permission mask * r10 = crap (free to use) */ +normal_tlb_miss_user: +#ifdef CONFIG_PPC_KUAP + mfspr r14,SPRN_MAS1 + rlwinm. r14,r14,0,0x3fff0000 + beq- normal_tlb_miss_access_fault /* KUAP fault */ +#endif normal_tlb_miss: /* So we first construct the page table address. We do that by * shifting the bottom of the address (not the region ID) by @@ -683,11 +689,6 @@ finish_normal_tlb_miss: /* Check if required permissions are met */ andc. r15,r11,r14 bne- normal_tlb_miss_access_fault -#ifdef CONFIG_PPC_KUAP - mfspr r11,SPRN_MAS1 - rlwinm. r10,r11,0,0x3fff0000 - beq- normal_tlb_miss_access_fault /* KUAP fault */ -#endif /* Now we build the MAS: * @@ -709,9 +710,7 @@ finish_normal_tlb_miss: rldicl r10,r14,64-8,64-8 cmpldi cr0,r10,BOOK3E_PAGESZ_4K beq- 1f -#ifndef CONFIG_PPC_KUAP mfspr r11,SPRN_MAS1 -#endif rlwimi r11,r14,31,21,24 rlwinm r11,r11,0,21,19 mtspr SPRN_MAS1,r11 -- 2.36.1

2 years, 5 months

2
1
0 0

[PATCH] powerpc/ptdump: Fix display of RW pages on FSL_BOOK3E

by Christophe Leroy

On FSL_BOOK3E, _PAGE_RW is defined with two bits, one for user and one for supervisor. As soon as one of the two bits is set, the page has to be display as RW. But the way it is implemented today requires both bits to be set in order to display it as RW. Instead of display RW when _PAGE_RW bits are set and R otherwise, reverse the logic and display R when _PAGE_RW bits are all 0 and RW otherwise. This change has no impact on other platforms as _PAGE_RW is a single bit on all of them. Fixes: 8eb07b187000 ("powerpc/mm: Dump linux pagetables") Cc: stable(a)vger.kernel.org Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- arch/powerpc/mm/ptdump/shared.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/ptdump/shared.c b/arch/powerpc/mm/ptdump/shared.c index 03607ab90c66..f884760ca5cf 100644 --- a/arch/powerpc/mm/ptdump/shared.c +++ b/arch/powerpc/mm/ptdump/shared.c @@ -17,9 +17,9 @@ static const struct flag_info flag_array[] = { .clear = " ", }, { .mask = _PAGE_RW, - .val = _PAGE_RW, - .set = "rw", - .clear = "r ", + .val = 0, + .set = "r ", + .clear = "rw", }, { .mask = _PAGE_EXEC, .val = _PAGE_EXEC, -- 2.36.1

2 years, 5 months

2
1
0 0

[PATCH] powerpc: Restore CONFIG_DEBUG_INFO in defconfigs

by Christophe Leroy

Commit f9b3cd245784 ("Kconfig.debug: make DEBUG_INFO selectable from a choice") broke the selection of CONFIG_DEBUG_INFO by powerpc defconfigs. It is now necessary to select one of the three DEBUG_INFO_DWARF* options to get DEBUG_INFO enabled. Replace DEBUG_INFO=y by DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y in all defconfigs using the following command: sed -i s/DEBUG_INFO=y/DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y/g `git grep -l DEBUG_INFO arch/powerpc/configs/` Fixes: f9b3cd245784 ("Kconfig.debug: make DEBUG_INFO selectable from a choice") Cc: stable(a)vger.kernel.org Cc: Kees Cook <keescook(a)chromium.org> Signed-off-by: Christophe Leroy <christophe.leroy(a)csgroup.eu> --- arch/powerpc/configs/44x/akebono_defconfig | 2 +- arch/powerpc/configs/44x/currituck_defconfig | 2 +- arch/powerpc/configs/44x/fsp2_defconfig | 2 +- arch/powerpc/configs/44x/iss476-smp_defconfig | 2 +- arch/powerpc/configs/44x/warp_defconfig | 2 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- arch/powerpc/configs/adder875_defconfig | 2 +- arch/powerpc/configs/ep8248e_defconfig | 2 +- arch/powerpc/configs/ep88xc_defconfig | 2 +- arch/powerpc/configs/fsl-emb-nonhw.config | 2 +- arch/powerpc/configs/mgcoge_defconfig | 2 +- arch/powerpc/configs/mpc5200_defconfig | 2 +- arch/powerpc/configs/mpc8272_ads_defconfig | 2 +- arch/powerpc/configs/mpc885_ads_defconfig | 2 +- arch/powerpc/configs/ppc6xx_defconfig | 2 +- arch/powerpc/configs/pq2fads_defconfig | 2 +- arch/powerpc/configs/ps3_defconfig | 2 +- arch/powerpc/configs/tqm8xx_defconfig | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/configs/44x/akebono_defconfig b/arch/powerpc/configs/44x/akebono_defconfig index 4bc549c6edc5..fde4824f235e 100644 --- a/arch/powerpc/configs/44x/akebono_defconfig +++ b/arch/powerpc/configs/44x/akebono_defconfig @@ -118,7 +118,7 @@ CONFIG_CRAMFS=y CONFIG_NLS_DEFAULT="n" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_XMON=y diff --git a/arch/powerpc/configs/44x/currituck_defconfig b/arch/powerpc/configs/44x/currituck_defconfig index 717827219921..7283b7d4a1a5 100644 --- a/arch/powerpc/configs/44x/currituck_defconfig +++ b/arch/powerpc/configs/44x/currituck_defconfig @@ -73,7 +73,7 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_NLS_DEFAULT="n" -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_XMON=y diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig index 8da316e61a08..3fdfbb29b854 100644 --- a/arch/powerpc/configs/44x/fsp2_defconfig +++ b/arch/powerpc/configs/44x/fsp2_defconfig @@ -110,7 +110,7 @@ CONFIG_XZ_DEC=y CONFIG_PRINTK_TIME=y CONFIG_MESSAGE_LOGLEVEL_DEFAULT=3 CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_CRYPTO_CBC=y diff --git a/arch/powerpc/configs/44x/iss476-smp_defconfig b/arch/powerpc/configs/44x/iss476-smp_defconfig index c11e777b2f3d..0f6380e1e612 100644 --- a/arch/powerpc/configs/44x/iss476-smp_defconfig +++ b/arch/powerpc/configs/44x/iss476-smp_defconfig @@ -56,7 +56,7 @@ CONFIG_PROC_KCORE=y CONFIG_TMPFS=y CONFIG_CRAMFS=y # CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_PPC_EARLY_DEBUG=y diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig index 47252c2d7669..20891c413149 100644 --- a/arch/powerpc/configs/44x/warp_defconfig +++ b/arch/powerpc/configs/44x/warp_defconfig @@ -88,7 +88,7 @@ CONFIG_NLS_UTF8=y CONFIG_CRC_CCITT=y CONFIG_CRC_T10DIF=y CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y diff --git a/arch/powerpc/configs/52xx/lite5200b_defconfig b/arch/powerpc/configs/52xx/lite5200b_defconfig index 63368e677506..7db479dcbc0c 100644 --- a/arch/powerpc/configs/52xx/lite5200b_defconfig +++ b/arch/powerpc/configs/52xx/lite5200b_defconfig @@ -58,6 +58,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEBUG_BUGVERBOSE is not set diff --git a/arch/powerpc/configs/52xx/motionpro_defconfig b/arch/powerpc/configs/52xx/motionpro_defconfig index 72762da94846..6186ead1e105 100644 --- a/arch/powerpc/configs/52xx/motionpro_defconfig +++ b/arch/powerpc/configs/52xx/motionpro_defconfig @@ -84,7 +84,7 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_CRYPTO_ECB=y diff --git a/arch/powerpc/configs/52xx/tqm5200_defconfig b/arch/powerpc/configs/52xx/tqm5200_defconfig index a3c8ca74032c..e6735b945327 100644 --- a/arch/powerpc/configs/52xx/tqm5200_defconfig +++ b/arch/powerpc/configs/52xx/tqm5200_defconfig @@ -85,7 +85,7 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_CRYPTO_ECB=y diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 5326bc739279..7f35d5bc1229 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig @@ -45,7 +45,7 @@ CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CRC32_SLICEBY4=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index 00d69965f898..8df6d3a293e3 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig @@ -59,7 +59,7 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set CONFIG_BDI_SWITCH=y diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index f5c3e72da719..a98ef6a4abef 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig @@ -48,6 +48,6 @@ CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CRC32_SLICEBY4=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y diff --git a/arch/powerpc/configs/fsl-emb-nonhw.config b/arch/powerpc/configs/fsl-emb-nonhw.config index df37efed0aec..f14c6dbd7346 100644 --- a/arch/powerpc/configs/fsl-emb-nonhw.config +++ b/arch/powerpc/configs/fsl-emb-nonhw.config @@ -24,7 +24,7 @@ CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_SHIRQ=y CONFIG_DETECT_HUNG_TASK=y diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig index dcc8dccf54f3..498d35db7833 100644 --- a/arch/powerpc/configs/mgcoge_defconfig +++ b/arch/powerpc/configs/mgcoge_defconfig @@ -73,7 +73,7 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set diff --git a/arch/powerpc/configs/mpc5200_defconfig b/arch/powerpc/configs/mpc5200_defconfig index 83d801307178..c0fe5e76604a 100644 --- a/arch/powerpc/configs/mpc5200_defconfig +++ b/arch/powerpc/configs/mpc5200_defconfig @@ -122,6 +122,6 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 00a4d2bf43b2..4145ef5689ca 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig @@ -67,7 +67,7 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y CONFIG_BDI_SWITCH=y diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index c74dc76b1d0d..700115d85d6f 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig @@ -71,7 +71,7 @@ CONFIG_ROOT_NFS=y CONFIG_CRYPTO=y CONFIG_CRYPTO_DEV_TALITOS=y CONFIG_CRC32_SLICEBY4=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_VM_PGTABLE=y diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index b622ecd73286..91967824272e 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -1065,7 +1065,7 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 9d8a76857c6f..9d63e2e65211 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig @@ -68,7 +68,7 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 7c95fab4b920..2d9ac233da68 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig @@ -153,7 +153,7 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEBUG_STACKOVERFLOW=y diff --git a/arch/powerpc/configs/tqm8xx_defconfig b/arch/powerpc/configs/tqm8xx_defconfig index 77857d513022..083c2e57520a 100644 --- a/arch/powerpc/configs/tqm8xx_defconfig +++ b/arch/powerpc/configs/tqm8xx_defconfig @@ -55,6 +55,6 @@ CONFIG_CRAMFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CRC32_SLICEBY4=y -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y -- 2.35.3

2 years, 5 months

3
2
0 0

[PATCH 5/6] drm/i915/gt: Serialize GRDOM access between multiple engine resets

by Mauro Carvalho Chehab

From: Chris Wilson <chris.p.wilson(a)intel.com> Don't allow two engines to be reset in parallel, as they would both try to select a reset bit (and send requests to common registers) and wait on that register, at the same time. Serialize control of the reset requests/acks using the uncore->lock, which will also ensure that no other GT state changes at the same time as the actual reset. Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store") Reported-by: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala(a)linux.intel.com> Cc: Andi Shyti <andi.shyti(a)intel.com> Cc: stable(a)vger.kernel.org Acked-by: Thomas Hellström <thomas.hellstrom(a)linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab(a)kernel.org> --- See [PATCH 0/6] at: https://lore.kernel.org/all/cover.1655306128.git.mchehab@kernel.org/ drivers/gpu/drm/i915/gt/intel_reset.c | 37 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index a5338c3fde7a..c68d36fb5bbd 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -300,9 +300,9 @@ static int gen6_hw_domain_reset(struct intel_gt *gt, u32 hw_domain_mask) return err; } -static int gen6_reset_engines(struct intel_gt *gt, - intel_engine_mask_t engine_mask, - unsigned int retry) +static int __gen6_reset_engines(struct intel_gt *gt, + intel_engine_mask_t engine_mask, + unsigned int retry) { struct intel_engine_cs *engine; u32 hw_mask; @@ -321,6 +321,20 @@ static int gen6_reset_engines(struct intel_gt *gt, return gen6_hw_domain_reset(gt, hw_mask); } +static int gen6_reset_engines(struct intel_gt *gt, + intel_engine_mask_t engine_mask, + unsigned int retry) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&gt->uncore->lock, flags); + ret = __gen6_reset_engines(gt, engine_mask, retry); + spin_unlock_irqrestore(&gt->uncore->lock, flags); + + return ret; +} + static struct intel_engine_cs *find_sfc_paired_vecs_engine(struct intel_engine_cs *engine) { int vecs_id; @@ -487,9 +501,9 @@ static void gen11_unlock_sfc(struct intel_engine_cs *engine) rmw_clear_fw(uncore, sfc_lock.lock_reg, sfc_lock.lock_bit); } -static int gen11_reset_engines(struct intel_gt *gt, - intel_engine_mask_t engine_mask, - unsigned int retry) +static int __gen11_reset_engines(struct intel_gt *gt, + intel_engine_mask_t engine_mask, + unsigned int retry) { struct intel_engine_cs *engine; intel_engine_mask_t tmp; @@ -583,8 +597,11 @@ static int gen8_reset_engines(struct intel_gt *gt, struct intel_engine_cs *engine; const bool reset_non_ready = retry >= 1; intel_engine_mask_t tmp; + unsigned long flags; int ret; + spin_lock_irqsave(&gt->uncore->lock, flags); + for_each_engine_masked(engine, gt, engine_mask, tmp) { ret = gen8_engine_reset_prepare(engine); if (ret && !reset_non_ready) @@ -612,17 +629,19 @@ static int gen8_reset_engines(struct intel_gt *gt, * This is best effort, so ignore any error from the initial reset. */ if (IS_DG2(gt->i915) && engine_mask == ALL_ENGINES) - gen11_reset_engines(gt, gt->info.engine_mask, 0); + __gen11_reset_engines(gt, gt->info.engine_mask, 0); if (GRAPHICS_VER(gt->i915) >= 11) - ret = gen11_reset_engines(gt, engine_mask, retry); + ret = __gen11_reset_engines(gt, engine_mask, retry); else - ret = gen6_reset_engines(gt, engine_mask, retry); + ret = __gen6_reset_engines(gt, engine_mask, retry); skip_reset: for_each_engine_masked(engine, gt, engine_mask, tmp) gen8_engine_reset_cancel(engine); + spin_unlock_irqrestore(&gt->uncore->lock, flags); + return ret; } -- 2.36.1

2 years, 5 months

4
12
0 0

[PATCH 5.4 00/16] 5.4.203-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.203 release. There are 16 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.203-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.203-rc1 Stefan Agner <stefan(a)agner.ch> crypto: arm/ghash-ce - define fpu before fpu registers are referenced Ard Biesheuvel <ard.biesheuvel(a)linaro.org> crypto: arm - use Kconfig based compiler checks for crypto opcodes Jian Cai <jiancai(a)google.com> ARM: 9029/1: Make iwmmxt.S support Clang's integrated assembler Stefan Agner <stefan(a)agner.ch> ARM: OMAP2+: drop unnecessary adrl Stefan Agner <stefan(a)agner.ch> ARM: 8929/1: use APSR_nzcv instead of r15 as mrc operand Nick Desaulniers <ndesaulniers(a)google.com> ARM: 8933/1: replace Sun/Solaris style flag on section directive Ard Biesheuvel <ardb(a)kernel.org> crypto: arm/sha512-neon - avoid ADRL pseudo instruction Ard Biesheuvel <ardb(a)kernel.org> crypto: arm/sha256-neon - avoid ADRL pseudo instruction Jian Cai <caij2003(a)gmail.com> ARM: 8971/1: replace the sole use of a symbol with its definition Stefan Agner <stefan(a)agner.ch> ARM: 8990/1: use VFP assembler mnemonics in register load/store macros Stefan Agner <stefan(a)agner.ch> ARM: 8989/1: use .fpu assembler directives instead of assembler arguments Vladimir Oltean <vladimir.oltean(a)nxp.com> net: mscc: ocelot: allow unregistered IP multicast flooding Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add] Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/ftrace: Remove ftrace init tramp once kernel init is complete Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> clocksource/drivers/ixp4xx: remove __init from ixp4xx_timer_setup() Christoph Hellwig <hch(a)lst.de> drm: remove drm_fb_helper_modinit ------------- Diffstat: Makefile | 4 +- arch/arm/boot/bootp/init.S | 2 +- arch/arm/boot/compressed/big-endian.S | 2 +- arch/arm/boot/compressed/head.S | 4 +- arch/arm/boot/compressed/piggy.S | 2 +- arch/arm/crypto/Kconfig | 14 +++-- arch/arm/crypto/Makefile | 32 ++--------- arch/arm/crypto/crct10dif-ce-core.S | 2 +- arch/arm/crypto/ghash-ce-core.S | 4 +- arch/arm/crypto/sha1-ce-core.S | 1 + arch/arm/crypto/sha2-ce-core.S | 1 + arch/arm/crypto/sha256-armv4.pl | 4 +- arch/arm/crypto/sha256-core.S_shipped | 4 +- arch/arm/crypto/sha512-armv4.pl | 4 +- arch/arm/crypto/sha512-core.S_shipped | 4 +- arch/arm/include/asm/assembler.h | 3 +- arch/arm/include/asm/vfpmacros.h | 19 ++++--- arch/arm/kernel/iwmmxt.S | 89 +++++++++++++++--------------- arch/arm/kernel/iwmmxt.h | 47 ++++++++++++++++ arch/arm/mach-omap2/sleep34xx.S | 2 +- arch/arm/mm/proc-arm1020.S | 2 +- arch/arm/mm/proc-arm1020e.S | 2 +- arch/arm/mm/proc-arm1022.S | 2 +- arch/arm/mm/proc-arm1026.S | 6 +- arch/arm/mm/proc-arm720.S | 2 +- arch/arm/mm/proc-arm740.S | 2 +- arch/arm/mm/proc-arm7tdmi.S | 2 +- arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm922.S | 2 +- arch/arm/mm/proc-arm925.S | 2 +- arch/arm/mm/proc-arm926.S | 6 +- arch/arm/mm/proc-arm940.S | 2 +- arch/arm/mm/proc-arm946.S | 2 +- arch/arm/mm/proc-arm9tdmi.S | 2 +- arch/arm/mm/proc-fa526.S | 2 +- arch/arm/mm/proc-feroceon.S | 2 +- arch/arm/mm/proc-mohawk.S | 2 +- arch/arm/mm/proc-sa110.S | 2 +- arch/arm/mm/proc-sa1100.S | 2 +- arch/arm/mm/proc-v6.S | 2 +- arch/arm/mm/proc-v7.S | 2 +- arch/arm/mm/proc-v7m.S | 4 +- arch/arm/mm/proc-xsc3.S | 2 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/vfp/Makefile | 2 - arch/arm/vfp/vfphw.S | 30 ++++++---- arch/powerpc/include/asm/ftrace.h | 5 +- arch/powerpc/kernel/trace/ftrace.c | 15 ++++- arch/powerpc/mm/mem.c | 2 + arch/s390/include/asm/kexec.h | 10 ++++ arch/x86/include/asm/kexec.h | 9 +++ drivers/clocksource/mmio.c | 2 +- drivers/clocksource/timer-ixp4xx.c | 10 ++-- drivers/gpu/drm/drm_crtc_helper_internal.h | 10 ---- drivers/gpu/drm/drm_fb_helper.c | 21 ------- drivers/gpu/drm/drm_kms_helper_common.c | 25 ++++----- drivers/net/ethernet/mscc/ocelot.c | 8 ++- include/linux/kexec.h | 46 ++++++++++++--- include/linux/platform_data/timer-ixp4xx.h | 5 +- kernel/kexec_file.c | 34 ------------ 60 files changed, 289 insertions(+), 247 deletions(-)

2 years, 5 months

8
23
0 0

[PATCH 5.10 00/12] 5.10.128-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.128 release. There are 12 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.128-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.128-rc1 Vladimir Oltean <vladimir.oltean(a)nxp.com> net: mscc: ocelot: allow unregistered IP multicast flooding Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/ftrace: Remove ftrace init tramp once kernel init is complete Dave Chinner <dchinner(a)redhat.com> xfs: check sb_meta_uuid for dabuf buffer recovery Darrick J. Wong <djwong(a)kernel.org> xfs: remove all COW fork extents when remounting readonly Yang Xu <xuyang2018.jy(a)fujitsu.com> xfs: Fix the free logic of state in xfs_attr_node_hasname Brian Foster <bfoster(a)redhat.com> xfs: punch out data fork delalloc blocks on COW writeback failure Rustam Kovhaev <rkovhaev(a)gmail.com> xfs: use kmem_cache_free() for kmem_cache objects Coly Li <colyli(a)suse.de> bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> clocksource/drivers/ixp4xx: remove __init from ixp4xx_timer_setup() Masahiro Yamada <masahiroy(a)kernel.org> tick/nohz: unexport __init-annotated tick_nohz_full_setup() Christoph Hellwig <hch(a)lst.de> drm: remove drm_fb_helper_modinit Amir Goldstein <amir73il(a)gmail.com> MAINTAINERS: add Amir as xfs maintainer for 5.10.y ------------- Diffstat: MAINTAINERS | 3 ++- Makefile | 4 ++-- arch/powerpc/include/asm/ftrace.h | 4 +++- arch/powerpc/kernel/trace/ftrace.c | 15 ++++++++++++--- arch/powerpc/mm/mem.c | 2 ++ drivers/clocksource/mmio.c | 2 +- drivers/clocksource/timer-ixp4xx.c | 10 ++++------ drivers/gpu/drm/drm_crtc_helper_internal.h | 10 ---------- drivers/gpu/drm/drm_fb_helper.c | 21 --------------------- drivers/gpu/drm/drm_kms_helper_common.c | 25 ++++++++++++------------- drivers/md/bcache/btree.c | 1 + drivers/md/bcache/writeback.c | 1 + drivers/net/ethernet/mscc/ocelot.c | 8 ++++++-- fs/xfs/libxfs/xfs_attr.c | 13 +++++-------- fs/xfs/xfs_aops.c | 15 ++++++++++++--- fs/xfs/xfs_buf_item_recover.c | 2 +- fs/xfs/xfs_extfree_item.c | 6 +++--- fs/xfs/xfs_super.c | 14 +++++++++++--- include/linux/platform_data/timer-ixp4xx.h | 5 ++--- kernel/time/tick-sched.c | 1 - 20 files changed, 80 insertions(+), 82 deletions(-)

2 years, 5 months

9
20
0 0

[PATCH 4.19 00/49] 4.19.250-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.250 release. There are 49 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.250-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.250-rc1 Liu Shixin <liushixin2(a)huawei.com> swiotlb: skip swiotlb_bounce when orig_addr is zero Diederik de Haas <didi.debian(a)cknow.org> net/sched: move NULL ptr check to qdisc_put() too Vladimir Oltean <vladimir.oltean(a)nxp.com> net: mscc: ocelot: allow unregistered IP multicast flooding Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add] Hsin-Yi Wang <hsinyi(a)chromium.org> fdt: Update CRC check for rng-seed Masahiro Yamada <masahiroy(a)kernel.org> xen: unexport __init-annotated xen_xlate_map_ballooned_pages() Christoph Hellwig <hch(a)lst.de> drm: remove drm_fb_helper_modinit Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/pseries: wire up rng during setup_arch() Masahiro Yamada <masahiroy(a)kernel.org> kbuild: link vmlinux only once for CONFIG_TRIM_UNUSED_KSYMS (2nd attempt) Masahiro Yamada <masahiroy(a)kernel.org> modpost: fix section mismatch check for exported init/exit sections Miaoqian Lin <linmq006(a)gmail.com> ARM: cns3xxx: Fix refcount leak in cns3xxx_init Miaoqian Lin <linmq006(a)gmail.com> ARM: Fix refcount leak in axxia_boot_secondary Miaoqian Lin <linmq006(a)gmail.com> soc: bcm: brcmstb: pm: pm-arm: Fix refcount leak in brcmstb_pm_probe Miaoqian Lin <linmq006(a)gmail.com> ARM: exynos: Fix refcount leak in exynos_map_pmu Lucas Stach <l.stach(a)pengutronix.de> ARM: dts: imx6qdl: correct PU regulator ramp delay Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/powernv: wire up rng during setup_arch Andrew Donnellan <ajd(a)linux.ibm.com> powerpc/rtas: Allow ibm,platform-dump RTAS call with null buffer address Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc: Enable execve syscall exit tracepoint Liang He <windhl(a)126.com> xtensa: Fix refcount leak bug in time.c Liang He <windhl(a)126.com> xtensa: xtfpga: Fix refcount leak bug in setup Hans de Goede <hdegoede(a)redhat.com> iio: adc: axp288: Override TS pin bias current for some models Vincent Whitchurch <vincent.whitchurch(a)axis.com> iio: trigger: sysfs: fix use-after-free on remove Zheyu Ma <zheyuma97(a)gmail.com> iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up() Haibo Chen <haibo.chen(a)nxp.com> iio: accel: mma8452: ignore the return value of reset operation Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:accel:bma180: rearrange iio trigger get and register Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:chemical:ccs811: rearrange iio trigger get and register Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: udc: check request status before setting device address Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: turn off port power in shutdown Baruch Siach <baruch(a)tkos.co.il> iio: adc: vf610: fix conversion mode sysfs node name Dan Carpenter <dan.carpenter(a)oracle.com> gpio: winbond: Fix error code in winbond_gpio_get() Stephan Gerhold <stephan.gerhold(a)kernkonzept.com> virtio_net: fix xdp_rxq_info bug after suspend/resume Kai-Heng Feng <kai.heng.feng(a)canonical.com> igb: Make DMA faster when CPU is active on the PCIe link David Howells <dhowells(a)redhat.com> afs: Fix dynamic root getattr huhai <huhai(a)kylinos.cn> MIPS: Remove repetitive increase irq_err_count Julien Grall <jgrall(a)amazon.com> x86/xen: Remove undefined behavior in setup_features() Eric Dumazet <edumazet(a)google.com> erspan: do not assume transport header is always set Peilin Ye <peilin.ye(a)bytedance.com> net/sched: sch_netem: Fix arithmetic in netem_dump() for 32-bit platforms Jay Vosburgh <jay.vosburgh(a)canonical.com> bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers Macpaul Lin <macpaul.lin(a)mediatek.com> USB: serial: option: add Quectel RM500K module support Yonglin Tan <yonglin.tan(a)outlook.com> USB: serial: option: add Quectel EM05-G modem Carlo Lobrano <c.lobrano(a)gmail.com> USB: serial: option: add Telit LE910Cx 0x1250 composition Jason A. Donenfeld <Jason(a)zx2c4.com> random: quiet urandom warning ratelimit suppression message Nikos Tsironis <ntsironis(a)arrikto.com> dm era: commit metadata in postsuspend after worker stops Edward Wu <edwardwu(a)realtek.com> ata: libata: add qc->flags in ata_qc_complete_template tracepoint Tim Crawford <tcrawford(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo PD70PNT Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant: Fix missing beep setup Takashi Iwai <tiwai(a)suse.de> ALSA: hda/via: Fix missing beep setup Jason A. Donenfeld <Jason(a)zx2c4.com> random: schedule mix_interrupt_randomness() less often Jiri Slaby <jslaby(a)suse.cz> vt: drop old FONT ioctls ------------- Diffstat: Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- Makefile | 6 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/mach-axxia/platsmp.c | 1 + arch/arm/mach-cns3xxx/core.c | 2 + arch/arm/mach-exynos/exynos.c | 1 + arch/mips/vr41xx/common/icu.c | 2 - arch/powerpc/kernel/process.c | 2 +- arch/powerpc/kernel/rtas.c | 11 +- arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 ++++++--- arch/powerpc/platforms/powernv/setup.c | 2 + arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/rng.c | 11 +- arch/powerpc/platforms/pseries/setup.c | 1 + arch/s390/include/asm/kexec.h | 10 ++ arch/x86/include/asm/kexec.h | 9 ++ arch/xtensa/kernel/time.c | 1 + arch/xtensa/platforms/xtfpga/setup.c | 1 + drivers/char/random.c | 4 +- drivers/gpio/gpio-vr41xx.c | 2 - drivers/gpio/gpio-winbond.c | 7 +- drivers/gpu/drm/drm_crtc_helper_internal.h | 10 -- drivers/gpu/drm/drm_fb_helper.c | 21 ---- drivers/gpu/drm/drm_kms_helper_common.c | 25 +++-- drivers/iio/accel/bma180.c | 3 +- drivers/iio/accel/mma8452.c | 10 +- drivers/iio/adc/axp288_adc.c | 8 ++ drivers/iio/chemical/ccs811.c | 4 +- drivers/iio/gyro/mpu3050-core.c | 1 + drivers/iio/trigger/iio-trig-sysfs.c | 1 + drivers/md/dm-era-target.c | 8 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/ethernet/intel/igb/igb_main.c | 12 +-- drivers/net/ethernet/mscc/ocelot.c | 8 +- drivers/net/virtio_net.c | 25 ++--- drivers/of/fdt.c | 8 +- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 1 + drivers/tty/vt/vt.c | 39 +------ drivers/tty/vt/vt_ioctl.c | 149 -------------------------- drivers/usb/chipidea/udc.c | 3 + drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci.c | 15 ++- drivers/usb/host/xhci.h | 2 + drivers/usb/serial/option.c | 6 ++ drivers/xen/features.c | 2 +- drivers/xen/xlate_mmu.c | 1 - fs/afs/inode.c | 3 +- include/linux/kd.h | 8 -- include/linux/kexec.h | 46 ++++++-- include/linux/ratelimit.h | 12 ++- include/trace/events/libata.h | 1 + kernel/dma/swiotlb.c | 3 +- kernel/kexec_file.c | 34 ------ net/ipv4/ip_gre.c | 15 ++- net/ipv6/ip6_gre.c | 15 ++- net/sched/sch_generic.c | 5 +- net/sched/sch_netem.c | 4 +- scripts/mod/modpost.c | 2 +- sound/pci/hda/patch_conexant.c | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_via.c | 4 +- 62 files changed, 271 insertions(+), 387 deletions(-)

2 years, 5 months

7
55
0 0

[PATCH 4.9 00/29] 4.9.321-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.9.321 release. There are 29 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.321-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.9.321-rc1 Liu Shixin <liushixin2(a)huawei.com> swiotlb: skip swiotlb_bounce when orig_addr is zero Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add] Hsin-Yi Wang <hsinyi(a)chromium.org> fdt: Update CRC check for rng-seed Masahiro Yamada <masahiroy(a)kernel.org> xen: unexport __init-annotated xen_xlate_map_ballooned_pages() Christoph Hellwig <hch(a)lst.de> drm: remove drm_fb_helper_modinit Jason A. Donenfeld <Jason(a)zx2c4.com> powerpc/pseries: wire up rng during setup_arch() Masahiro Yamada <masahiroy(a)kernel.org> modpost: fix section mismatch check for exported init/exit sections Miaoqian Lin <linmq006(a)gmail.com> ARM: cns3xxx: Fix refcount leak in cns3xxx_init Miaoqian Lin <linmq006(a)gmail.com> ARM: Fix refcount leak in axxia_boot_secondary Miaoqian Lin <linmq006(a)gmail.com> ARM: exynos: Fix refcount leak in exynos_map_pmu Lucas Stach <l.stach(a)pengutronix.de> ARM: dts: imx6qdl: correct PU regulator ramp delay Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc: Enable execve syscall exit tracepoint Liang He <windhl(a)126.com> xtensa: Fix refcount leak bug in time.c Liang He <windhl(a)126.com> xtensa: xtfpga: Fix refcount leak bug in setup Vincent Whitchurch <vincent.whitchurch(a)axis.com> iio: trigger: sysfs: fix use-after-free on remove Haibo Chen <haibo.chen(a)nxp.com> iio: accel: mma8452: ignore the return value of reset operation Dmitry Rokosov <DDRokosov(a)sberdevices.ru> iio:accel:bma180: rearrange iio trigger get and register Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: udc: check request status before setting device address Baruch Siach <baruch(a)tkos.co.il> iio: adc: vf610: fix conversion mode sysfs node name Kai-Heng Feng <kai.heng.feng(a)canonical.com> igb: Make DMA faster when CPU is active on the PCIe link huhai <huhai(a)kylinos.cn> MIPS: Remove repetitive increase irq_err_count Julien Grall <jgrall(a)amazon.com> x86/xen: Remove undefined behavior in setup_features() Jay Vosburgh <jay.vosburgh(a)canonical.com> bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers Carlo Lobrano <c.lobrano(a)gmail.com> USB: serial: option: add Telit LE910Cx 0x1250 composition Jason A. Donenfeld <Jason(a)zx2c4.com> random: quiet urandom warning ratelimit suppression message Nikos Tsironis <ntsironis(a)arrikto.com> dm era: commit metadata in postsuspend after worker stops Edward Wu <edwardwu(a)realtek.com> ata: libata: add qc->flags in ata_qc_complete_template tracepoint Jason A. Donenfeld <Jason(a)zx2c4.com> random: schedule mix_interrupt_randomness() less often Jiri Slaby <jslaby(a)suse.cz> vt: drop old FONT ioctls ------------- Diffstat: Documentation/ABI/testing/sysfs-bus-iio-vf610 | 2 +- Makefile | 4 +- arch/arm/boot/dts/imx6qdl.dtsi | 2 +- arch/arm/mach-axxia/platsmp.c | 1 + arch/arm/mach-cns3xxx/core.c | 2 + arch/arm/mach-exynos/exynos.c | 1 + arch/mips/vr41xx/common/icu.c | 2 - arch/powerpc/kernel/process.c | 2 +- arch/powerpc/platforms/pseries/pseries.h | 2 + arch/powerpc/platforms/pseries/rng.c | 11 +- arch/powerpc/platforms/pseries/setup.c | 1 + arch/x86/include/asm/kexec.h | 7 ++ arch/xtensa/kernel/time.c | 1 + arch/xtensa/platforms/xtfpga/setup.c | 1 + drivers/char/random.c | 4 +- drivers/gpio/gpio-vr41xx.c | 2 - drivers/gpu/drm/drm_crtc_helper_internal.h | 10 -- drivers/gpu/drm/drm_fb_helper.c | 21 ---- drivers/gpu/drm/drm_kms_helper_common.c | 25 +++-- drivers/iio/accel/bma180.c | 3 +- drivers/iio/accel/mma8452.c | 10 +- drivers/iio/trigger/iio-trig-sysfs.c | 1 + drivers/md/dm-era-target.c | 8 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/ethernet/intel/igb/igb_main.c | 12 +-- drivers/of/fdt.c | 8 +- drivers/tty/vt/vt.c | 34 +----- drivers/tty/vt/vt_ioctl.c | 149 -------------------------- drivers/usb/chipidea/udc.c | 3 + drivers/usb/serial/option.c | 1 + drivers/xen/features.c | 2 +- drivers/xen/xlate_mmu.c | 1 - include/linux/kd.h | 7 -- include/linux/kexec.h | 26 ++++- include/linux/ratelimit.h | 12 ++- include/trace/events/libata.h | 1 + kernel/kexec_file.c | 18 ---- lib/swiotlb.c | 3 +- scripts/mod/modpost.c | 2 +- 39 files changed, 111 insertions(+), 295 deletions(-)

2 years, 5 months

7
35
0 0

[PATCH] dmaengine: imx-sdma: only restart cyclic channel when enabled

by Sascha Hauer

An interrupt for a channel might be pending even after struct dma_device::device_terminate_all has been called. In that case the recently introduced warning message "restart cyclic channel..." triggers and the channel will be restarted. This is not desired as the channel has just been stopped. Only restart the channel when we still have a descriptor set for it (which will be set to NULL in sdma_terminate_all()). Fixes: 5b215c28b9235 ("dmaengine: imx-sdma: restart cyclic channel if needed") Cc: stable(a)vger.kernel.org Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> --- drivers/dma/imx-sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 8535018ee7a2e..5356cce41bffc 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -891,7 +891,7 @@ static void sdma_update_channel_loop(struct sdma_channel *sdmac) * SDMA stops cyclic channel when DMA request triggers a channel and no SDMA * owned buffer is available (i.e. BD_DONE was set too late). */ - if (!is_sdma_channel_enabled(sdmac->sdma, sdmac->channel)) { + if (sdmac->desc && !is_sdma_channel_enabled(sdmac->sdma, sdmac->channel)) { dev_warn(sdmac->sdma->dev, "restart cyclic channel %d\n", sdmac->channel); sdma_enable_channel(sdmac->sdma, sdmac->channel); } -- 2.30.2

2 years, 5 months

2
1
0 0

[PATCH 5.15 00/28] 5.15.52-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.52 release. There are 28 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.52-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.15.52-rc1 Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix not locked access to fixed buf table Vladimir Oltean <vladimir.oltean(a)nxp.com> net: mscc: ocelot: allow unregistered IP multicast flooding to CPU Ping-Ke Shih <pkshih(a)realtek.com> rtw88: rtw8821c: enable rfe 6 devices Guo-Feng Fan <vincent_fann(a)realtek.com> rtw88: 8821c: support RFE type4 wifi NIC Christian Brauner <brauner(a)kernel.org> fs: account for group membership Christian Brauner <brauner(a)kernel.org> fs: fix acl translation Christian Brauner <christian.brauner(a)ubuntu.com> fs: support mapped mounts of mapped filesystems Christian Brauner <christian.brauner(a)ubuntu.com> fs: add i_user_ns() helper Christian Brauner <christian.brauner(a)ubuntu.com> fs: port higher-level mapping helpers Christian Brauner <christian.brauner(a)ubuntu.com> fs: remove unused low-level mapping helpers Christian Brauner <christian.brauner(a)ubuntu.com> fs: use low-level mapping helpers Christian Brauner <christian.brauner(a)ubuntu.com> docs: update mapping documentation Christian Brauner <christian.brauner(a)ubuntu.com> fs: account for filesystem mappings Christian Brauner <christian.brauner(a)ubuntu.com> fs: tweak fsuidgid_has_mapping() Christian Brauner <christian.brauner(a)ubuntu.com> fs: move mapping helpers Christian Brauner <christian.brauner(a)ubuntu.com> fs: add is_idmapped_mnt() helper Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com> powerpc/ftrace: Remove ftrace init tramp once kernel init is complete Darrick J. Wong <djwong(a)kernel.org> xfs: only bother with sync_filesystem during readonly remount Darrick J. Wong <djwong(a)kernel.org> xfs: prevent UAF in xfs_log_item_in_current_chkpt Dave Chinner <dchinner(a)redhat.com> xfs: check sb_meta_uuid for dabuf buffer recovery Darrick J. Wong <djwong(a)kernel.org> xfs: remove all COW fork extents when remounting readonly Yang Xu <xuyang2018.jy(a)fujitsu.com> xfs: Fix the free logic of state in xfs_attr_node_hasname Brian Foster <bfoster(a)redhat.com> xfs: punch out data fork delalloc blocks on COW writeback failure Rustam Kovhaev <rkovhaev(a)gmail.com> xfs: use kmem_cache_free() for kmem_cache objects Coly Li <colyli(a)suse.de> bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init() Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> x86, kvm: use proper ASM macros for kvm_vcpu_is_preempted Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> clocksource/drivers/ixp4xx: remove __init from ixp4xx_timer_setup() Masahiro Yamada <masahiroy(a)kernel.org> tick/nohz: unexport __init-annotated tick_nohz_full_setup() ------------- Diffstat: Documentation/filesystems/idmappings.rst | 72 -------- Makefile | 4 +- arch/powerpc/include/asm/ftrace.h | 4 +- arch/powerpc/kernel/trace/ftrace.c | 15 +- arch/powerpc/mm/mem.c | 2 + arch/x86/kernel/kvm.c | 2 +- drivers/clocksource/mmio.c | 2 +- drivers/clocksource/timer-ixp4xx.c | 10 +- drivers/md/bcache/btree.c | 1 + drivers/md/bcache/writeback.c | 1 + drivers/net/ethernet/mscc/ocelot.c | 8 +- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 14 +- fs/attr.c | 26 ++- fs/cachefiles/bind.c | 2 +- fs/ecryptfs/main.c | 2 +- fs/io_uring.c | 28 +-- fs/ksmbd/smbacl.c | 19 +-- fs/ksmbd/smbacl.h | 5 +- fs/namespace.c | 53 ++++-- fs/nfsd/export.c | 2 +- fs/open.c | 8 +- fs/overlayfs/super.c | 2 +- fs/posix_acl.c | 27 ++- fs/proc_namespace.c | 2 +- fs/xattr.c | 6 +- fs/xfs/libxfs/xfs_attr.c | 17 +- fs/xfs/xfs_aops.c | 15 +- fs/xfs/xfs_buf_item_recover.c | 2 +- fs/xfs/xfs_extfree_item.c | 6 +- fs/xfs/xfs_inode.c | 8 +- fs/xfs/xfs_linux.h | 1 + fs/xfs/xfs_log_cil.c | 6 +- fs/xfs/xfs_super.c | 21 ++- fs/xfs/xfs_symlink.c | 4 +- include/linux/fs.h | 141 +++++----------- include/linux/mnt_idmapping.h | 234 ++++++++++++++++++++++++++ include/linux/platform_data/timer-ixp4xx.h | 5 +- include/linux/posix_acl_xattr.h | 4 + kernel/time/tick-sched.c | 1 - security/commoncap.c | 15 +- 40 files changed, 498 insertions(+), 299 deletions(-)

2 years, 5 months

11
41
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2022