5.4.216-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.4.216-rc1 review
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +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.216-rc1.gz
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 <[email protected]>
Linux 5.4.216-rc1
Florian Fainelli <[email protected]>
clk: iproc: Do not rely on node name for correct PLL setup
Han Xu <[email protected]>
clk: imx: imx6sx: remove the SET_RATE_PARENT flag for QSPI clocks
Wang Yufen <[email protected]>
selftests: Fix the if conditions of in test_extra_filter()
Michael Kelley <[email protected]>
nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
Chaitanya Kulkarni <[email protected]>
nvme: add new line after variable declatation
Peilin Ye <[email protected]>
usbnet: Fix memory leak in usbnet_disconnect()
Yang Yingliang <[email protected]>
Input: melfas_mip4 - fix return value check in mip4_probe()
Brian Norris <[email protected]>
Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"
Samuel Holland <[email protected]>
soc: sunxi: sram: Fix debugfs info for A64 SRAM C
Samuel Holland <[email protected]>
soc: sunxi: sram: Fix probe function ordering issues
Cai Huoqing <[email protected]>
soc: sunxi_sram: Make use of the helper function devm_platform_ioremap_resource()
Samuel Holland <[email protected]>
soc: sunxi: sram: Prevent the driver from being unbound
Samuel Holland <[email protected]>
soc: sunxi: sram: Actually claim SRAM regions
YuTong Chang <[email protected]>
ARM: dts: am33xx: Fix MMCHS0 dma properties
Faiz Abbas <[email protected]>
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver
Hangyu Hua <[email protected]>
media: dvb_vb2: fix possible out of bound access
Minchan Kim <[email protected]>
mm: fix madivse_pageout mishandling on non-LRU page
Alistair Popple <[email protected]>
mm/migrate_device.c: flush TLB while holding PTL
Maurizio Lombardi <[email protected]>
mm: prevent page_frag_alloc() from corrupting the memory
Mel Gorman <[email protected]>
mm/page_alloc: fix race condition between build_all_zonelists and page allocation
Sergei Antonov <[email protected]>
mmc: moxart: fix 4-bit bus width and remove 8-bit bus width
Niklas Cassel <[email protected]>
libata: add ATA_HORKAGE_NOLPM for Pioneer BDR-207M and BDR-205
Sasha Levin <[email protected]>
Revert "net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()"
ChenXiaoSong <[email protected]>
ntfs: fix BUG_ON in ntfs_lookup_inode_by_name()
Linus Walleij <[email protected]>
ARM: dts: integrator: Tag PCI host with device_type
Aidan MacDonald <[email protected]>
clk: ingenic-tcu: Properly enable registers before accessing timers
Frank Wunderlich <[email protected]>
net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455
Hongling Zeng <[email protected]>
uas: ignore UAS for Thinkplus chips
Hongling Zeng <[email protected]>
usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS
Hongling Zeng <[email protected]>
uas: add no-uas quirk for Hiksemi usb_disk
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - arch/arm/boot/dts/am335x-boneblue.dts | 1 - arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - arch/arm/boot/dts/am335x-evm.dts | 3 +- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-lxm.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 4 +- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 9 +-- arch/arm/boot/dts/am33xx.dtsi | 3 +- arch/arm/boot/dts/am4372.dtsi | 3 +- arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- arch/arm/boot/dts/am437x-l4.dtsi | 5 +- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/integratorap.dts | 1 + drivers/ata/libata-core.c | 4 ++ drivers/clk/bcm/clk-iproc-pll.c | 12 ++-- drivers/clk/imx/clk-imx6sx.c | 4 +- drivers/clk/ingenic/tcu.c | 15 ++--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ----- drivers/input/touchscreen/melfas_mip4.c | 2 +- drivers/media/dvb-core/dvb_vb2.c | 11 ++++ drivers/mmc/host/moxart-mmc.c | 17 +----- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 7 ++- drivers/nvme/host/core.c | 9 ++- drivers/soc/sunxi/sunxi_sram.c | 27 ++++----- drivers/usb/storage/unusual_uas.h | 21 +++++++ fs/ntfs/super.c | 3 +- mm/madvise.c | 7 ++- mm/migrate.c | 5 +- mm/page_alloc.c | 65 ++++++++++++++++++---- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 40 files changed, 173 insertions(+), 112 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/30 uas: add no-uas quirk for Hiksemi usb_disk
From: Hongling Zeng <[email protected]>
commit a625a4b8806cc1e928b7dd2cca1fee709c9de56e upstream.
The UAS mode of Hiksemi is reported to fail to work on several platforms with the following error message, then after re-connecting the device will be offlined and not working at all.
[ 592.518442][ 2] sd 8:0:0:0: [sda] tag#17 uas_eh_abort_handler 0 uas-tag 18
inflight: CMD
[ 592.527575][ 2] sd 8:0:0:0: [sda] tag#17 CDB: Write(10) 2a 00 03 6f 88 00 00
04 00 00
[ 592.536330][ 2] sd 8:0:0:0: [sda] tag#0 uas_eh_abort_handler 0 uas-tag 1
inflight: CMD
[ 592.545266][ 2] sd 8:0:0:0: [sda] tag#0 CDB: Write(10) 2a 00 07 44 1a 88 00
00 08 00These disks have a broken uas implementation, the tag field of the status iu-s is not set properly,so we need to fall-back to usb-storage.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -52,6 +52,13 @@ UNUSUAL_DEV(0x059f, 0x1061, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_OPCODES | US_FL_NO_SAME), +/* Reported-by: Hongling Zeng <[email protected]> */ +UNUSUAL_DEV (0x090c ,0x2000 ,0x0000 ,0x9999 , +"Hiksemi" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_IGNORE_UAS), +/* * Apricorn USB3 dongle sometimes returns "USBSUSBSUSBS" in response to SCSI * commands in UAS mode. Observed with the 1.28 firmware; are there others?
Greg Kroah-Hartman
maintainerPATCH 2/30 usb-storage: Add Hiksemi USB3-FW to IGNORE_UAS
In reply to Greg Kroah-HartmanFrom: Hongling Zeng <[email protected]>
commit e00b488e813f0f1ad9f778e771b7cd2fe2877023 upstream.
The UAS mode of Hiksemi USB_HDD is reported to fail to work on several platforms with the following error message, then after re-connecting the device will be offlined and not working at all.
[ 592.518442][ 2] sd 8:0:0:0: [sda] tag#17 uas_eh_abort_handler 0 uas-tag 18
inflight: CMD
[ 592.527575][ 2] sd 8:0:0:0: [sda] tag#17 CDB: Write(10) 2a 00 03 6f 88 00 00
04 00 00
[ 592.536330][ 2] sd 8:0:0:0: [sda] tag#0 uas_eh_abort_handler 0 uas-tag 1
inflight: CMD
[ 592.545266][ 2] sd 8:0:0:0: [sda] tag#0 CDB: Write(10) 2a 00 07 44 1a 88 00
00 08 00These disks have a broken uas implementation, the tag field of the status iu-s is not set properly,so we need to fall-back to usb-storage.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -83,6 +83,13 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_LUNS), +/* Reported-by: Hongling Zeng <[email protected]> */ +UNUSUAL_DEV (0x0bda ,0x9210 ,0x0000 ,0x9999 , +"Hiksemi" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_IGNORE_UAS ), +/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, "Initio Corporation",
Greg Kroah-Hartman
maintainerPATCH 3/30 uas: ignore UAS for Thinkplus chips
In reply to Greg Kroah-HartmanFrom: Hongling Zeng <[email protected]>
commit 0fb9703a3eade0bb84c635705d9c795345e55053 upstream.
The UAS mode of Thinkplus(0x17ef, 0x3899) is reported to influence performance and trigger kernel panic on several platforms with the following error message:
[ 39.702439] xhci_hcd 0000:0c:00.3: ERROR Transfer event for disabled
endpoint or incorrect stream ring
[ 39.702442] xhci_hcd 0000:0c:00.3: @000000026c61f810 00000000 00000000
1b000000 05038000[ 720.545894][13] Workqueue: usb_hub_wq hub_event
[ 720.550971][13] ffff88026c143c38 0000000000016300 ffff8802755bb900 ffff880
26cb80000
[ 720.559673][13] ffff88026c144000 ffff88026ca88100 0000000000000000 ffff880
26cb80000
[ 720.568374][13] ffff88026cb80000 ffff88026c143c50 ffffffff8186ae25 ffff880
26ca880f8
[ 720.577076][13] Call Trace:
[ 720.580201][13] [<ffffffff8186ae25>] schedule+0x35/0x80
[ 720.586137][13] [<ffffffff8186b0ce>] schedule_preempt_disabled+0xe/0x10
[ 720.593623][13] [<ffffffff8186cb94>] __mutex_lock_slowpath+0x164/0x1e0
[ 720.601012][13] [<ffffffff8186cc3f>] mutex_lock+0x2f/0x40
[ 720.607141][13] [<ffffffff8162b8e9>] usb_disconnect+0x59/0x290Falling back to USB mass storage can solve this problem, so ignore UAS function of this chip.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -132,6 +132,13 @@ UNUSUAL_DEV(0x154b, 0xf00d, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_ATA_1X), +/* Reported-by: Hongling Zeng <[email protected]> */ +UNUSUAL_DEV (0x17ef ,0x3899 ,0x0000 ,0x9999 , +"Thinkplus" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_IGNORE_UAS ), +/* Reported-by: Hans de Goede <[email protected]> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA",
Greg Kroah-Hartman
maintainerPATCH 4/30 net: usb: qmi_wwan: Add new usb-id for Dell branded EM7455
In reply to Greg Kroah-HartmanFrom: Frank Wunderlich <[email protected]>
commit 797666cd5af041ffb66642fff62f7389f08566a2 upstream.
Add support for Dell 5811e (EM7455) with USB-id 0x413c:0x81c2.
--- drivers/net/usb/qmi_wwan.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1354,6 +1354,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81c2, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81cc, 8)}, /* Dell Wireless 5816e */ {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */
Greg Kroah-Hartman
maintainerPATCH 5/30 clk: ingenic-tcu: Properly enable registers before accessing timers
In reply to Greg Kroah-HartmanFrom: Aidan MacDonald <[email protected]>
commit 6726d552a6912e88cf63fe2bda87b2efa0efc7d0 upstream.
Access to registers is guarded by ingenic_tcu_{enable,disable}_regs() so the stop bit can be cleared before accessing a timer channel, but those functions did not clear the stop bit on SoCs with a global TCU clock gate.
Testing on the X1000 has revealed that the stop bits must be cleared _and_ the global TCU clock must be ungated to access timer registers. This appears to be the norm on Ingenic SoCs, and is specified in the documentation for the X1000 and numerous JZ47xx SoCs.
If the stop bit isn't cleared, register writes don't take effect and the system can be left in a broken state, eg. the watchdog timer may not run.
The bug probably went unnoticed because stop bits are zeroed when the SoC is reset, and the kernel does not set them unless a timer gets disabled at runtime. However, it is possible that a bootloader or a previous kernel (if using kexec) leaves the stop bits set and we should not rely on them being cleared.
Fixing this is easy: have ingenic_tcu_{enable,disable}_regs() always clear the stop bit, regardless of the presence of a global TCU gate.
--- drivers/clk/ingenic/tcu.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/clk/ingenic/tcu.c +5 -10
@@ -100,15 +100,11 @@ static bool ingenic_tcu_enable_regs(strubool enabled = false;/* -* If the SoC has no global TCU clock, we must ungate the channel's -* clock to be able to access its registers. -* If we have a TCU clock, it will be enabled automatically as it has -* been attached to the regmap. +* According to the programming manual, a timer channel's registers can +* only be accessed when the channel's stop bit is clear. */ -if (!tcu->clk) { - enabled = !!ingenic_tcu_is_enabled (hw); -regmap_write (tcu->map,TCU_REG_TSCR ,BIT (info->gate_bit)); - } + enabled = !!ingenic_tcu_is_enabled (hw); +regmap_write (tcu->map,TCU_REG_TSCR ,BIT (info->gate_bit));return enabled; }
@@ -119,8 +115,7 @@ static void ingenic_tcu_disable_regs(strconst struct ingenic_tcu_clk_info *info = tcu_clk->info;struct ingenic_tcu *tcu = tcu_clk->tcu; -if (!tcu->clk) -regmap_write (tcu->map,TCU_REG_TSSR ,BIT (info->gate_bit)); +regmap_write (tcu->map,TCU_REG_TSSR ,BIT (info->gate_bit)); }static u8 ingenic_tcu_get_parent (struct clk_hw *hw)
Greg Kroah-Hartman
maintainerPATCH 6/30 ARM: dts: integrator: Tag PCI host with device_type
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
commit 4952aa696a9f221c5e34e5961e02fca41ef67ad6 upstream.
The DT parser is dependent on the PCI device being tagged as device_type = "pci" in order to parse memory ranges properly. Fix this up.
--- arch/arm/boot/dts/integratorap.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/integratorap.dts +1 -0
@@ -155,6 +155,7 @@ pci: pciv3@62000000 { compatible = "arm,integrator-ap-pci", "v3,v360epc-pci"; + device_type = "pci"; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>;
Greg Kroah-Hartman
maintainerPATCH 7/30 ntfs: fix BUG_ON in ntfs_lookup_inode_by_name()
In reply to Greg Kroah-HartmanFrom: ChenXiaoSong <[email protected]>
commit 1b513f613731e2afc05550e8070d79fac80c661e upstream.
Syzkaller reported BUG_ON as follows:
------------[ cut here ]------------ kernel BUG at fs/ntfs/dir.c:86! invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI CPU: 3 PID: 758 Comm: a.out Not tainted 5.19.0-next-20220808 #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014 RIP: 0010:ntfs_lookup_inode_by_name+0xd11/0x2d10 Code: ff e9 b9 01 00 00 e8 1e fe d6 fe 48 8b 7d 98 49 8d 5d 07 e8 91 85 29 ff 48 c7 45 98 00 00 00 00 e9 5a fb ff ff e8 ff fd d6 fe <0f> 0b e8 f8 fd d6 fe 0f 0b e8 f1 fd d6 fe 48 8b b5 50 ff ff ff 4c RSP: 0018:ffff888079607978 EFLAGS: 00010293 RAX: 0000000000000000 RBX: 0000000000008000 RCX: 0000000000000000 RDX: ffff88807cf10000 RSI: ffffffff82a4a081 RDI: 0000000000000003 RBP: ffff888079607a70 R08: 0000000000000001 R09: ffff88807a6d01d7 R10: ffffed100f4da03a R11: 0000000000000000 R12: ffff88800f0fb110 R13: ffff88800f0ee000 R14: ffff88800f0fb000 R15: 0000000000000001 FS: 00007f33b63c7540(0000) GS:ffff888108580000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f33b635c090 CR3: 000000000f39e005 CR4: 0000000000770ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: <TASK> load_system_files+0x1f7f/0x3620 ntfs_fill_super+0xa01/0x1be0 mount_bdev+0x36a/0x440 ntfs_mount+0x3a/0x50 legacy_get_tree+0xfb/0x210 vfs_get_tree+0x8f/0x2f0 do_new_mount+0x30a/0x760 path_mount+0x4de/0x1880 __x64_sys_mount+0x2b3/0x340 do_syscall_64+0x38/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f33b62ff9ea Code: 48 8b 0d a9 f4 0b 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 49 89 ca b8 a5 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 76 f4 0b 00 f7 d8 64 89 01 48 RSP: 002b:00007ffd0c471aa8 EFLAGS: 00000202 ORIG_RAX: 00000000000000a5 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f33b62ff9ea RDX: 0000000020000000 RSI: 0000000020000100 RDI: 00007ffd0c471be0 RBP: 00007ffd0c471c60 R08: 00007ffd0c471ae0 R09: 00007ffd0c471c24 R10: 0000000000000000 R11: 0000000000000202 R12: 000055bac5afc160 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK> Modules linked in: ---[ end trace 0000000000000000 ]---
Fix this by adding sanity check on extended system files' directory inode to ensure that it is directory, just like ntfs_extend_init() when mounting ntfs3.
--- fs/ntfs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ntfs/super.c +2 -1
@@ -2092,7 +2092,8 @@ get_ctx_vol_failed:// TODO: Initialize security. /* Get the extended system files' directory inode. */ vol->extend_ino =ntfs_iget (sb, FILE_Extend); -if (IS_ERR (vol->extend_ino) ||is_bad_inode (vol->extend_ino)) { +if (IS_ERR (vol->extend_ino) ||is_bad_inode (vol->extend_ino) || + !S_ISDIR (vol->extend_ino->i_mode)) {if (!IS_ERR (vol->extend_ino))iput (vol->extend_ino);ntfs_error (sb,"Failed to load $Extend." );
Greg Kroah-Hartman
maintainerPATCH 8/30 Revert "net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()"
In reply to Greg Kroah-HartmanFrom: Sasha Levin <[email protected]>
commit 6052a4c11fd893234e085edf7bf2e00a33a79d4e upstream.
This reverts commit fe2c9c61f668cde28dac2b188028c5299cedcc1e.
Quoted 8 lines · Russell King (Oracle)
What happens if this is built as a module, and the module is loaded, binds (and creates the directory), then is removed, and then re- inserted? Nothing removes the old directory, so doesn't
debugfs_create_dir()fail, resulting in subsequent failure to add any subsequent debugfs entries?I don't think this patch should be backported to stable trees until this point is addressed.
Revert until a proper fix is available as the original behavior was better.
--- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c +2 -2
@@ -700,10 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *pvoid mvpp2_dbgfs_init (struct mvpp2 *priv,const char *name) { -static struct dentry *mvpp2_root; -struct dentry *mvpp2_dir; +struct dentry *mvpp2_dir, *mvpp2_root;int ret, i; + mvpp2_root =debugfs_lookup (MVPP2_DRIVER_NAME ,NULL );if (!mvpp2_root) mvpp2_root =debugfs_create_dir (MVPP2_DRIVER_NAME ,NULL );
Greg Kroah-Hartman
maintainerPATCH 9/30 libata: add ATA_HORKAGE_NOLPM for Pioneer BDR-207M and BDR-205
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
commit ea08aec7e77bfd6599489ec430f9f859ab84575a upstream.
Commit 1527f69204fe ("ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile") added an explicit entry for AMD Green Sardine AHCI controller using the board_ahci_mobile configuration (this configuration has later been renamed to board_ahci_low_power).
The board_ahci_low_power configuration enables support for low power modes.
This explicit entry takes precedence over the generic AHCI controller entry, which does not enable support for low power modes.
Therefore, when commit 1527f69204fe ("ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile") was backported to stable kernels, it make some Pioneer optical drives, which was working perfectly fine before the commit was backported, stop working.
The real problem is that the Pioneer optical drives do not handle low power modes correctly. If these optical drives would have been tested on another AHCI controller using the board_ahci_low_power configuration, this issue would have been detected earlier.
Unfortunately, the board_ahci_low_power configuration is only used in less than 15% of the total AHCI controller entries, so many devices have never been tested with an AHCI controller with low power modes.
--- drivers/ata/libata-core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/ata/libata-core.c +4 -0
@@ -4542,6 +4542,10 @@ static const struct ata_blacklist_entry { "PIONEER DVD-RW DVR-212D", NULL, ATA_HORKAGE_NOSETXFER }, { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER }, +/* These specific Pioneer models have LPM issues */ + { "PIONEER BD-RW BDR-207M", NULL, ATA_HORKAGE_NOLPM }, + { "PIONEER BD-RW BDR-205", NULL, ATA_HORKAGE_NOLPM }, +/* Crucial BX100 SSD 500GB has broken LPM support */ { "CT500BX100SSD1", NULL, ATA_HORKAGE_NOLPM },
Greg Kroah-Hartman
maintainerPATCH 10/30 mmc: moxart: fix 4-bit bus width and remove 8-bit bus width
In reply to Greg Kroah-HartmanFrom: Sergei Antonov <[email protected]>
commit 35ca91d1338ae158f6dcc0de5d1e86197924ffda upstream.
According to the datasheet [1] at page 377, 4-bit bus width is turned on by bit 2 of the Bus Width Register. Thus the current bitmask is wrong: define BUS_WIDTH_4 BIT(1)
BIT(1) does not work but BIT(2) works. This has been verified on real MOXA hardware with FTSDC010 controller revision 1_6_0.
The corrected value of BUS_WIDTH_4 mask collides with: define BUS_WIDTH_8 BIT(2). Additionally, 8-bit bus width mode isn't supported according to the datasheet, so let's remove the corresponding code.
[1]
https://bitbucket.org/Kasreyn/mkrom-uc7112lx/src/master/documents/FIC8120_DS_v1.2.pdf
--- drivers/mmc/host/moxart-mmc.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/mmc/host/moxart-mmc.c +3 -14
@@ -111,8 +111,8 @@#define CLK_DIV_MASK 0x7f/* REG_BUS_WIDTH */ -#define BUS_WIDTH_8 BIT(2) -#define BUS_WIDTH_4 BIT(1) +#define BUS_WIDTH_4_SUPPORT BIT(3) +#define BUS_WIDTH_4 BIT(2)#define BUS_WIDTH_1 BIT(0)#define MMC_VDD_360 23
@@ -527,9 +527,6 @@ static void moxart_set_ios(struct mmc_hocase MMC_BUS_WIDTH_4 :writel (BUS_WIDTH_4 , host->base +REG_BUS_WIDTH );break ; -case MMC_BUS_WIDTH_8 : -writel (BUS_WIDTH_8 , host->base +REG_BUS_WIDTH ); -break ;default :writel (BUS_WIDTH_1 , host->base +REG_BUS_WIDTH );break ;
@@ -646,16 +643,8 @@ static int moxart_probe(struct platform_dmaengine_slave_config (host->dma_chan_rx, &cfg); } -switch ((readl (host->base +REG_BUS_WIDTH ) >>3 ) &3 ) { -case 1 : +if (readl (host->base +REG_BUS_WIDTH ) &BUS_WIDTH_4_SUPPORT ) mmc->caps |=MMC_CAP_4_BIT_DATA ; -break ; -case 2 : - mmc->caps |=MMC_CAP_4_BIT_DATA |MMC_CAP_8_BIT_DATA ; -break ; -default : -break ; - }writel (0 , host->base +REG_INTERRUPT_MASK );
Greg Kroah-Hartman
maintainerPATCH 11/30 mm/page_alloc: fix race condition between build_all_zonelists and page allocation
In reply to Greg Kroah-HartmanFrom: Mel Gorman <[email protected]>
commit 3d36424b3b5850bd92f3e89b953a430d7cfc88ef upstream.
Patrick Daly reported the following problem;
NODE_DATA(nid)->node_zonelists[ZONELIST_FALLBACK] - before offline operation [0] - ZONE_MOVABLE [1] - ZONE_NORMAL [2] - NULL For a GFP_KERNEL allocation, alloc_pages_slowpath() will save the offset of ZONE_NORMAL in ac->preferred_zoneref. If a concurrent memory_offline operation removes the last page from ZONE_MOVABLE, build_all_zonelists() & build_zonerefs_node() will update node_zonelists as shown below. Only populated zones are added. NODE_DATA(nid)->node_zonelists[ZONELIST_FALLBACK] - after offline operation [0] - ZONE_NORMAL [1] - NULL [2] - NULL
The race is simple -- page allocation could be in progress when a memory hot-remove operation triggers a zonelist rebuild that removes zones. The allocation request will still have a valid ac->preferred_zoneref that is now pointing to NULL and triggers an OOM kill.
This problem probably always existed but may be slightly easier to trigger due to 6aa303defb74 ("mm, vmscan: only allocate and reclaim from zones with pages managed by the buddy allocator") which distinguishes between zones that are completely unpopulated versus zones that have valid pages not managed by the buddy allocator (e.g. reserved, memblock, ballooning etc). Memory hotplug had multiple stages with timing considerations around managed/present page updates, the zonelist rebuild and the zone span updates. As David Hildenbrand puts it
memory offlining adjusts managed+present pages of the zone essentially in one go. If after the adjustments, the zone is no longer populated (present==0), we rebuild the zone lists.
Once that's done, we try shrinking the zone (start+spanned pages) -- which results in zone_start_pfn == 0 if there are no more pages. That happens *after* rebuilding the zonelists via remove_pfn_range_from_zone().
The only requirement to fix the race is that a page allocation request identifies when a zonelist rebuild has happened since the allocation request started and no page has yet been allocated. Use a seqlock_t to track zonelist updates with a lockless read-side of the zonelist and protecting the rebuild and update of the counter with a spinlock.
--- mm/page_alloc.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-)
mm/page_alloc.c +43 -10
@@ -4123,6 +4123,30 @@ void fs_reclaim_release(gfp_t gfp_mask)EXPORT_SYMBOL_GPL (fs_reclaim_release);#endif +/* +* Zonelists may change due to hotplug during allocation. Detect when zonelists +* have been rebuilt so allocation retries. Reader side does not lock and +* retries the allocation if zonelist changes. Writer side is protected by the +* embedded spin_lock. +*/ +static DEFINE_SEQLOCK (zonelist_update_seq); + +static unsigned int zonelist_iter_begin (void ) +{ +if (IS_ENABLED (CONFIG_MEMORY_HOTREMOVE )) +return read_seqbegin (&zonelist_update_seq); + +return 0 ; +} + +static unsigned int check_retry_zonelist (unsigned int seq) +{ +if (IS_ENABLED (CONFIG_MEMORY_HOTREMOVE )) +return read_seqretry (&zonelist_update_seq, seq); + +return seq; +} +/* Perform direct synchronous page reclaim */ static int __perform_reclaim(gfp_t gfp_mask, unsigned int order,
@@ -4430,6 +4454,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, uint compaction_retries;int no_progress_loops;unsigned int cpuset_mems_cookie; +unsigned int zonelist_iter_cookie;int reserve_flags;/*
@@ -4440,11 +4465,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, u (__GFP_ATOMIC|__GFP_DIRECT_RECLAIM))) gfp_mask &= ~__GFP_ATOMIC; -retry_cpuset: +restart: compaction_retries =0 ; no_progress_loops =0 ; compact_priority =DEF_COMPACT_PRIORITY ; cpuset_mems_cookie =read_mems_allowed_begin (); + zonelist_iter_cookie =zonelist_iter_begin ();/* * The fast path uses conservative alloc_flags to succeed only until
@@ -4617,9 +4643,13 @@ retry: goto retry; -/* Deal with possible cpuset update races before we start OOM killing */ -if (check_retry_cpuset (cpuset_mems_cookie, ac)) - goto retry_cpuset; +/* +* Deal with possible cpuset update races or zonelist updates to avoid +* a unnecessary OOM kill. +*/ +if (check_retry_cpuset (cpuset_mems_cookie, ac) || +check_retry_zonelist (zonelist_iter_cookie)) + goto restart;/* Reclaim has failed us, start killing things */ page =__alloc_pages_may_oom (gfp_mask, order, ac, &did_some_progress);
@@ -4639,9 +4669,13 @@ retry: } nopage: -/* Deal with possible cpuset update races before we fail */ -if (check_retry_cpuset (cpuset_mems_cookie, ac)) - goto retry_cpuset; +/* +* Deal with possible cpuset update races or zonelist updates to avoid +* a unnecessary OOM kill. +*/ +if (check_retry_cpuset (cpuset_mems_cookie, ac) || +check_retry_zonelist (zonelist_iter_cookie)) + goto restart;/* * Make sure that __GFP_NOFAIL request doesn't leak out and make sure
@@ -5770,9 +5804,8 @@ static void __build_all_zonelists(void *int nid;int __maybe_unused cpu;pg_data_t *self = data; -static DEFINE_SPINLOCK (lock); -spin_lock (&lock); +write_seqlock (&zonelist_update_seq);#ifdef CONFIG_NUMA memset (node_load,0 ,sizeof (node_load));
@@ -5805,7 +5838,7 @@ static void __build_all_zonelists(void *#endif } -spin_unlock (&lock); +write_sequnlock (&zonelist_update_seq); }static noinline void__init
Greg Kroah-Hartman
maintainerPATCH 12/30 mm: prevent page_frag_alloc() from corrupting the memory
In reply to Greg Kroah-HartmanFrom: Maurizio Lombardi <[email protected]>
commit dac22531bbd4af2426c4e29e05594415ccfa365d upstream.
A number of drivers call page_frag_alloc() with a fragment's size > PAGE_SIZE.
In low memory conditions, __page_frag_cache_refill() may fail the order 3 cache allocation and fall back to order 0; In this case, the cache will be smaller than the fragment, causing memory corruptions.
Prevent this from happening by checking if the newly allocated cache is large enough for the fragment; if not, the allocation will fail and page_frag_alloc() will return NULL.
--- mm/page_alloc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
mm/page_alloc.c +12 -0
@@ -4979,6 +4979,18 @@ refill:/* reset page count bias and offset to start of new frag */ nc->pagecnt_bias =PAGE_FRAG_CACHE_MAX_SIZE +1 ; offset = size - fragsz; +if (unlikely (offset <0 )) { +/* +* The caller is trying to allocate a fragment +* with fragsz > PAGE_SIZE but the cache isn't big +* enough to satisfy the request, this may +* happen in low memory conditions. +* We don't release the cache page because +* it could make memory pressure worse +* so we simply return NULL here. +*/ +return NULL ; + } } nc->pagecnt_bias--;
Greg Kroah-Hartman
maintainerPATCH 13/30 mm/migrate_device.c: flush TLB while holding PTL
In reply to Greg Kroah-HartmanFrom: Alistair Popple <[email protected]>
commit 60bae73708963de4a17231077285bd9ff2f41c44 upstream.
When clearing a PTE the TLB should be flushed whilst still holding the PTL to avoid a potential race with madvise/munmap/etc. For example consider the following sequence:
CPU0 CPU1
---- ----
migrate_vma_collect_pmd()
pte_unmap_unlock()
madvise(MADV_DONTNEED)
-> zap_pte_range() pte_offset_map_lock()
[ PTE not present, TLB not flushed ] pte_unmap_unlock()
[ page is still accessible via stale TLB ]
flush_tlb_range()
In this case the page may still be accessed via the stale TLB entry after madvise returns. Fix this by flushing the TLB while holding the PTL.
--- mm/migrate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/migrate.c +3 -2
@@ -2343,13 +2343,14 @@ next: migrate->dst[migrate->npages] =0 ; migrate->src[migrate->npages++] = mpfn; } -arch_leave_lazy_mmu_mode (); -pte_unmap_unlock (ptep -1 , ptl);/* Only flush the TLB if we actually modified any entries */ if (unmapped)flush_tlb_range (walk->vma, start, end); +arch_leave_lazy_mmu_mode (); +pte_unmap_unlock (ptep -1 , ptl); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 14/30 mm: fix madivse_pageout mishandling on non-LRU page
In reply to Greg Kroah-HartmanFrom: Minchan Kim <[email protected]>
commit 58d426a7ba92870d489686dfdb9d06b66815a2ab upstream.
MADV_PAGEOUT tries to isolate non-LRU pages and gets a warning from isolate_lru_page below.
Fix it by checking PageLRU in advance.
------------[ cut here ]------------ trying to isolate tail page WARNING: CPU: 0 PID: 6175 at mm/folio-compat.c:158 isolate_lru_page+0x130/0x140 Modules linked in: CPU: 0 PID: 6175 Comm: syz-executor.0 Not tainted 5.18.12 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:isolate_lru_page+0x130/0x140
--- mm/madvise.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
mm/madvise.c +5 -2
@@ -428,8 +428,11 @@ regular_page:continue ; } -/* Do not interfere with other mappings of this page */ -if (page_mapcount (page) !=1 ) +/* +* Do not interfere with other mappings of this page and +* non-LRU page. +*/ +if (!PageLRU (page) ||page_mapcount (page) !=1 )continue ;VM_BUG_ON_PAGE (PageTransCompound (page), page);
Greg Kroah-Hartman
maintainerPATCH 15/30 media: dvb_vb2: fix possible out of bound access
In reply to Greg Kroah-HartmanFrom: Hangyu Hua <[email protected]>
commit 37238699073e7e93f05517e529661151173cd458 upstream.
vb2_core_qbuf and vb2_core_querybuf don't check the range of b->index controlled by the user.
Fix this by adding range checking code before using them.
--- drivers/media/dvb-core/dvb_vb2.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/media/dvb-core/dvb_vb2.c +11 -0
@@ -358,6 +358,12 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *int dvb_vb2_querybuf (struct dvb_vb2_ctx *ctx,struct dmx_buffer *b) { +struct vb2_queue *q = &ctx->vb_q; + +if (b->index >= q->num_buffers) { +dprintk (1 ,"[%s] buffer index out of range\n" , ctx->name); +return -EINVAL ; + }vb2_core_querybuf (&ctx->vb_q, b->index, b);dprintk (3 ,"[%s] index=%d\n" , ctx->name, b->index);return 0 ;
@@ -382,8 +388,13 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *cint dvb_vb2_qbuf (struct dvb_vb2_ctx *ctx,struct dmx_buffer *b) { +struct vb2_queue *q = &ctx->vb_q;int ret; +if (b->index >= q->num_buffers) { +dprintk (1 ,"[%s] buffer index out of range\n" , ctx->name); +return -EINVAL ; + } ret =vb2_core_qbuf (&ctx->vb_q, b->index, b,NULL );if (ret) { dprintk(1, "[%s] index=%d errno=%d\n", ctx->name,
Greg Kroah-Hartman
maintainerPATCH 16/30 ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver
In reply to Greg Kroah-HartmanFrom: Faiz Abbas <[email protected]>
[ Upstream commit 0b4edf111870b83ea77b1d7e16b8ceac29f9f388 ]
Move mmc nodes to be compatible with the sdhci-omap driver. The following modifications are required for omap_hsmmc specific properties:
ti,non-removable: convert to the generic mmc non-removable ti,needs-special-reset: co-opted into the sdhci-omap driver ti,dual-volt: removed. Legacy property not used in am335x or am43xx ti,needs-special-hs-handling: removed. Legacy property not used in am335x or am43xx
Also since the sdhci-omap driver does not support runtime PM, explicitly disable the mmc3 instance in the dtsi.
Stable-dep-of: 2eb502f496f7 ("ARM: dts: am33xx: Fix MMCHS0 dma properties")
--- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - arch/arm/boot/dts/am335x-boneblue.dts | 1 - arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - arch/arm/boot/dts/am335x-evm.dts | 3 +-- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-lxm.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 4 ++-- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 6 ++---- arch/arm/boot/dts/am33xx.dtsi | 3 ++- arch/arm/boot/dts/am4372.dtsi | 3 ++- arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++-- arch/arm/boot/dts/am437x-l4.dtsi | 5 ++--- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- 19 files changed, 22 insertions(+), 26 deletions(-)
arch/arm/boot/dts/am335x-baltos.dtsi +1 -1
@@ -381,7 +381,7 @@ &mmc2 { status = "okay"; vmmc-supply = <&wl12xx_vmmc>; - ti,non-removable; + non-removable; bus-width = <4>; cap-power-off-card; pinctrl-names = "default";
arch/arm/boot/dts/am335x-boneblack-common.dtsi +1 -0
@@ -22,6 +22,7 @@ pinctrl-0 = <&emmc_pins>; bus-width = <8>; status = "okay"; + non-removable; }; &am33xx_pinmux {
arch/arm/boot/dts/am335x-boneblack-wireless.dts +0 -1
@@ -75,7 +75,6 @@ bus-width = <4>; non-removable; cap-power-off-card; - ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
arch/arm/boot/dts/am335x-boneblue.dts +0 -1
@@ -389,7 +389,6 @@ bus-width = <4>; non-removable; cap-power-off-card; - ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
arch/arm/boot/dts/am335x-bonegreen-wireless.dts +0 -1
@@ -75,7 +75,6 @@ bus-width = <4>; non-removable; cap-power-off-card; - ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
arch/arm/boot/dts/am335x-evm.dts +1 -2
@@ -782,8 +782,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wlan_pins>; - ti,non-removable; - ti,needs-special-hs-handling; + non-removable; cap-power-off-card; keep-power-in-suspend;
arch/arm/boot/dts/am335x-evmsk.dts +1 -1
@@ -700,7 +700,7 @@ &mmc2 { status = "okay"; vmmc-supply = <&wl12xx_vmmc>; - ti,non-removable; + non-removable; bus-width = <4>; cap-power-off-card; keep-power-in-suspend;
arch/arm/boot/dts/am335x-lxm.dts +1 -1
@@ -361,7 +361,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; - ti,non-removable; + non-removable; status = "okay"; };
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +1 -1
@@ -176,7 +176,7 @@ vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; pinctrl-0 = <&mmc1_pins_default>; - ti,non-removable; + non-removable; status = "okay"; };
arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts +1 -1
@@ -473,7 +473,7 @@ vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; pinctrl-0 = <&mmc2_pins_default>; - ti,non-removable; + non-removable; status = "okay"; };
arch/arm/boot/dts/am335x-pepper.dts +2 -2
@@ -341,7 +341,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&ldo3_reg>; bus-width = <8>; - ti,non-removable; + non-removable; }; &mmc3 {
@@ -351,7 +351,7 @@ pinctrl-0 = <&wireless_pins>; vmmmc-supply = <&v3v3c_reg>; bus-width = <4>; - ti,non-removable; + non-removable; dmas = <&edma_xbar 12 0 1 &edma_xbar 13 0 2>; dma-names = "tx", "rx";
arch/arm/boot/dts/am335x-phycore-som.dtsi +1 -1
@@ -69,7 +69,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmc_reg>; bus-width = <8>; - ti,non-removable; + non-removable; status = "disabled"; };
arch/arm/boot/dts/am33xx-l4.dtsi +2 -4
@@ -1333,10 +1333,8 @@ ranges = <0x0 0x60000 0x1000>; mmc1: mmc@0 { - compatible = "ti,omap4-hsmmc"; - ti,dual-volt; + compatible = "ti,am335-sdhci"; ti,needs-special-reset; - ti,needs-special-hs-handling; dmas = <&edma_xbar 24 0 0 &edma_xbar 25 0 0>; dma-names = "tx", "rx";
@@ -1827,7 +1825,7 @@ ranges = <0x0 0xd8000 0x1000>; mmc2: mmc@0 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,am335-sdhci"; ti,needs-special-reset; dmas = <&edma 2 0 &edma 3 0>;
arch/arm/boot/dts/am33xx.dtsi +2 -1
@@ -259,10 +259,11 @@ ranges = <0x0 0x47810000 0x1000>; mmc3: mmc@0 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,am335-sdhci"; ti,needs-special-reset; interrupts = <29>; reg = <0x0 0x1000>; + status = "disabled"; }; };
arch/arm/boot/dts/am4372.dtsi +2 -1
@@ -250,10 +250,11 @@ ranges = <0x0 0x47810000 0x1000>; mmc3: mmc@0 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,am437-sdhci"; ti,needs-special-reset; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; reg = <0x0 0x1000>; + status = "disabled"; }; };
arch/arm/boot/dts/am437x-cm-t43.dts +1 -1
@@ -291,7 +291,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmc_3v3>; bus-width = <8>; - ti,non-removable; + non-removable; }; &spi0 {
arch/arm/boot/dts/am437x-gp-evm.dts +2 -2
@@ -872,7 +872,7 @@ pinctrl-names = "default", "sleep"; pinctrl-0 = <&emmc_pins_default>; pinctrl-1 = <&emmc_pins_sleep>; - ti,non-removable; + non-removable; }; &mmc3 {
@@ -889,7 +889,7 @@ pinctrl-1 = <&mmc3_pins_sleep>; cap-power-off-card; keep-power-in-suspend; - ti,non-removable; + non-removable; #address-cells = <1>; #size-cells = <0>;
arch/arm/boot/dts/am437x-l4.dtsi +2 -3
@@ -1104,9 +1104,8 @@ ranges = <0x0 0x60000 0x1000>; mmc1: mmc@0 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,am437-sdhci"; reg = <0x0 0x1000>; - ti,dual-volt; ti,needs-special-reset; dmas = <&edma 24 0>, <&edma 25 0>;
@@ -1641,7 +1640,7 @@ ranges = <0x0 0xd8000 0x1000>; mmc2: mmc@0 { - compatible = "ti,omap4-hsmmc"; + compatible = "ti,am437-sdhci"; reg = <0x0 0x1000>; ti,needs-special-reset; dmas = <&edma 2 0>,
arch/arm/boot/dts/am437x-sk-evm.dts +1 -1
@@ -694,7 +694,7 @@ pinctrl-1 = <&mmc3_pins_sleep>; cap-power-off-card; keep-power-in-suspend; - ti,non-removable; + non-removable; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 17/30 ARM: dts: am33xx: Fix MMCHS0 dma properties
In reply to Greg Kroah-HartmanFrom: YuTong Chang <[email protected]>
[ Upstream commit 2eb502f496f7764027b7958d4e74356fed918059 ]
According to technical manual(table 11-24), the DMA of MMCHS0 should be direct mapped.
Message-Id: <[email protected]>
--- arch/arm/boot/dts/am33xx-l4.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/am33xx-l4.dtsi +1 -2
@@ -1335,8 +1335,7 @@ mmc1: mmc@0 { compatible = "ti,am335-sdhci"; ti,needs-special-reset; - dmas = <&edma_xbar 24 0 0 - &edma_xbar 25 0 0>; + dmas = <&edma 24 0>, <&edma 25 0>; dma-names = "tx", "rx"; interrupts = <64>; reg = <0x0 0x1000>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 18/30 soc: sunxi: sram: Actually claim SRAM regions
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit fd362baad2e659ef0fb5652f023a606b248f1781 ]
sunxi_sram_claim() checks the sram_desc->claimed flag before updating the register, with the intent that only one device can claim a region. However, this was ineffective because the flag was never set.
--- drivers/soc/sunxi/sunxi_sram.c | 1 + 1 file changed, 1 insertion(+)
drivers/soc/sunxi/sunxi_sram.c +1 -0
@@ -254,6 +254,7 @@ int sunxi_sram_claim(struct device *dev)writel (val | ((device << sram_data->offset) & mask), base + sram_data->reg); + sram_desc->claimed = true;spin_unlock (&sram_lock);return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 19/30 soc: sunxi: sram: Prevent the driver from being unbound
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 90e10a1fcd9b24b4ba8c0d35136127473dcd829e ]
This driver exports a regmap tied to the platform device (as opposed to a syscon, which exports a regmap tied to the OF node). Because of this, the driver can never be unbound, as that would destroy the regmap. Use builtin_platform_driver_probe() to enforce this limitation.
--- drivers/soc/sunxi/sunxi_sram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/soc/sunxi/sunxi_sram.c +2 -3
@@ -319,7 +319,7 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = { .writeable_reg = sunxi_sram_regmap_accessible_reg, }; -static int sunxi_sram_probe (struct platform_device *pdev) +static int __init sunxi_sram_probe (struct platform_device *pdev) {struct resource *res;struct dentry *d;
@@ -397,9 +397,8 @@ static struct platform_driver sunxi_sram_driver = { .name = "sunxi-sram", .of_match_table = sunxi_sram_dt_match, }, - .probe = sunxi_sram_probe, }; -module_platform_driver (sunxi_sram_driver); +builtin_platform_driver_probe (sunxi_sram_driver, sunxi_sram_probe);MODULE_AUTHOR ("Maxime Ripard <[email protected]>" );MODULE_DESCRIPTION ("Allwinner sunXi SRAM Controller Driver" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 20/30 soc: sunxi_sram: Make use of the helper function devm_platform_ioremap_resource()
In reply to Greg Kroah-HartmanFrom: Cai Huoqing <[email protected]>
[ Upstream commit 1f3753a5f042fea6539986f9caf2552877527d8a ]
Use the devm_platform_ioremap_resource() helper instead of calling platform_get_resource() and devm_ioremap_resource() separately
Stable-dep-of: 49fad91a7b89 ("soc: sunxi: sram: Fix probe function ordering issues")
--- drivers/soc/sunxi/sunxi_sram.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/soc/sunxi/sunxi_sram.c +1 -3
@@ -321,7 +321,6 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = {static int __init sunxi_sram_probe (struct platform_device *pdev) { -struct resource *res;struct dentry *d;struct regmap *emac_clock;const struct sunxi_sramc_variant *variant;
@@ -332,8 +331,7 @@ static int __init sunxi_sram_probe(struct platform_device *pdev)if (!variant)return -EINVAL ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base =devm_ioremap_resource (&pdev->dev, res); + base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (base))return PTR_ERR (base);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 21/30 soc: sunxi: sram: Fix probe function ordering issues
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit 49fad91a7b8941979c3e9a35f9894ac45bc5d3d6 ]
Errors from debugfs are intended to be non-fatal, and should not prevent the driver from probing.
Since debugfs file creation is treated as infallible, move it below the parts of the probe function that can fail. This prevents an error elsewhere in the probe function from causing the file to leak. Do the same for the call to of_platform_populate().
Finally, checkpatch suggests an octal literal for the file permissions.
--- drivers/soc/sunxi/sunxi_sram.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/soc/sunxi/sunxi_sram.c +5 -8
@@ -321,9 +321,9 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = {static int __init sunxi_sram_probe (struct platform_device *pdev) { -struct dentry *d;struct regmap *emac_clock;const struct sunxi_sramc_variant *variant; +struct device *dev = &pdev->dev; sram_dev = &pdev->dev;
@@ -335,13 +335,6 @@ static int __init sunxi_sram_probe(struct platform_device *pdev)if (IS_ERR (base))return PTR_ERR (base); -of_platform_populate (pdev->dev.of_node,NULL ,NULL , &pdev->dev); - - d =debugfs_create_file ("sram" ,S_IRUGO ,NULL ,NULL , - &sunxi_sram_fops); -if (!d) -return -ENOMEM ; -if (variant->has_emac_clock) { emac_clock =devm_regmap_init_mmio (&pdev->dev, base, &sunxi_sram_emac_clock_regmap);
@@ -350,6 +343,10 @@ static int __init sunxi_sram_probe(struct platform_device *pdev)return PTR_ERR (emac_clock); } +of_platform_populate (dev->of_node,NULL ,NULL , dev); + +debugfs_create_file ("sram" ,0444 ,NULL ,NULL , &sunxi_sram_fops); +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 22/30 soc: sunxi: sram: Fix debugfs info for A64 SRAM C
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit e3c95edb1bd8b9c2cb0caa6ae382fc8080f6a0ed ]
The labels were backward with respect to the register values. The SRAM is mapped to the CPU when the register value is 1.
--- drivers/soc/sunxi/sunxi_sram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/sunxi/sunxi_sram.c +2 -2
@@ -78,8 +78,8 @@ static struct sunxi_sram_desc sun4i_a10_sram_d = {static struct sunxi_sram_desc sun50i_a64_sram_c = { .data =SUNXI_SRAM_DATA ("C" ,0x4 ,24 ,1 , -SUNXI_SRAM_MAP (0 ,1 ,"cpu" ), -SUNXI_SRAM_MAP (1 ,0 ,"de2" )), +SUNXI_SRAM_MAP (1 ,0 ,"cpu" ), +SUNXI_SRAM_MAP (0 ,1 ,"de2" )), };static const struct of_device_id sunxi_sram_dt_ids[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 23/30 Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"
In reply to Greg Kroah-HartmanFrom: Brian Norris <[email protected]>
[ Upstream commit cc62d98bd56d45de4531844ca23913a15136c05b ]
This reverts commit 211f276ed3d96e964d2d1106a198c7f4a4b3f4c0.
For quite some time, core DRM helpers already ensure that any relevant connectors/CRTCs/etc. are disabled, as well as their associated components (e.g., bridges) when suspending the system. Thus, analogix_dp_bridge_{enable,disable}() already get called, which in turn call drm_panel_{prepare,unprepare}(). This makes these drm_panel_*() calls redundant.
Besides redundancy, there are a few problems with this handling:
(1) drm_panel_{prepare,unprepare}() are *not* reference-counted APIs and are not in general designed to be handled by multiple callers -- although some panel drivers have a coarse 'prepared' flag that mitigates some damage, at least. So at a minimum this is redundant and confusing, but in some cases, this could be actively harmful.
(2) The error-handling is a bit non-standard. We ignored errors in suspend(), but handled errors in resume(). And recently, people noticed that the clk handling is unbalanced in error paths, and getting *that* right is not actually trivial, given the current way errors are mostly ignored.
(3) In the particular way analogix_dp_{suspend,resume}() get used (e.g., in rockchip_dp_*(), as a late/early callback), we don't necessarily have a proper PM relationship between the DP/bridge device and the panel device. So while the DP bridge gets resumed, the panel's parent device (e.g., platform_device) may still be suspended, and so any prepare() calls may fail.
So remove the superfluous, possibly-harmful suspend()/resume() handling of panel state.
--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +0 -13
@@ -1823,12 +1823,6 @@ EXPORT_SYMBOL_GPL(analogix_dp_remove);int analogix_dp_suspend (struct analogix_dp_device *dp) {clk_disable_unprepare (dp->clock); - -if (dp->plat_data->panel) { -if (drm_panel_unprepare (dp->plat_data->panel)) -DRM_ERROR ("failed to turnoff the panel\n" ); - } -return 0 ; }EXPORT_SYMBOL_GPL (analogix_dp_suspend);
@@ -1843,13 +1837,6 @@ int analogix_dp_resume(struct analogix_dp_device *dp)return ret; } -if (dp->plat_data->panel) { -if (drm_panel_prepare (dp->plat_data->panel)) { -DRM_ERROR ("failed to setup the panel\n" ); -return -EBUSY ; - } - } -return 0 ; }EXPORT_SYMBOL_GPL (analogix_dp_resume);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 24/30 Input: melfas_mip4 - fix return value check in mip4_probe()
In reply to Greg Kroah-HartmanFrom: Yang Yingliang <[email protected]>
[ Upstream commit a54dc27bd25f20ee3ea2009584b3166d25178243 ]
devm_gpiod_get_optional() may return ERR_PTR(-EPROBE_DEFER), add a minus sign to fix it.
--- drivers/input/touchscreen/melfas_mip4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/touchscreen/melfas_mip4.c +1 -1
@@ -1453,7 +1453,7 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) "ce", GPIOD_OUT_LOW);if (IS_ERR (ts->gpio_ce)) { error =PTR_ERR (ts->gpio_ce); -if (error !=EPROBE_DEFER ) +if (error != -EPROBE_DEFER )dev_err (&client->dev,"Failed to get gpio: %d\n" , error);return error;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 25/30 usbnet: Fix memory leak in usbnet_disconnect()
In reply to Greg Kroah-HartmanFrom: Peilin Ye <[email protected]>
[ Upstream commit a43206156263fbaf1f2b7f96257441f331e91bb7 ]
Currently usbnet_disconnect() unanchors and frees all deferred URBs using usb_scuttle_anchored_urbs(), which does not free urb->context, causing a memory leak as reported by syzbot.
Use a usb_get_from_anchor() while loop instead, similar to what we did in commit 19cfe912c37b ("Bluetooth: btusb: Fix memory leak in play_deferred"). Also free urb->sg.
--- drivers/net/usb/usbnet.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/usb/usbnet.c +6 -1
@@ -1585,6 +1585,7 @@ void usbnet_disconnect (struct usb_interface *intf)struct usbnet *dev;struct usb_device *xdev;struct net_device *net; +struct urb *urb; dev =usb_get_intfdata (intf);usb_set_intfdata (intf,NULL );
@@ -1601,7 +1602,11 @@ void usbnet_disconnect (struct usb_interface *intf) net = dev->net;unregister_netdev (net); -usb_scuttle_anchored_urbs (&dev->deferred); +while ((urb =usb_get_from_anchor (&dev->deferred))) { +dev_kfree_skb (urb->context); +kfree (urb->sg); +usb_free_urb (urb); + }if (dev->driver_info->unbind) dev->driver_info->unbind (dev, intf);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 26/30 nvme: add new line after variable declatation
In reply to Greg Kroah-HartmanFrom: Chaitanya Kulkarni <[email protected]>
[ Upstream commit f1c772d581843e3a14bbd62ef7e40b56fc307f27 ]
Add a new line in functions nvme_pr_preempt(), nvme_pr_clear(), and nvme_pr_release() after variable declaration which follows the rest of the code in the nvme/host/core.c.
No functional change(s) in this patch.
Stable-dep-of: c292a337d0e4 ("nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices")
--- drivers/nvme/host/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/nvme/host/core.c +3 -0
@@ -2018,18 +2018,21 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new, enum pr_type type, bool abort) {u32 cdw10 =nvme_pr_type (type) <<8 | (abort ?2 :1 ); +return nvme_pr_command (bdev, cdw10, old, new, nvme_cmd_resv_acquire); }static int nvme_pr_clear (struct block_device *bdev,u64 key) {u32 cdw10 =1 | (key ?1 <<3 :0 ); +return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_register); }static int nvme_pr_release (struct block_device *bdev,u64 key,enum pr_type type) {u32 cdw10 =nvme_pr_type (type) <<8 | (key ?1 <<3 :0 ); +return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_release); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 27/30 nvme: Fix IOC_PR_CLEAR and IOC_PR_RELEASE ioctls for nvme devices
In reply to Greg Kroah-HartmanFrom: Michael Kelley <[email protected]>
[ Upstream commit c292a337d0e45a292c301e3cd51c35aa0ae91e95 ]
The IOC_PR_CLEAR and IOC_PR_RELEASE ioctls are non-functional on NVMe devices because the nvme_pr_clear() and nvme_pr_release() functions set the IEKEY field incorrectly. The IEKEY field should be set only when the key is zero (i.e, not specified). The current code does it backwards.
Furthermore, the NVMe spec describes the persistent reservation "clear" function as an option on the reservation release command. The current implementation of nvme_pr_clear() erroneously uses the reservation register command.
Fix these errors. Note that NVMe version 1.3 and later specify that setting the IEKEY field will return an error of Invalid Field in Command. The fix will set IEKEY when the key is zero, which is appropriate as these ioctls consider a zero key to be "unspecified", and the intention of the spec change is to require a valid key.
Tested on a version 1.4 PCI NVMe device in an Azure VM.
--- drivers/nvme/host/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvme/host/core.c +3 -3
@@ -2024,14 +2024,14 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,static int nvme_pr_clear (struct block_device *bdev,u64 key) { -u32 cdw10 =1 | (key ?1 <<3 :0 ); +u32 cdw10 =1 | (key ?0 :1 <<3 ); -return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_register); +return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_release); }static int nvme_pr_release (struct block_device *bdev,u64 key,enum pr_type type) { -u32 cdw10 =nvme_pr_type (type) <<8 | (key ?1 <<3 :0 ); +u32 cdw10 =nvme_pr_type (type) <<8 | (key ?0 :1 <<3 );return nvme_pr_command (bdev, cdw10, key,0 , nvme_cmd_resv_release); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 28/30 selftests: Fix the if conditions of in test_extra_filter()
In reply to Greg Kroah-HartmanFrom: Wang Yufen <[email protected]>
[ Upstream commit bc7a319844891746135dc1f34ab9df78d636a3ac ]
The socket 2 bind the addr in use, bind should fail with EADDRINUSE. So if bind success or errno != EADDRINUSE, testcase should be failed.
--- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/reuseport_bpf.c +1 -1
@@ -330,7 +330,7 @@ static void test_extra_filter(const struct test_params p)if (bind (fd1, addr,sockaddr_size ()))error (1 , errno,"failed to bind recv socket 1" ); -if (!bind (fd2, addr,sockaddr_size ()) && errno !=EADDRINUSE ) +if (!bind (fd2, addr,sockaddr_size ()) || errno !=EADDRINUSE )error (1 , errno,"bind socket 2 should fail with EADDRINUSE" );free (addr);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 29/30 clk: imx: imx6sx: remove the SET_RATE_PARENT flag for QSPI clocks
In reply to Greg Kroah-HartmanFrom: Han Xu <[email protected]>
[ Upstream commit b1ff1bfe81e763420afd5f3f25f0b3cbfd97055c ]
There is no dedicate parent clock for QSPI so SET_RATE_PARENT flag should not be used. For instance, the default parent clock for QSPI is pll2_bus, which is also the parent clock for quite a few modules, such as MMDC, once GPMI NAND set clock rate for EDO5 mode can cause system hang due to pll2_bus rate changed.
--- drivers/clk/imx/clk-imx6sx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-imx6sx.c +2 -2
@@ -287,13 +287,13 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) hws[IMX6SX_CLK_SSI3_SEL ] =imx_clk_hw_mux ("ssi3_sel" , base +0x1c ,14 ,2 , ssi_sels,ARRAY_SIZE (ssi_sels)); hws[IMX6SX_CLK_SSI2_SEL ] =imx_clk_hw_mux ("ssi2_sel" , base +0x1c ,12 ,2 , ssi_sels,ARRAY_SIZE (ssi_sels)); hws[IMX6SX_CLK_SSI1_SEL ] =imx_clk_hw_mux ("ssi1_sel" , base +0x1c ,10 ,2 , ssi_sels,ARRAY_SIZE (ssi_sels)); - hws[IMX6SX_CLK_QSPI1_SEL ] =imx_clk_hw_mux_flags ("qspi1_sel" , base +0x1c ,7 ,3 , qspi1_sels,ARRAY_SIZE (qspi1_sels),CLK_SET_RATE_PARENT ); + hws[IMX6SX_CLK_QSPI1_SEL ] =imx_clk_hw_mux ("qspi1_sel" , base +0x1c ,7 ,3 , qspi1_sels,ARRAY_SIZE (qspi1_sels)); hws[IMX6SX_CLK_PERCLK_SEL ] =imx_clk_hw_mux ("perclk_sel" , base +0x1c ,6 ,1 , perclk_sels,ARRAY_SIZE (perclk_sels)); hws[IMX6SX_CLK_VID_SEL ] =imx_clk_hw_mux ("vid_sel" , base +0x20 ,21 ,3 , vid_sels,ARRAY_SIZE (vid_sels)); hws[IMX6SX_CLK_ESAI_SEL ] =imx_clk_hw_mux ("esai_sel" , base +0x20 ,19 ,2 , audio_sels,ARRAY_SIZE (audio_sels)); hws[IMX6SX_CLK_CAN_SEL ] =imx_clk_hw_mux ("can_sel" , base +0x20 ,8 ,2 , can_sels,ARRAY_SIZE (can_sels)); hws[IMX6SX_CLK_UART_SEL ] =imx_clk_hw_mux ("uart_sel" , base +0x24 ,6 ,1 , uart_sels,ARRAY_SIZE (uart_sels)); - hws[IMX6SX_CLK_QSPI2_SEL ] =imx_clk_hw_mux_flags ("qspi2_sel" , base +0x2c ,15 ,3 , qspi2_sels,ARRAY_SIZE (qspi2_sels),CLK_SET_RATE_PARENT ); + hws[IMX6SX_CLK_QSPI2_SEL ] =imx_clk_hw_mux ("qspi2_sel" , base +0x2c ,15 ,3 , qspi2_sels,ARRAY_SIZE (qspi2_sels)); hws[IMX6SX_CLK_SPDIF_SEL ] =imx_clk_hw_mux ("spdif_sel" , base +0x30 ,20 ,2 , audio_sels,ARRAY_SIZE (audio_sels)); hws[IMX6SX_CLK_AUDIO_SEL ] =imx_clk_hw_mux ("audio_sel" , base +0x30 ,7 ,2 , audio_sels,ARRAY_SIZE (audio_sels)); hws[IMX6SX_CLK_ENET_PRE_SEL ] =imx_clk_hw_mux ("enet_pre_sel" , base +0x34 ,15 ,3 , enet_pre_sels,ARRAY_SIZE (enet_pre_sels));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 30/30 clk: iproc: Do not rely on node name for correct PLL setup
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 1b24a132eba7a1c19475ba2510ec1c00af3ff914 ]
After commit 31fd9b79dc58 ("ARM: dts: BCM5301X: update CRU block description") a warning from clk-iproc-pll.c was generated due to a duplicate PLL name as well as the console stopped working. Upon closer inspection it became clear that iproc_pll_clk_setup() used the Device Tree node unit name as an unique identifier as well as a parent name to parent all clocks under the PLL.
BCM5301X was the first platform on which that got noticed because of the DT node unit name renaming but the same assumptions hold true for any user of the iproc_pll_clk_setup() function.
The first 'clock-output-names' property is always guaranteed to be unique as well as providing the actual desired PLL clock name, so we utilize that to register the PLL and as a parent name of all children clock.
--- drivers/clk/bcm/clk-iproc-pll.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/clk/bcm/clk-iproc-pll.c +8 -4
@@ -736,6 +736,7 @@ void iproc_pll_clk_setup(struct device_node *node,const char *parent_name;struct iproc_clk *iclk_array;struct clk_hw_onecell_data *clk_data; +const char *clk_name;if (WARN_ON (!pll_ctrl) ||WARN_ON (!clk_ctrl))return ;
@@ -783,7 +784,12 @@ void iproc_pll_clk_setup(struct device_node *node, iclk = &iclk_array[0 ]; iclk->pll = pll; - init.name = node->name; + ret =of_property_read_string_index (node,"clock-output-names" , +0 , &clk_name); +if (WARN_ON (ret)) + goto err_pll_register; + + init.name = clk_name; init.ops = &iproc_pll_ops; init.flags =0 ; parent_name =of_clk_get_parent_name (node,0 );
@@ -803,13 +809,11 @@ void iproc_pll_clk_setup(struct device_node *node, goto err_pll_register; clk_data->hws[0 ] = &iclk->hw; + parent_name = clk_name;/* now initialize and register all leaf clocks */ for (i =1 ; i < num_clks; i++) { -const char *clk_name; -memset (&init,0 ,sizeof (init)); - parent_name = node->name; ret =of_property_read_string_index (node,"clock-output-names" , i, &clk_name);
Signature · 1 line
2.35.1
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.4:
10 builds: 10 pass, 0 fail
26 boots: 26 pass, 0 fail
59 tests: 59 pass, 0 failLinux version: 5.4.216-rc1-gd69f2dcfc489
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +0000. Anything received after that time might be too late.
Build results:
total: 161 pass: 161 fail: 0 Qemu test results: total: 447 pass: 447 fail: 0
Guenter
Quoted 152 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +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.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 5.4.216-rc1Florian Fainelli <[email protected]>
clk: iproc: Do not rely on node name for correct PLL setupHan Xu <[email protected]>
clk: imx: imx6sx: remove theSET_RATE_PARENTflag for QSPI clocksWang Yufen <[email protected]>
selftests: Fix the if conditions of intest_extra_filter()Michael Kelley <[email protected]>
nvme: FixIOC_PR_CLEARandIOC_PR_RELEASEioctls for nvme devicesChaitanya Kulkarni <[email protected]>
nvme: add new line after variable declatationPeilin Ye <[email protected]>
usbnet: Fix memory leak inusbnet_disconnect()Yang Yingliang <[email protected]>
Input:melfas_mip4- fix return value check inmip4_probe()Brian Norris <[email protected]>
Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"Samuel Holland <[email protected]>
soc: sunxi: sram: Fix debugfs info for A64 SRAM CSamuel Holland <[email protected]>
soc: sunxi: sram: Fix probe function ordering issuesCai Huoqing <[email protected]>
soc:sunxi_sram: Make use of the helper functiondevm_platform_ioremap_resource()Samuel Holland <[email protected]>
soc: sunxi: sram: Prevent the driver from being unboundSamuel Holland <[email protected]>
soc: sunxi: sram: Actually claim SRAM regionsYuTong Chang <[email protected]>
ARM: dts: am33xx: Fix MMCHS0 dma propertiesFaiz Abbas <[email protected]>
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driverHangyu Hua <[email protected]>
media:dvb_vb2: fix possible out of bound accessMinchan Kim <[email protected]>
mm: fixmadivse_pageoutmishandling on non-LRU pageAlistair Popple <[email protected]>
mm/migrate_device.c: flush TLB while holding PTLMaurizio Lombardi <[email protected]>
mm: preventpage_frag_alloc()from corrupting the memoryMel Gorman <[email protected]>
mm/page_alloc: fix race condition betweenbuild_all_zonelistsand page allocationSergei Antonov <[email protected]>
mmc: moxart: fix 4-bit bus width and remove 8-bit bus widthNiklas Cassel <[email protected]>
libata: addATA_HORKAGE_NOLPMfor Pioneer BDR-207M and BDR-205Sasha Levin <[email protected]>
Revert "net: mvpp2: debugfs: fix memory leak when usingdebugfs_lookup()"ChenXiaoSong <[email protected]>
ntfs: fixBUG_ONinntfs_lookup_inode_by_name()Linus Walleij <[email protected]>
ARM: dts: integrator: Tag PCI host withdevice_typeAidan MacDonald <[email protected]>
clk: ingenic-tcu: Properly enable registers before accessing timersFrank Wunderlich <[email protected]>
net: usb:qmi_wwan: Add new usb-id for Dell branded EM7455Hongling Zeng <[email protected]>
uas: ignore UAS for Thinkplus chipsHongling Zeng <[email protected]>
usb-storage: Add Hiksemi USB3-FW toIGNORE_UASHongling Zeng <[email protected]>
uas: add no-uas quirk for Hiksemiusb_disk-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - arch/arm/boot/dts/am335x-boneblue.dts | 1 - arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - arch/arm/boot/dts/am335x-evm.dts | 3 +- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-lxm.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 4 +- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 9 +-- arch/arm/boot/dts/am33xx.dtsi | 3 +- arch/arm/boot/dts/am4372.dtsi | 3 +- arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- arch/arm/boot/dts/am437x-l4.dtsi | 5 +- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/integratorap.dts | 1 + drivers/ata/libata-core.c | 4 ++ drivers/clk/bcm/clk-iproc-pll.c | 12 ++-- drivers/clk/imx/clk-imx6sx.c | 4 +- drivers/clk/ingenic/tcu.c | 15 ++--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ----- drivers/input/touchscreen/melfas_mip4.c | 2 +- drivers/media/dvb-core/dvb_vb2.c | 11 ++++ drivers/mmc/host/moxart-mmc.c | 17 +----- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 7 ++- drivers/nvme/host/core.c | 9 ++-
Quoted 11 lines
drivers/soc/sunxi/sunxi_sram.c | 27 ++++----- drivers/usb/storage/unusual_uas.h | 21 +++++++ fs/ntfs/super.c | 3 +- mm/madvise.c | 7 ++- mm/migrate.c | 5 +- mm/page_alloc.c | 65 ++++++++++++++++++---- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 40 files changed, 173 insertions(+), 112 deletions(-)
Compiled and failed to boot. Reverting the following patch fixes the problem.
commit 4b453403a945b13ea8aa9e8628bec1eaffeb7257 (HEAD -> linux-5.4.y)
Author: Shuah Khan <[email protected]> Date: Mon Oct 3 15:45:57 2022 -0600
Revert "drm/amdgpu: use dirty framebuffer helper"
thanks,
-- Shuah
This reverts commit c89849ecfd2e10838b31c519c2a6607266b58f02.
Greg Kroah-Hartman
maintainerQuoted 169 lines · Shuah Khan
Quoted 152 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +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.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 5.4.216-rc1Florian Fainelli <[email protected]>
clk: iproc: Do not rely on node name for correct PLL setupHan Xu <[email protected]>
clk: imx: imx6sx: remove theSET_RATE_PARENTflag for QSPI clocksWang Yufen <[email protected]>
selftests: Fix the if conditions of intest_extra_filter()Michael Kelley <[email protected]>
nvme: FixIOC_PR_CLEARandIOC_PR_RELEASEioctls for nvme devicesChaitanya Kulkarni <[email protected]>
nvme: add new line after variable declatationPeilin Ye <[email protected]>
usbnet: Fix memory leak inusbnet_disconnect()Yang Yingliang <[email protected]>
Input:melfas_mip4- fix return value check inmip4_probe()Brian Norris <[email protected]>
Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"Samuel Holland <[email protected]>
soc: sunxi: sram: Fix debugfs info for A64 SRAM CSamuel Holland <[email protected]>
soc: sunxi: sram: Fix probe function ordering issuesCai Huoqing <[email protected]>
soc:sunxi_sram: Make use of the helper functiondevm_platform_ioremap_resource()Samuel Holland <[email protected]>
soc: sunxi: sram: Prevent the driver from being unboundSamuel Holland <[email protected]>
soc: sunxi: sram: Actually claim SRAM regionsYuTong Chang <[email protected]>
ARM: dts: am33xx: Fix MMCHS0 dma propertiesFaiz Abbas <[email protected]>
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driverHangyu Hua <[email protected]>
media:dvb_vb2: fix possible out of bound accessMinchan Kim <[email protected]>
mm: fixmadivse_pageoutmishandling on non-LRU pageAlistair Popple <[email protected]>
mm/migrate_device.c: flush TLB while holding PTLMaurizio Lombardi <[email protected]>
mm: preventpage_frag_alloc()from corrupting the memoryMel Gorman <[email protected]>
mm/page_alloc: fix race condition betweenbuild_all_zonelistsand page allocationSergei Antonov <[email protected]>
mmc: moxart: fix 4-bit bus width and remove 8-bit bus widthNiklas Cassel <[email protected]>
libata: addATA_HORKAGE_NOLPMfor Pioneer BDR-207M and BDR-205Sasha Levin <[email protected]>
Revert "net: mvpp2: debugfs: fix memory leak when usingdebugfs_lookup()"ChenXiaoSong <[email protected]>
ntfs: fixBUG_ONinntfs_lookup_inode_by_name()Linus Walleij <[email protected]>
ARM: dts: integrator: Tag PCI host withdevice_typeAidan MacDonald <[email protected]>
clk: ingenic-tcu: Properly enable registers before accessing timersFrank Wunderlich <[email protected]>
net: usb:qmi_wwan: Add new usb-id for Dell branded EM7455Hongling Zeng <[email protected]>
uas: ignore UAS for Thinkplus chipsHongling Zeng <[email protected]>
usb-storage: Add Hiksemi USB3-FW toIGNORE_UASHongling Zeng <[email protected]>
uas: add no-uas quirk for Hiksemiusb_disk-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - arch/arm/boot/dts/am335x-boneblue.dts | 1 - arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - arch/arm/boot/dts/am335x-evm.dts | 3 +- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-lxm.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 4 +- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 9 +-- arch/arm/boot/dts/am33xx.dtsi | 3 +- arch/arm/boot/dts/am4372.dtsi | 3 +- arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- arch/arm/boot/dts/am437x-l4.dtsi | 5 +- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/integratorap.dts | 1 + drivers/ata/libata-core.c | 4 ++ drivers/clk/bcm/clk-iproc-pll.c | 12 ++-- drivers/clk/imx/clk-imx6sx.c | 4 +- drivers/clk/ingenic/tcu.c | 15 ++--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ----- drivers/input/touchscreen/melfas_mip4.c | 2 +- drivers/media/dvb-core/dvb_vb2.c | 11 ++++ drivers/mmc/host/moxart-mmc.c | 17 +----- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 7 ++- drivers/nvme/host/core.c | 9 ++-Quoted 11 lines
drivers/soc/sunxi/sunxi_sram.c | 27 ++++----- drivers/usb/storage/unusual_uas.h | 21 +++++++ fs/ntfs/super.c | 3 +- mm/madvise.c | 7 ++- mm/migrate.c | 5 +- mm/page_alloc.c | 65 ++++++++++++++++++---- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 40 files changed, 173 insertions(+), 112 deletions(-)Compiled and failed to boot. Reverting the following patch fixes the problem.
commit
4b453403a945b13ea8aa9e8628bec1eaffeb7257(HEAD -> linux-5.4.y)
Quoted 8 lines
Author: Shuah Khan <[email protected]> Date: Mon Oct 3 15:45:57 2022 -0600Revert "drm/amdgpu: use dirty framebuffer helper"
thanks,
-- ShuahThis reverts commit c89849ecfd2e10838b31c519c2a6607266b58f02.
As that commit is in 5.4.215, it's not part of this -rc series. Do you want to submit a patch for the revert, or want me to make one up after 5.4.216 is out?
thanks,
greg k-h
Quoted 175 lines · Greg Kroah-Hartman
Quoted 174 lines · Shuah Khan
Quoted 152 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +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.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 5.4.216-rc1Florian Fainelli <[email protected]>
clk: iproc: Do not rely on node name for correct PLL setupHan Xu <[email protected]>
clk: imx: imx6sx: remove theSET_RATE_PARENTflag for QSPI clocksWang Yufen <[email protected]>
selftests: Fix the if conditions of intest_extra_filter()Michael Kelley <[email protected]>
nvme: FixIOC_PR_CLEARandIOC_PR_RELEASEioctls for nvme devicesChaitanya Kulkarni <[email protected]>
nvme: add new line after variable declatationPeilin Ye <[email protected]>
usbnet: Fix memory leak inusbnet_disconnect()Yang Yingliang <[email protected]>
Input:melfas_mip4- fix return value check inmip4_probe()Brian Norris <[email protected]>
Revert "drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time"Samuel Holland <[email protected]>
soc: sunxi: sram: Fix debugfs info for A64 SRAM CSamuel Holland <[email protected]>
soc: sunxi: sram: Fix probe function ordering issuesCai Huoqing <[email protected]>
soc:sunxi_sram: Make use of the helper functiondevm_platform_ioremap_resource()Samuel Holland <[email protected]>
soc: sunxi: sram: Prevent the driver from being unboundSamuel Holland <[email protected]>
soc: sunxi: sram: Actually claim SRAM regionsYuTong Chang <[email protected]>
ARM: dts: am33xx: Fix MMCHS0 dma propertiesFaiz Abbas <[email protected]>
ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driverHangyu Hua <[email protected]>
media:dvb_vb2: fix possible out of bound accessMinchan Kim <[email protected]>
mm: fixmadivse_pageoutmishandling on non-LRU pageAlistair Popple <[email protected]>
mm/migrate_device.c: flush TLB while holding PTLMaurizio Lombardi <[email protected]>
mm: preventpage_frag_alloc()from corrupting the memoryMel Gorman <[email protected]>
mm/page_alloc: fix race condition betweenbuild_all_zonelistsand page allocationSergei Antonov <[email protected]>
mmc: moxart: fix 4-bit bus width and remove 8-bit bus widthNiklas Cassel <[email protected]>
libata: addATA_HORKAGE_NOLPMfor Pioneer BDR-207M and BDR-205Sasha Levin <[email protected]>
Revert "net: mvpp2: debugfs: fix memory leak when usingdebugfs_lookup()"ChenXiaoSong <[email protected]>
ntfs: fixBUG_ONinntfs_lookup_inode_by_name()Linus Walleij <[email protected]>
ARM: dts: integrator: Tag PCI host withdevice_typeAidan MacDonald <[email protected]>
clk: ingenic-tcu: Properly enable registers before accessing timersFrank Wunderlich <[email protected]>
net: usb:qmi_wwan: Add new usb-id for Dell branded EM7455Hongling Zeng <[email protected]>
uas: ignore UAS for Thinkplus chipsHongling Zeng <[email protected]>
usb-storage: Add Hiksemi USB3-FW toIGNORE_UASHongling Zeng <[email protected]>
uas: add no-uas quirk for Hiksemiusb_disk-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- arch/arm/boot/dts/am335x-boneblack-common.dtsi | 1 + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 1 - arch/arm/boot/dts/am335x-boneblue.dts | 1 - arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 1 - arch/arm/boot/dts/am335x-evm.dts | 3 +- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-lxm.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 2 +- arch/arm/boot/dts/am335x-pepper.dts | 4 +- arch/arm/boot/dts/am335x-phycore-som.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 9 +-- arch/arm/boot/dts/am33xx.dtsi | 3 +- arch/arm/boot/dts/am4372.dtsi | 3 +- arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- arch/arm/boot/dts/am437x-l4.dtsi | 5 +- arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- arch/arm/boot/dts/integratorap.dts | 1 + drivers/ata/libata-core.c | 4 ++ drivers/clk/bcm/clk-iproc-pll.c | 12 ++-- drivers/clk/imx/clk-imx6sx.c | 4 +- drivers/clk/ingenic/tcu.c | 15 ++--- drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 13 ----- drivers/input/touchscreen/melfas_mip4.c | 2 +- drivers/media/dvb-core/dvb_vb2.c | 11 ++++ drivers/mmc/host/moxart-mmc.c | 17 +----- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 7 ++- drivers/nvme/host/core.c | 9 ++-Quoted 11 lines
drivers/soc/sunxi/sunxi_sram.c | 27 ++++----- drivers/usb/storage/unusual_uas.h | 21 +++++++ fs/ntfs/super.c | 3 +- mm/madvise.c | 7 ++- mm/migrate.c | 5 +- mm/page_alloc.c | 65 ++++++++++++++++++---- tools/testing/selftests/net/reuseport_bpf.c | 2 +- 40 files changed, 173 insertions(+), 112 deletions(-)Compiled and failed to boot. Reverting the following patch fixes the problem.
commit
4b453403a945b13ea8aa9e8628bec1eaffeb7257(HEAD -> linux-5.4.y)Author: Shuah Khan <[email protected]> Date: Mon Oct 3 15:45:57 2022 -0600Revert "drm/amdgpu: use dirty framebuffer helper"
Quoted 8 lines
Quoted 3 lines
thanks,
-- ShuahThis reverts commit c89849ecfd2e10838b31c519c2a6607266b58f02.As that commit is in 5.4.215, it's not part of this -rc series. Do you want to submit a patch for the revert, or want me to make one up after 5.4.216 is out?
I will send in a revert.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 16 lines · Shuah Khan
Quoted 15 lines · Greg Kroah-Hartman
Quoted 13 lines · Shuah Khan
On 10/3/22 01:11, Greg Kroah-Hartman wrote:
Compiled and failed to boot. Reverting the following patch fixes the problem.commit
4b453403a945b13ea8aa9e8628bec1eaffeb7257(HEAD -> linux-5.4.y)Author: Shuah Khan <[email protected]> Date: Mon Oct 3 15:45:57 2022 -0600Revert "drm/amdgpu: use dirty framebuffer helper"
thanks,
-- ShuahThis reverts commit c89849ecfd2e10838b31c519c2a6607266b58f02.
Quoted 6 lines
Quoted 4 lines
As that commit is in 5.4.215, it's not part of this -rc series. Do you want to submit a patch for the revert, or want me to make one up after 5.4.216 is out?
I will send in a revert.
I've done it now, no need to send it in.
thanks,
greg k-h
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.216-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.4.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro's test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.4.216-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.4.y
* git commit: d69f2dcfc489105c21e2323f5a9e8f215296ea31
* git describe: v5.4.215-31-gd69f2dcfc489
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.4.y/build/v5.4.215-31-gd69f2dcfc489
## No Test Regressions (compared to v5.4.215)
## No Metric Regressions (compared to v5.4.215)
## No Test Fixes (compared to v5.4.215)
## No Metric Fixes (compared to v5.4.215)
## Test result summary
total: 95444, pass: 83176, fail: 739, skip: 11127, xfail: 402
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 332 total, 331 passed, 1 failed
* arm64: 61 total, 56 passed, 5 failed
* i386: 31 total, 29 passed, 2 failed
* mips: 56 total, 53 passed, 3 failed
* parisc: 12 total, 12 passed, 0 failed
* powerpc: 63 total, 57 passed, 6 failed
* riscv: 27 total, 26 passed, 1 failed
* s390: 15 total, 15 passed, 0 failed
* sh: 24 total, 24 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x86_64: 57 total, 55 passed, 2 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* rcutorture
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.4.216 release. There are 30 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 Wed, 05 Oct 2022 07:07:06 +0000. Anything received after that time might be too late.
Build test (gcc version 11.3.1 20220925):
mips: 65 configs -> no failure
arm: 106 configs -> no failure
arm64: 2 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
[1]. https://openqa.qa.codethink.co.uk/tests/1944
--
Regards
Sudip