October 2021 - Linux-stable-mirror

[PATCH MANUALSEL 4.19 1/2] KVM: x86: Handle SRCU initialization failure during page track init

by Sasha Levin

From: Haimin Zhang <tcs_kernel(a)tencent.com> [ Upstream commit eb7511bf9182292ef1df1082d23039e856d1ddfb ] Check the return of init_srcu_struct(), which can fail due to OOM, when initializing the page track mechanism. Lack of checking leads to a NULL pointer deref found by a modified syzkaller. Reported-by: TCS Robot <tcs_robot(a)tencent.com> Signed-off-by: Haimin Zhang <tcs_kernel(a)tencent.com> Message-Id: <1630636626-12262-1-git-send-email-tcs_kernel(a)tencent.com> [Move the call towards the beginning of kvm_arch_init_vm. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- arch/x86/include/asm/kvm_page_track.h | 2 +- arch/x86/kvm/page_track.c | 4 ++-- arch/x86/kvm/x86.c | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h index 172f9749dbb2..5986bd4aacd6 100644 --- a/arch/x86/include/asm/kvm_page_track.h +++ b/arch/x86/include/asm/kvm_page_track.h @@ -46,7 +46,7 @@ struct kvm_page_track_notifier_node { struct kvm_page_track_notifier_node *node); }; -void kvm_page_track_init(struct kvm *kvm); +int kvm_page_track_init(struct kvm *kvm); void kvm_page_track_cleanup(struct kvm *kvm); void kvm_page_track_free_memslot(struct kvm_memory_slot *free, diff --git a/arch/x86/kvm/page_track.c b/arch/x86/kvm/page_track.c index 3052a59a3065..1f6b0d9b0c85 100644 --- a/arch/x86/kvm/page_track.c +++ b/arch/x86/kvm/page_track.c @@ -169,13 +169,13 @@ void kvm_page_track_cleanup(struct kvm *kvm) cleanup_srcu_struct(&head->track_srcu); } -void kvm_page_track_init(struct kvm *kvm) +int kvm_page_track_init(struct kvm *kvm) { struct kvm_page_track_notifier_head *head; head = &kvm->arch.track_notifier_head; - init_srcu_struct(&head->track_srcu); INIT_HLIST_HEAD(&head->track_notifier_list); + return init_srcu_struct(&head->track_srcu); } /* diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 417abc9ba1ad..70cb18f89029 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9039,9 +9039,15 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) { + int ret; + if (type) return -EINVAL; + ret = kvm_page_track_init(kvm); + if (ret) + return ret; + INIT_HLIST_HEAD(&kvm->arch.mask_notifier_list); INIT_LIST_HEAD(&kvm->arch.active_mmu_pages); INIT_LIST_HEAD(&kvm->arch.zapped_obsolete_pages); @@ -9068,7 +9074,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) INIT_DELAYED_WORK(&kvm->arch.kvmclock_sync_work, kvmclock_sync_fn); kvm_hv_init_vm(kvm); - kvm_page_track_init(kvm); kvm_mmu_init_vm(kvm); if (kvm_x86_ops->vm_init) -- 2.33.0

6 months, 2 weeks

4
4
0 0

[PATCH] drm/panfrost: Fix the panfrost_mmu_map_fault_addr() error path

by Boris Brezillon

Make sure all bo->base.pages entries are either NULL or pointing to a valid page before calling drm_gem_shmem_put_pages(). Reported-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> Cc: <stable(a)vger.kernel.org> Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations") Signed-off-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index 569509c2ba27..d76dff201ea6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -460,6 +460,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, if (IS_ERR(pages[i])) { mutex_unlock(&bo->base.pages_lock); ret = PTR_ERR(pages[i]); + pages[i] = NULL; goto err_pages; } } -- 2.31.1

1 year, 8 months

2
2
0 0

[PATCH] Revert "ath: add support for special 0x0 regulatory domain"

by Brian Norris

This reverts commit 2dc016599cfa9672a147528ca26d70c3654a5423. Users are reporting regressions in regulatory domain detection and channel availability. The problem this was trying to resolve was fixed in firmware anyway: QCA6174 hw3.0: sdio-4.4.1: add firmware.bin_WLAN.RMH.4.4.1-00042 https://github.com/kvalo/ath10k-firmware/commit/4d382787f0efa77dba40394e0bc… Link: https://bbs.archlinux.org/viewtopic.php?id=254535 Link: http://lists.infradead.org/pipermail/ath10k/2020-April/014871.html Link: http://lists.infradead.org/pipermail/ath10k/2020-May/015152.html Fixes: 2dc016599cfa ("ath: add support for special 0x0 regulatory domain") Cc: <stable(a)vger.kernel.org> Cc: Wen Gong <wgong(a)codeaurora.org> Signed-off-by: Brian Norris <briannorris(a)chromium.org> --- drivers/net/wireless/ath/regd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index bee9110b91f3..20f4f8ea9f89 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c @@ -666,14 +666,14 @@ ath_regd_init_wiphy(struct ath_regulatory *reg, /* * Some users have reported their EEPROM programmed with - * 0x8000 or 0x0 set, this is not a supported regulatory - * domain but since we have more than one user with it we - * need a solution for them. We default to 0x64, which is - * the default Atheros world regulatory domain. + * 0x8000 set, this is not a supported regulatory domain + * but since we have more than one user with it we need + * a solution for them. We default to 0x64, which is the + * default Atheros world regulatory domain. */ static void ath_regd_sanitize(struct ath_regulatory *reg) { - if (reg->current_rd != COUNTRY_ERD_FLAG && reg->current_rd != 0) + if (reg->current_rd != COUNTRY_ERD_FLAG) return; printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n"); reg->current_rd = 0x64; -- 2.27.0.rc0.183.gde8f92d652-goog

2 years, 3 months

8
10
0 0

[PATCH] bluetooth: Add another Bluetooth part for Realtek 8852AE

by Larry Finger

This Realtek device has both wifi and BT components. The latter reports a USB ID of 0bda:4852, which is not in the table. The portion of /sys/kernel/debug/usb/devices pertaining to this device is T: Bus=06 Lev=01 Prnt=01 Port=03 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 P: Vendor=0bda ProdID=4852 Rev= 0.00 S: Manufacturer=Realtek S: Product=Bluetooth Radio S: SerialNumber=00e04c000001 C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms Signed-off-by: Larry Finger <Larry.Finger(a)lwfinger.net> Cc: Stable <stable(a)vger.kernel.org> --- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 60d2fce59a71..7e1e43c216ec 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -384,6 +384,8 @@ static const struct usb_device_id blacklist_table[] = { /* Realtek 8852AE Bluetooth devices */ { USB_DEVICE(0x0bda, 0xc852), .driver_info = BTUSB_REALTEK | BTUSB_WIDEBAND_SPEECH }, + { USB_DEVICE(0x0bda, 0x4852), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, /* Realtek Bluetooth devices */ { USB_VENDOR_AND_INTERFACE_INFO(0x0bda, 0xe0, 0x01, 0x01), -- 2.33.0

2 years, 4 months

4
3
0 0

[PATCH v3] i2c: i801: Safely share SMBus with BIOS/ACPI

by Hector Martin

The i801 controller provides a locking mechanism that the OS is supposed to use to safely share the SMBus with ACPI AML or other firmware. Previously, Linux attempted to get out of the way of ACPI AML entirely, but left the bus locked if it used it before the first AML access. This causes AML implementations that *do* attempt to safely share the bus to time out if Linux uses it first; notably, this regressed ACPI video backlight controls on 2015 iMacs after 01590f361e started instantiating SPD EEPROMs on boot. Commit 065b6211a8 fixed the immediate problem of leaving the bus locked, but we can do better. The controller does have a proper locking mechanism, so let's use it as intended. Since we can't rely on the BIOS doing this properly, we implement the following logic: - If ACPI AML uses the bus at all, we make a note and disable power management. The latter matches already existing behavior. - When we want to use the bus, we attempt to lock it first. If the locking attempt times out, *and* ACPI hasn't tried to use the bus at all yet, we cautiously go ahead and assume the BIOS forgot to unlock the bus after boot. This preserves existing behavior. - We always unlock the bus after a transfer. - If ACPI AML tries to use the bus (except trying to lock it) while we're in the middle of a transfer, or after we've determined locking is broken, we know we cannot safely share the bus and give up. Upon first usage of SMBus by ACPI AML, if nothing has gone horribly wrong so far, users will see: i801_smbus 0000:00:1f.4: SMBus controller is shared with ACPI AML. This seems safe so far. If locking the SMBus times out, users will see: i801_smbus 0000:00:1f.4: BIOS left SMBus locked And if ACPI AML tries to use the bus concurrently with Linux, or it previously used the bus and we failed to subsequently lock it as above, the driver will give up and users will get: i801_smbus 0000:00:1f.4: BIOS uses SMBus unsafely i801_smbus 0000:00:1f.4: Driver SMBus register access inhibited This fixes the regression introduced by 01590f361e, and further allows safely sharing the SMBus on 2015 iMacs. Tested by running `i2cdump` in a loop while changing backlight levels via the ACPI video device. Fixes: 01590f361e ("i2c: i801: Instantiate SPD EEPROMs automatically") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hector Martin <marcan(a)marcan.st> --- drivers/i2c/busses/i2c-i801.c | 96 ++++++++++++++++++++++++++++------- 1 file changed, 79 insertions(+), 17 deletions(-) diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 04a1e38f2a6f..03be6310d6d7 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -287,11 +287,18 @@ struct i801_priv { #endif struct platform_device *tco_pdev; + /* BIOS left the controller marked busy. */ + bool inuse_stuck; /* - * If set to true the host controller registers are reserved for - * ACPI AML use. Protected by acpi_lock. + * If set to true, ACPI AML uses the host controller registers. + * Protected by acpi_lock. */ - bool acpi_reserved; + bool acpi_usage; + /* + * If set to true, ACPI AML uses the host controller registers in an + * unsafe way. Protected by acpi_lock. + */ + bool acpi_unsafe; struct mutex acpi_lock; }; @@ -854,10 +861,37 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, int hwpec; int block = 0; int ret = 0, xact = 0; + int timeout = 0; struct i801_priv *priv = i2c_get_adapdata(adap); + /* + * The controller provides a bit that implements a mutex mechanism + * between users of the bus. First, try to lock the hardware mutex. + * If this doesn't work, we give up trying to do this, but then + * bail if ACPI uses SMBus at all. + */ + if (!priv->inuse_stuck) { + while (inb_p(SMBHSTSTS(priv)) & SMBHSTSTS_INUSE_STS) { + if (++timeout >= MAX_RETRIES) { + dev_warn(&priv->pci_dev->dev, + "BIOS left SMBus locked\n"); + priv->inuse_stuck = true; + break; + } + usleep_range(250, 500); + } + } + mutex_lock(&priv->acpi_lock); - if (priv->acpi_reserved) { + if (priv->acpi_usage && priv->inuse_stuck && !priv->acpi_unsafe) { + priv->acpi_unsafe = true; + + dev_warn(&priv->pci_dev->dev, "BIOS uses SMBus unsafely\n"); + dev_warn(&priv->pci_dev->dev, + "Driver SMBus register access inhibited\n"); + } + + if (priv->acpi_unsafe) { mutex_unlock(&priv->acpi_lock); return -EBUSY; } @@ -1639,6 +1673,16 @@ static bool i801_acpi_is_smbus_ioport(const struct i801_priv *priv, address <= pci_resource_end(priv->pci_dev, SMBBAR); } +static acpi_status +i801_acpi_do_access(u32 function, acpi_physical_address address, + u32 bits, u64 *value) +{ + if ((function & ACPI_IO_MASK) == ACPI_READ) + return acpi_os_read_port(address, (u32 *)value, bits); + else + return acpi_os_write_port(address, (u32)*value, bits); +} + static acpi_status i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, u64 *value, void *handler_context, void *region_context) @@ -1648,17 +1692,38 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, acpi_status status; /* - * Once BIOS AML code touches the OpRegion we warn and inhibit any - * further access from the driver itself. This device is now owned - * by the system firmware. + * Non-i801 accesses pass through. */ - mutex_lock(&priv->acpi_lock); + if (!i801_acpi_is_smbus_ioport(priv, address)) + return i801_acpi_do_access(function, address, bits, value); - if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) { - priv->acpi_reserved = true; + if (!mutex_trylock(&priv->acpi_lock)) { + mutex_lock(&priv->acpi_lock); + /* + * This better be a read of the status register to acquire + * the lock... + */ + if (!priv->acpi_unsafe && + !(address == SMBHSTSTS(priv) && + (function & ACPI_IO_MASK) == ACPI_READ)) { + /* + * Uh-oh, ACPI AML is trying to do something with the + * controller without locking it properly. + */ + priv->acpi_unsafe = true; + + dev_warn(&pdev->dev, "BIOS uses SMBus unsafely\n"); + dev_warn(&pdev->dev, + "Driver SMBus register access inhibited\n"); + } + } - dev_warn(&pdev->dev, "BIOS is accessing SMBus registers\n"); - dev_warn(&pdev->dev, "Driver SMBus register access inhibited\n"); + if (!priv->acpi_usage) { + priv->acpi_usage = true; + + if (!priv->acpi_unsafe) + dev_info(&pdev->dev, + "SMBus controller is shared with ACPI AML. This seems safe so far.\n"); /* * BIOS is accessing the host controller so prevent it from @@ -1667,10 +1732,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, pm_runtime_get_sync(&pdev->dev); } - if ((function & ACPI_IO_MASK) == ACPI_READ) - status = acpi_os_read_port(address, (u32 *)value, bits); - else - status = acpi_os_write_port(address, (u32)*value, bits); + status = i801_acpi_do_access(function, address, bits, value); mutex_unlock(&priv->acpi_lock); @@ -1706,7 +1768,7 @@ static void i801_acpi_remove(struct i801_priv *priv) ACPI_ADR_SPACE_SYSTEM_IO, i801_acpi_io_handler); mutex_lock(&priv->acpi_lock); - if (priv->acpi_reserved) + if (priv->acpi_usage) pm_runtime_put(&priv->pci_dev->dev); mutex_unlock(&priv->acpi_lock); } -- 2.32.0

2 years, 5 months

5
4
0 0

[PATCH 1/2] x86/mpparse: avoid overwriting boot_cpu_physical_apicid

by Kevin Mitchell

When booting with ACPI unavailable or disabled, get_smp_config() ends up calling MP_processor_info() for each CPU found in the MPS table. Previously, this resulted in boot_cpu_physical_apicid getting unconditionally overwritten by the apicid of whatever processor had the CPU_BOOTPROCESSOR flag. This occurred even if boot_cpu_physical_apicid had already been more reliably determined in register_lapic_address() by calling read_apic_id() from the actual boot processor. Ordinariliy, this is not a problem because the boot processor really is the one with the CPU_BOOTPROCESSOR flag. However, kexec is an exception in which the kernel may be booted from any processor regardless of the MPS table contents. In this case, boot_cpu_physical_apicid may not indicate the actual boot processor. This was particularly problematic when the second kernel was booted with NR_CPUS fewer than the number of physical processors. It's the job of generic_processor_info() to decide which CPUs to bring up in this case. That obviously must include the real boot processor which it takes care to save a slot for. It relies upon the contents of boot_cpu_physical_apicid to do this, which if incorrect, may result in the boot processor getting left out. This condition can be discovered by smp_sanity_check() and rectified by adding the boot processor to the phys_cpu_present_map with the warning "weird, boot CPU (#%d) not listed by the BIOS". However, commit 3e730dad3b6da ("x86/apic: Unify interrupt mode setup for SMP-capable system") caused setup_local_APIC() to be called before this could happen resulting in a BUG_ON(!apic->apic_id_registered()): [ 0.655452] ------------[ cut here ]------------ [ 0.660610] Kernel BUG at setup_local_APIC+0x74/0x280 [verbose debug info unavailable] [ 0.669466] invalid opcode: 0000 [#1] SMP [ 0.673948] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.19.109.Ar-16509018.eostrunkkernel419 #1 [ 0.683670] Hardware name: Quanta Quanta LY6 (1LY6UZZ0FBC), BIOS 1.0.6.0-e7d6a55 11/26/2015 [ 0.693007] RIP: 0010:setup_local_APIC+0x74/0x280 [ 0.698264] Code: 80 e4 fe bf f0 00 00 00 89 c6 48 8b 05 0f 1a 8e 00 ff 50 10 e8 12 53 fd ff 48 8b 05 00 1a 8e 00 ff 90 a0 00 00 00 85 c0 75 02 <0f> 0b 48 8b 05 ed 19 8e 00 41 be 00 02 00 00 ff 90 b0 00 00 00 48 [ 0.719251] RSP: 0000:ffffffff81a03e20 EFLAGS: 00010246 [ 0.725091] RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000000 [ 0.733066] RDX: 0000000000000000 RSI: 000000000000000f RDI: 0000000000000020 [ 0.741041] RBP: ffffffff81a03e98 R08: 0000000000000002 R09: 0000000000000000 [ 0.749014] R10: ffffffff81a204e0 R11: ffffffff81b50ea7 R12: 0000000000000000 [ 0.756989] R13: ffffffff81aef920 R14: ffffffff81af60a0 R15: 0000000000000000 [ 0.764965] FS: 0000000000000000(0000) GS:ffff888036800000(0000) knlGS:0000000000000000 [ 0.774007] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 0.780427] CR2: ffff888035c01000 CR3: 0000000035a08000 CR4: 00000000000006b0 [ 0.788401] Call Trace: [ 0.791137] ? amd_iommu_prepare+0x15/0x2a [ 0.795717] apic_bsp_setup+0x55/0x75 [ 0.799808] apic_intr_mode_init+0x169/0x16e [ 0.804579] x86_late_time_init+0x10/0x17 [ 0.809062] start_kernel+0x37e/0x3fe [ 0.813154] x86_64_start_reservations+0x2a/0x2c [ 0.818316] x86_64_start_kernel+0x72/0x75 [ 0.822886] secondary_startup_64+0xa4/0xb0 [ 0.827564] ---[ end trace 237b64da0fd9b22e ]--- This change avoids these issues by only setting boot_cpu_physical_apicid from the MPS table if it is not already set, which can occur in the construct_default_ISA_mptable() path. Otherwise, boot_cpu_physical_apicid will already have been set in register_lapic_address() and should therefore remain untouched. Looking through all the places where boot_cpu_physical_apicid is accessed, nearly all of them assume that boot_cpu_physical_apicid should match read_apic_id() on the booting processor. The only place that might intend to use the BSP apicid listed in the MPS table is amd_numa_init(), which explicitly requires boot_cpu_physical_apicid to be the lowest apicid of all processors. Ironically, due to the early exit short circuit in early_get_smp_config(), it instead gets boot_cpu_physical_apicid = read_apic_id() rather than the MPS table BSP. The behaviour of amd_numa_init() is therefore unaffected by this change. Fixes: 3e730dad3b6da ("x86/apic: Unify interrupt mode setup for SMP-capable system") Signed-off-by: Kevin Mitchell <kevmitch(a)arista.com> Cc: <stable(a)vger.kernel.org> --- arch/x86/kernel/mpparse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index afac7ccce72f..6f22f09bfe11 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -64,7 +64,8 @@ static void __init MP_processor_info(struct mpc_cpu *m) if (m->cpuflag & CPU_BOOTPROCESSOR) { bootup_cpu = " (Bootup-CPU)"; - boot_cpu_physical_apicid = m->apicid; + if (boot_cpu_physical_apicid == -1U) + boot_cpu_physical_apicid = m->apicid; } pr_info("Processor #%d%s\n", m->apicid, bootup_cpu); -- 2.26.2

2 years, 7 months

1
1
0 0

[PATCH 01/12] kexec: Allow architecture code to opt-out at runtime

by Joerg Roedel

From: Joerg Roedel <jroedel(a)suse.de> Allow a runtime opt-out of kexec support for architecture code in case the kernel is running in an environment where kexec is not properly supported yet. This will be used on x86 when the kernel is running as an SEV-ES guest. SEV-ES guests need special handling for kexec to hand over all CPUs to the new kernel. This requires special hypervisor support and handling code in the guest which is not yet implemented. Cc: stable(a)vger.kernel.org # v5.10+ Signed-off-by: Joerg Roedel <jroedel(a)suse.de> --- include/linux/kexec.h | 1 + kernel/kexec.c | 14 ++++++++++++++ kernel/kexec_file.c | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 0c994ae37729..85c30dcd0bdc 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -201,6 +201,7 @@ int arch_kexec_kernel_verify_sig(struct kimage *image, void *buf, unsigned long buf_len); #endif int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf); +bool arch_kexec_supported(void); extern int kexec_add_buffer(struct kexec_buf *kbuf); int kexec_locate_mem_hole(struct kexec_buf *kbuf); diff --git a/kernel/kexec.c b/kernel/kexec.c index c82c6c06f051..d03134160458 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -195,11 +195,25 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, * that to happen you need to do that yourself. */ +bool __weak arch_kexec_supported(void) +{ + return true; +} + static inline int kexec_load_check(unsigned long nr_segments, unsigned long flags) { int result; + /* + * The architecture may support kexec in general, but the kernel could + * run in an environment where it is not (yet) possible to execute a new + * kernel. Allow the architecture code to opt-out of kexec support when + * it is running in such an environment. + */ + if (!arch_kexec_supported()) + return -ENOSYS; + /* We only trust the superuser with rebooting the system. */ if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) return -EPERM; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 33400ff051a8..96d08a512e9c 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -358,6 +358,15 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, int ret = 0, i; struct kimage **dest_image, *image; + /* + * The architecture may support kexec in general, but the kernel could + * run in an environment where it is not (yet) possible to execute a new + * kernel. Allow the architecture code to opt-out of kexec support when + * it is running in such an environment. + */ + if (!arch_kexec_supported()) + return -ENOSYS; + /* We only trust the superuser with rebooting the system. */ if (!capable(CAP_SYS_BOOT) || kexec_load_disabled) return -EPERM; -- 2.31.1

2 years, 8 months

2
1
0 0

[PATCH] mmc: sdhci-xenon: fix 1.8v regulator stabilization

by Marcin Wojtas

From: Alex Leibovich <alexl(a)marvell.com> Automatic Clock Gating is a feature used for the power consumption optimisation. It turned out that during early init phase it may prevent the stable voltage switch to 1.8V - due to that on some platfroms an endless printout in dmesg can be observed: "mmc1: 1.8V regulator output did not became stable" Fix the problem by disabling the ACG at very beginning of the sdhci_init and let that be enabled later. Fixes: 3a3748dba881 ("mmc: sdhci-xenon: Add Marvell Xenon SDHC core functionality") Signed-off-by: Alex Leibovich <alexl(a)marvell.com> Signed-off-by: Marcin Wojtas <mw(a)semihalf.com> Cc: stable(a)vger.kernel.org --- drivers/mmc/host/sdhci-xenon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index c67611fdaa8a..4b05f6fdefb4 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -168,7 +168,12 @@ static void xenon_reset_exit(struct sdhci_host *host, /* Disable tuning request and auto-retuning again */ xenon_retune_setup(host); - xenon_set_acg(host, true); + /* + * The ACG should be turned off at the early init time, in order + * to solve a possile issues with the 1.8V regulator stabilization. + * The feature is enabled in later stage. + */ + xenon_set_acg(host, false); xenon_set_sdclk_off_idle(host, sdhc_id, false); -- 2.29.0

2 years, 9 months

4
10
0 0

[PATCH 4.19 000/247] 4.19.178-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.178 release. There are 247 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, 03 Mar 2021 16:09:49 +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.178-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.178-rc1 Takeshi Misawa <jeliantsurux(a)gmail.com> net: qrtr: Fix memory leak in qrtr_tun_open Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Update in-core bitset after committing the metadata Jason A. Donenfeld <Jason(a)zx2c4.com> net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending Leon Romanovsky <leonro(a)nvidia.com> ipv6: silence compilation warning for non-IPV6 builds Eric Dumazet <edumazet(a)google.com> ipv6: icmp6: avoid indirect call for icmpv6_send() Jason A. Donenfeld <Jason(a)zx2c4.com> xfrm: interface: use icmp_ndo_send helper Jason A. Donenfeld <Jason(a)zx2c4.com> sunvnet: use icmp_ndo_send helper Jason A. Donenfeld <Jason(a)zx2c4.com> gtp: use icmp_ndo_send helper Jason A. Donenfeld <Jason(a)zx2c4.com> icmp: introduce helper for nat'd source address in network device context Nikos Tsironis <ntsironis(a)arrikto.com> dm era: only resize metadata in preresume Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Reinitialize bitset cache before digesting a new writeset Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Use correct value size in equality function of writeset tree Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Fix bitset memory leaks Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Verify the data block size hasn't changed Nikos Tsironis <ntsironis(a)arrikto.com> dm era: Recover committed writeset after crash Mikulas Patocka <mpatocka(a)redhat.com> dm: fix deadlock when swapping to encrypted device Bob Peterson <rpeterso(a)redhat.com> gfs2: Don't skip dlm unlock if glock has an lvb Al Viro <viro(a)zeniv.linux.org.uk> sparc32: fix a user-triggerable oops in clear_user() Chao Yu <yuchao0(a)huawei.com> f2fs: fix out-of-repair __setattr_copy() Chen Yu <yu.c.chen(a)intel.com> cpufreq: intel_pstate: Get per-CPU max freq via MSR_HWP_CAPABILITIES if available Muchun Song <songmuchun(a)bytedance.com> printk: fix deadlock when kernel panic Maxim Kiselev <bigunclemax(a)gmail.com> gpio: pcf857x: Fix missing first interrupt Frank Li <Frank.Li(a)nxp.com> mmc: sdhci-esdhc-imx: fix kernel panic when remove module Fangrui Song <maskray(a)google.com> module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols Suzuki K Poulose <suzuki.poulose(a)arm.com> arm64: Extend workaround for erratum 1024718 to all versions of Cortex-A55 Dan Williams <dan.j.williams(a)intel.com> libnvdimm/dimm: Avoid race between probe and available_slots_show() Mike Kravetz <mike.kravetz(a)oracle.com> hugetlb: fix copy_huge_page_from_user contig page struct assumption NeilBrown <neilb(a)suse.de> x86: fix seq_file iteration for pat/memtype.c NeilBrown <neilb(a)suse.de> seq_file: document how per-entry resources are managed. Pan Bian <bianpan2016(a)163.com> fs/affs: release old buffer head on error path Pan Bian <bianpan2016(a)163.com> mtd: spi-nor: hisi-sfc: Put child node np on error path Alexander Usyskin <alexander.usyskin(a)intel.com> watchdog: mei_wdt: request stop on unregister He Zhe <zhe.he(a)windriver.com> arm64: uprobe: Return EOPNOTSUPP for AARCH32 instruction probing Jiri Kosina <jkosina(a)suse.cz> floppy: reintroduce O_NDELAY fix Sean Christopherson <seanjc(a)google.com> x86/reboot: Force all cpus to exit VMX root if VMX is supported Pavel Machek <pavel(a)denx.de> media: ipu3-cio2: Fix mbus_code processing in cio2_subdev_set_fmt() Martin Kaiser <martin(a)kaiser.cx> staging: rtl8188eu: Add Edimax EW-7811UN V2 to device table Amey Narkhede <ameynarkhede03(a)gmail.com> staging: gdm724x: Fix DMA from stack Ilya Lipnitskiy <ilya.lipnitskiy(a)gmail.com> staging/mt7621-dma: mtk-hsdma.c->hsdma-mt7621.c Frank Wunderlich <frank-w(a)public-files.de> dts64: mt7622: fix slow sd card access Jiri Bohac <jbohac(a)suse.cz> pstore: Fix typo in compression option name Sabyrzhan Tasbolatov <snovitoll(a)gmail.com> drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue Ricky Wu <ricky_wu(a)realtek.com> misc: rtsx: init of rts522a add OCP power off when no card is present Paul Cercueil <paul(a)crapouillou.net> seccomp: Add missing return in non-void function Corentin Labbe <clabbe(a)baylibre.com> crypto: sun4i-ss - handle BigEndian for cipher Corentin Labbe <clabbe(a)baylibre.com> crypto: sun4i-ss - IV register does not work on A10 and A13 Corentin Labbe <clabbe(a)baylibre.com> crypto: sun4i-ss - checking sg length is not sufficient Ard Biesheuvel <ardb(a)kernel.org> crypto: arm64/sha - add missing module aliases Filipe Manana <fdmanana(a)suse.com> btrfs: fix extent buffer leak on failure to copy root Josef Bacik <josef(a)toxicpanda.com> btrfs: fix reloc root leak with 0 ref reloc roots on recovery Josef Bacik <josef(a)toxicpanda.com> btrfs: abort the transaction if we fail to inc ref in btrfs_copy_root Jarkko Sakkinen <jarkko(a)kernel.org> KEYS: trusted: Fix migratable=1 failing James Bottomley <James.Bottomley(a)HansenPartnership.com> tpm_tis: Clean up locality release James Bottomley <James.Bottomley(a)HansenPartnership.com> tpm_tis: Fix check_locality for correct locality acquisition PeiSen Hou <pshou(a)realtek.com> ALSA: hda/realtek: modify EAPD in the ALC886 Dan Carpenter <dan.carpenter(a)oracle.com> USB: serial: mos7720: fix error code in mos7720_write() Dan Carpenter <dan.carpenter(a)oracle.com> USB: serial: mos7840: fix error code in mos7840_write() Johan Hovold <johan(a)kernel.org> USB: serial: ftdi_sio: fix FTX sub-integer prescaler Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt Thinh Nguyen <Thinh.Nguyen(a)synopsys.com> usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1 Paul Cercueil <paul(a)crapouillou.net> usb: musb: Fix runtime PM race in musb_queue_resume_work Lech Perczak <lech.perczak(a)gmail.com> USB: serial: option: update interface mapping for ZTE P685M Marcos Paulo de Souza <mpdesouza(a)suse.com> Input: i8042 - add ASUS Zenbook Flip to noselftest list Dan Carpenter <dan.carpenter(a)oracle.com> Input: joydev - prevent potential read overflow in ioctl Olivier Crête <olivier.crete(a)ocrete.ca> Input: xpad - add support for PowerA Enhanced Wired Controller for Xbox Series X|S jeffrey.lin <jeffrey.lin(a)rad-ic.com> Input: raydium_ts_i2c - do not send zero length Jason Gerecke <killertofu(a)gmail.com> HID: wacom: Ignore attempts to overwrite the touch_max value from HID Qinglang Miao <miaoqinglang(a)huawei.com> ACPI: configfs: add missing check after configfs_register_default_group() Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: property: Fix fwnode string properties matching Mikulas Patocka <mpatocka(a)redhat.com> blk-settings: align max_sectors on "logical_block_size" boundary Randy Dunlap <rdunlap(a)infradead.org> scsi: bnx2fc: Fix Kconfig warning & CNIC build errors Miaohe Lin <linmiaohe(a)huawei.com> mm/rmap: fix potential pte_unmap on an not mapped pte Maxime Ripard <maxime(a)cerno.tech> i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition Marc Zyngier <maz(a)kernel.org> arm64: Add missing ISB after invalidating TLB in __primary_switch Heiner Kallweit <hkallweit1(a)gmail.com> r8169: fix jumbo packet handling on RTL8168e Miaohe Lin <linmiaohe(a)huawei.com> mm/hugetlb: fix potential double free in hugetlb_register_node() error path Miaohe Lin <linmiaohe(a)huawei.com> mm/memory.c: fix potential pte_unmap_unlock pte error Dan Carpenter <dan.carpenter(a)oracle.com> ocfs2: fix a use after free on error Taehee Yoo <ap420073(a)gmail.com> vxlan: move debug check after netdev unregister Chuhong Yuan <hslester96(a)gmail.com> net/mlx4_core: Add missed mlx4_free_cmd_mailbox() Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Fix add TC filter for IPv6 Jann Horn <jannh(a)google.com> Take mmap lock in cacheflush syscall Sylwester Dziedziuch <sylwesterx.dziedziuch(a)intel.com> i40e: Fix VFs not created Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Fix overwriting flow control settings during driver loading Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Add zero-initialization of AQ command structures Slawomir Laba <slawomirx.laba(a)intel.com> i40e: Fix flow for IPv6 next header (extension header) Bard Liao <yung-chuan.liao(a)linux.intel.com> regmap: sdw: use _no_pm functions in regmap_read/write Theodore Ts'o <tytso(a)mit.edu> ext4: fix potential htree index checksum corruption Konrad Dybcio <konrad.dybcio(a)somainline.org> drm/msm/dsi: Correct io_start for MSM8994 (20nm PHY) Heiner Kallweit <hkallweit1(a)gmail.com> PCI: Align checking of syscall user config accessors Jorgen Hansen <jhansen(a)vmware.com> VMCI: Use set_page_dirty_lock() when unregistering guest memory Simon South <simon(a)simonsouth.net> pwm: rockchip: rockchip_pwm_probe(): Remove superfluous clk_unprepare() Aswath Govindraju <a-govindraju(a)ti.com> misc: eeprom_93xx46: Add module alias to avoid breaking support for non device tree users Aswath Govindraju <a-govindraju(a)ti.com> misc: eeprom_93xx46: Fix module alias to enable module autoprobe Randy Dunlap <rdunlap(a)infradead.org> sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set Dan Carpenter <dan.carpenter(a)oracle.com> Input: elo - fix an error code in elo_connect() Namhyung Kim <namhyung(a)kernel.org> perf test: Fix unaligned access in sample parsing test Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix missing CYC processing in PSB Dan Carpenter <dan.carpenter(a)oracle.com> Input: sur40 - fix an error code in sur40_probe() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> spi: pxa2xx: Fix the controller numbering for Wildcat Point AngeloGioacchino Del Regno <angelogioacchino.delregno(a)somainline.org> clk: qcom: gcc-msm8998: Fix Alpha PLL type for all GPLLs Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/8xx: Fix software emulation interrupt Nathan Lynch <nathanl(a)linux.ibm.com> powerpc/pseries/dlpar: handle ibm, configure-connector delay status Dan Carpenter <dan.carpenter(a)oracle.com> mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq() Alain Volmat <alain.volmat(a)foss.st.com> spi: stm32: properly handle 0 byte transfer Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Correct skb on loopback path Bob Pearson <rpearsonhpe(a)gmail.com> RDMA/rxe: Fix coding error in rxe_recv.c Arnaldo Carvalho de Melo <acme(a)redhat.com> perf tools: Fix DSO filtering when not finding a map for a sampled address Steven Rostedt (VMware) <rostedt(a)goodmis.org> tracepoint: Do not fail unregistering a probe due to memory failure Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> amba: Fix resource leak for drivers without .remove Vladimir Murzin <vladimir.murzin(a)arm.com> ARM: 9046/1: decompressor: Do not clear SCTLR.nTLSMD for ARMv7+ cores Takeshi Saito <takeshi.saito.xv(a)renesas.com> mmc: renesas_sdhi_internal_dmac: Fix DMA buffer alignment from 8 to 128-bytes Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> mmc: usdhi6rol0: Fix a resource leak in the error handling path of the probe Christophe Leroy <christophe.leroy(a)csgroup.eu> powerpc/47x: Disable 256k page size Cédric Le Goater <clg(a)kaod.org> KVM: PPC: Make the VMX instruction emulation routines static Shay Drory <shayd(a)nvidia.com> IB/umad: Return EPOLLERR in case of when device disassociated Shay Drory <shayd(a)nvidia.com> IB/umad: Return EIO in case of when device disassociated Geert Uytterhoeven <geert(a)linux-m68k.org> auxdisplay: ht16k33: Fix refresh rate handling Pan Bian <bianpan2016(a)163.com> isofs: release buffer head before return Krzysztof Kozlowski <krzk(a)kernel.org> regulator: s5m8767: Drop regulators OF node reference Pan Bian <bianpan2016(a)163.com> spi: atmel: Put allocated master before return David Howells <dhowells(a)redhat.com> certs: Fix blacklist flag type confusion Pan Bian <bianpan2016(a)163.com> regulator: axp20x: Fix reference cout leak Andre Przywara <andre.przywara(a)arm.com> clk: sunxi-ng: h6: Fix clock divider range on some clocks Yishai Hadas <yishaih(a)nvidia.com> RDMA/mlx5: Use the correct obj_id upon DEVX TIR creation Tom Rix <trix(a)redhat.com> clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined Bartosz Golaszewski <bgolaszewski(a)baylibre.com> rtc: s5m: select REGMAP_I2C Claudiu Beznea <claudiu.beznea(a)microchip.com> power: reset: at91-sama5d2_shdwc: fix wkupdbc mask Nicolas Boichat <drinkcat(a)chromium.org> of/fdt: Make sure no-map does not remove already reserved regions KarimAllah Ahmed <karahmed(a)amazon.de> fdt: Properly handle "no-map" field in the memory region Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> mfd: bd9571mwv: Use devm_mfd_add_devices() Ferry Toth <ftoth(a)exalondelft.nl> dmaengine: hsu: disable spurious interrupt Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: owl-dma: Fix a resource leak in the remove function Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: fsldma: Fix a resource leak in the remove function Randy Dunlap <rdunlap(a)infradead.org> HID: core: detect and skip invalid inputs to snto32() Andre Przywara <andre.przywara(a)arm.com> clk: sunxi-ng: h6: Fix CEC clock Pratyush Yadav <p.yadav(a)ti.com> spi: cadence-quadspi: Abort read if dummy cycles required are too many Jan Kara <jack(a)suse.cz> quota: Fix memory leak when handling corrupted quota file Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL Eric W. Biederman <ebiederm(a)xmission.com> capabilities: Don't allow writing ambiguous v3 file capabilities Tom Rix <trix(a)redhat.com> jffs2: fix use after free in jffs2_sum_write_data() Colin Ian King <colin.king(a)canonical.com> fs/jfs: fix potential integer overflow on shift of a int Lakshmi Ramasubramanian <nramas(a)linux.microsoft.com> ima: Free IMA measurement buffer after kexec syscall Lakshmi Ramasubramanian <nramas(a)linux.microsoft.com> ima: Free IMA measurement buffer on error Daniele Alessandrelli <daniele.alessandrelli(a)intel.com> crypto: ecdh_helper - Ensure 'len >= secret.len' in decode_key() Jan Henrik Weinstock <jan.weinstock(a)rwth-aachen.de> hwrng: timeriomem - Fix cooldown period calculation Zhihao Cheng <chengzhihao1(a)huawei.com> btrfs: clarify error returns values in __load_free_space_cache Andrea Parri (Microsoft) <parri.andrea(a)gmail.com> Drivers: hv: vmbus: Avoid use-after-free in vmbus_onoffer_rescind() Dan Carpenter <dan.carpenter(a)oracle.com> drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask() Yi Chen <chenyi77(a)huawei.com> f2fs: fix to avoid inconsistent quota data Sebastian Reichel <sre(a)kernel.org> ASoC: cpcap: fix microphone timeslot mask Florian Fainelli <f.fainelli(a)gmail.com> ata: ahci_brcm: Add back regulators management Christophe Leroy <christophe.leroy(a)csgroup.eu> crypto: talitos - Work around SEC6 ERRATA (AES-CTR mode data size error) Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values Tom Rix <trix(a)redhat.com> media: pxa_camera: declare variable when DEBUG is defined Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: cx25821: Fix a bug when reallocating some dma memory Luo Meng <luomeng12(a)huawei.com> media: qm1d1c0042: fix error return code in qm1d1c0042_init() Joe Perches <joe(a)perches.com> media: lmedm04: Fix misuse of comma Mario Kleiner <mario.kleiner.de(a)gmail.com> drm/amd/display: Fix 10/12 bpc setup in DCE output bit depth reduction. Jiri Olsa <jolsa(a)kernel.org> crypto: bcm - Rename struct device_private to bcm_device_private Dan Carpenter <dan.carpenter(a)oracle.com> ASoC: cs42l56: fix up error handling in probe Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: tm6000: Fix memleak in tm6000_start_stream Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: media/pci: Fix memleak in empress_init Dinghao Liu <dinghao.liu(a)zju.edu.cn> media: em28xx: Fix use-after-free in em28xx_alloc_urbs Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> media: vsp1: Fix an error handling path in the probe function Dan Carpenter <dan.carpenter(a)oracle.com> media: camss: missing error code in msm_video_register() Jacopo Mondi <jacopo(a)jmondi.org> media: i2c: ov5670: Fix PIXEL_RATE minimum value Nathan Chancellor <natechancellor(a)gmail.com> MIPS: lantiq: Explicitly compare LTQ_EBU_PCC_ISTAT against 0 Nathan Chancellor <natechancellor(a)gmail.com> MIPS: c-r4k: Fix section mismatch for loongson2_sc_init Chenyang Li <lichenyang(a)loongson.cn> drm/amdgpu: Fix macro name _AMDGPU_TRACE_H_ in preprocessor if condition Corentin Labbe <clabbe(a)baylibre.com> crypto: sun4i-ss - fix kmap usage Dan Carpenter <dan.carpenter(a)oracle.com> gma500: clean up error handling in init Jialin Zhang <zhangjialin11(a)huawei.com> drm/gma500: Fix error return code in psb_driver_load() Randy Dunlap <rdunlap(a)infradead.org> fbdev: aty: SPARC64 requires FB_ATY_CT Maxime Chevallier <maxime.chevallier(a)bootlin.com> net: mvneta: Remove per-cpu queue mapping for Armada 3700 Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> net: amd-xgbe: Fix network fluctuations when using 1G BELFUSE SFP Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> net: amd-xgbe: Reset link when the link never comes back Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> net: amd-xgbe: Fix NETDEV WATCHDOG transmit queue timeout warning Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> net: amd-xgbe: Reset the PHY rx data path when mailbox command timeout Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: skip send_request_unmap for timeout reset Lijun Pan <ljp(a)linux.ibm.com> ibmvnic: add memory barrier to protect long term buffer Colin Ian King <colin.king(a)canonical.com> b43: N-PHY: Fix the update of coef for the PHY revision >= 3case Ayush Sawal <ayush.sawal(a)chelsio.com> cxgb4/chtls/cxgbit: Keeping the max ofld immediate data size same in cxgb4 and ulds Eric Dumazet <edumazet(a)google.com> tcp: fix SO_RCVLOWAT related hangs under mem pressure Jesper Dangaard Brouer <brouer(a)redhat.com> bpf: Fix bpf_fib_lookup helper MTU check for SKB ctx Colin Ian King <colin.king(a)canonical.com> mac80211: fix potential overflow when multiplying to u32 integers Juergen Gross <jgross(a)suse.com> xen/netback: fix spurious event detection for common event case Edwin Peer <edwin.peer(a)broadcom.com> bnxt_en: reverse order of TX disable and carrier off Sukadev Bhattiprolu <sukadev(a)linux.ibm.com> ibmvnic: Set to CLOSED state even on error Linus Lüssing <ll(a)simonwunderlich.de> ath9k: fix data bus crash when setting nf_override via debugfs Marco Elver <elver(a)google.com> bpf_lru_list: Read double-checked variable once without lock Jae Hyun Yoo <jae.hyun.yoo(a)intel.com> soc: aspeed: snoop: Add clock control logic Arnd Bergmann <arnd(a)arndb.de> ARM: s3c: fix fiq for clang IAS Vincent Knecht <vincent.knecht(a)mailoo.org> arm64: dts: msm8916: Fix reserved and rfsa nodes unit address Rosen Penev <rosenp(a)gmail.com> ARM: dts: armada388-helios4: assign pinctrl to each fan Rosen Penev <rosenp(a)gmail.com> ARM: dts: armada388-helios4: assign pinctrl to LEDs Chen-Yu Tsai <wens(a)csie.org> staging: rtl8723bs: wifi_regd.c: Fix incorrect number of regulatory rules Guenter Roeck <linux(a)roeck-us.net> usb: dwc2: Make "trimming xfer length" a debug message Guenter Roeck <linux(a)roeck-us.net> usb: dwc2: Abort transaction after errors with unknown reason Guenter Roeck <linux(a)roeck-us.net> usb: dwc2: Do not update data length if it is 0 on inbound transfers Tony Lindgren <tony(a)atomide.com> ARM: dts: Configure missing thermal interrupt for 4430 Pan Bian <bianpan2016(a)163.com> memory: ti-aemif: Drop child node when jumping out loop Pan Bian <bianpan2016(a)163.com> Bluetooth: Put HCI device if inquiry procedure interrupts Pan Bian <bianpan2016(a)163.com> Bluetooth: drop HCI device reference before return Jack Pham <jackp(a)codeaurora.org> usb: gadget: u_audio: Free requests only after callback Maximilian Luz <luzmaximilian(a)gmail.com> ACPICA: Fix exception code class checks Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> cpufreq: brcmstb-avs-cpufreq: Fix resource leaks in ->remove() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> cpufreq: brcmstb-avs-cpufreq: Free resources in error path Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: A64: Limit MMC2 bus frequency to 150 MHz Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card Andre Przywara <andre.przywara(a)arm.com> arm64: dts: allwinner: A64: properly connect USB PHY to port 0 Andrii Nakryiko <andrii(a)kernel.org> bpf: Avoid warning when re-casting __bpf_call_base into __bpf_call_base_args Krzysztof Kozlowski <krzk(a)kernel.org> arm64: dts: exynos: correct PMIC interrupt trigger level on Espresso Krzysztof Kozlowski <krzk(a)kernel.org> arm64: dts: exynos: correct PMIC interrupt trigger level on TM2 Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid XU3 family Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Spring Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Rinato Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Monk Krzysztof Kozlowski <krzk(a)kernel.org> ARM: dts: exynos: correct PMIC interrupt trigger level on Artik 5 Christopher William Snowhill <chris(a)kode54.net> Bluetooth: Fix initializing response id after clearing struct Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Bluetooth: btqcomsmd: Fix a resource leak in error handling paths in the probe function Rakesh Pillai <pillair(a)codeaurora.org> ath10k: Fix error handling in case of CE pipe init failure Eric Biggers <ebiggers(a)google.com> random: fix the RNDRESEEDCRNG ioctl Alexander Lobakin <alobakin(a)pm.me> MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix PCM buffer allocation in non-vmalloc mode Jan Kara <jack(a)suse.cz> bfq: Avoid false bfq queue merging Ansuel Smith <ansuelsmth(a)gmail.com> PCI: qcom: Use PHY_REFCLK_USE_PAD only for ipq8064 Sumit Garg <sumit.garg(a)linaro.org> kdb: Make memory allocations more robust Nick Desaulniers <ndesaulniers(a)google.com> vmlinux.lds.h: add DWARF v5 sections Peter Zijlstra <peterz(a)infradead.org> locking/static_key: Fix false positive warnings on concurrent dec/inc Peter Zijlstra <peterz(a)infradead.org> jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations Rong Chen <rong.a.chen(a)intel.com> scripts/recordmcount.pl: support big endian for ARCH sh Shyam Prasad N <sprasad(a)microsoft.com> cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath. Christoph Schemmel <christoph.schemmel(a)gmail.com> NET: usb: qmi_wwan: Adding support for Cinterion MV31 Ming Lei <ming.lei(a)redhat.com> block: don't release queue's sysfs lock during switching elevator Ming Lei <ming.lei(a)redhat.com> block: fix race between switching elevator and removing queues Ming Lei <ming.lei(a)redhat.com> block: split .sysfs_lock into two locks Ming Lei <ming.lei(a)redhat.com> block: add helper for checking if queue is registered Rolf Eike Beer <eb(a)emlix.com> scripts: set proper OpenSSL include dir also for sign-file Rolf Eike Beer <eb(a)emlix.com> scripts: use pkg-config to locate libcrypto Sameer Pujar <spujar(a)nvidia.com> arm64: tegra: Add power-domain for Tegra210 HDA Rustam Kovhaev <rkovhaev(a)gmail.com> ntfs: check for valid standard information attribute Stefan Ursella <stefan.ursella(a)wolfvision.net> usb: quirks: add quirk to start video capture on ELMO L-12F document camera reliable Johan Hovold <johan(a)kernel.org> USB: quirks: sort quirk entries Will McVicker <willmcvicker(a)google.com> HID: make arrays usage and value to be the same ------------- Diffstat: Documentation/filesystems/seq_file.txt | 6 + Makefile | 4 +- arch/arm/boot/compressed/head.S | 4 +- arch/arm/boot/dts/armada-388-helios4.dts | 28 +++- arch/arm/boot/dts/exynos3250-artik5.dtsi | 2 +- arch/arm/boot/dts/exynos3250-monk.dts | 2 +- arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- arch/arm/boot/dts/exynos5250-spring.dts | 2 +- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 2 +- arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- arch/arm/boot/dts/omap443x.dtsi | 2 + arch/arm64/Kconfig | 2 +- .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 5 +- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 1 - arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +- .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 +- arch/arm64/boot/dts/mediatek/mt7622.dtsi | 2 + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 +- arch/arm64/crypto/sha1-ce-glue.c | 1 + arch/arm64/crypto/sha2-ce-glue.c | 2 + arch/arm64/crypto/sha3-ce-glue.c | 4 + arch/arm64/crypto/sha512-ce-glue.c | 2 + arch/arm64/kernel/cpufeature.c | 2 +- arch/arm64/kernel/head.S | 1 + arch/arm64/kernel/probes/uprobes.c | 2 +- arch/mips/kernel/vmlinux.lds.S | 1 + arch/mips/lantiq/irq.c | 2 +- arch/mips/mm/c-r4k.c | 2 +- arch/nios2/kernel/sys_nios2.c | 11 +- arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/head_8xx.S | 2 +- arch/powerpc/kvm/powerpc.c | 8 +- arch/powerpc/platforms/pseries/dlpar.c | 7 +- arch/sparc/Kconfig | 2 +- arch/sparc/lib/memset.S | 1 + arch/x86/kernel/reboot.c | 29 ++-- arch/x86/mm/pat.c | 3 +- block/bfq-iosched.c | 1 + block/blk-core.c | 1 + block/blk-mq-sysfs.c | 12 +- block/blk-settings.c | 12 ++ block/blk-sysfs.c | 49 ++++--- block/blk-wbt.c | 2 +- block/blk.h | 2 +- block/elevator.c | 30 ++-- certs/blacklist.c | 2 +- crypto/ecdh_helper.c | 3 + drivers/acpi/acpi_configfs.c | 7 +- drivers/acpi/property.c | 44 ++++-- drivers/amba/bus.c | 20 +-- drivers/ata/ahci_brcm.c | 14 +- drivers/auxdisplay/ht16k33.c | 3 +- drivers/base/regmap/regmap-sdw.c | 4 +- drivers/block/floppy.c | 27 ++-- drivers/bluetooth/btqcomsmd.c | 27 ++-- drivers/char/hw_random/timeriomem-rng.c | 2 +- drivers/char/random.c | 2 +- drivers/char/tpm/tpm_tis_core.c | 50 +------ drivers/clk/meson/clk-pll.c | 2 +- drivers/clk/qcom/gcc-msm8998.c | 100 ++++++------- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 10 +- drivers/clocksource/mxs_timer.c | 5 +- drivers/cpufreq/brcmstb-avs-cpufreq.c | 24 +++- drivers/cpufreq/intel_pstate.c | 5 +- drivers/crypto/bcm/cipher.c | 2 +- drivers/crypto/bcm/cipher.h | 4 +- drivers/crypto/bcm/util.c | 2 +- drivers/crypto/chelsio/chtls/chtls_cm.h | 3 - drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 159 +++++++++++++-------- drivers/crypto/talitos.c | 28 ++-- drivers/crypto/talitos.h | 1 + drivers/dma/fsldma.c | 6 + drivers/dma/hsu/pci.c | 21 +-- drivers/dma/owl-dma.c | 1 + drivers/gpio/gpio-pcf857x.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 8 +- drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 22 +-- drivers/gpu/drm/gma500/psb_drv.c | 2 + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 2 +- drivers/hid/hid-core.c | 9 +- drivers/hid/wacom_wac.c | 7 +- drivers/hv/channel_mgmt.c | 3 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/infiniband/core/user_mad.c | 17 ++- drivers/infiniband/hw/mlx5/devx.c | 4 +- drivers/infiniband/sw/rxe/rxe_net.c | 5 + drivers/infiniband/sw/rxe/rxe_recv.c | 11 +- drivers/input/joydev.c | 7 +- drivers/input/joystick/xpad.c | 1 + drivers/input/serio/i8042-x86ia64io.h | 4 + drivers/input/touchscreen/elo.c | 4 +- drivers/input/touchscreen/raydium_i2c_ts.c | 3 +- drivers/input/touchscreen/sur40.c | 1 + drivers/md/dm-core.h | 4 + drivers/md/dm-crypt.c | 1 + drivers/md/dm-era-target.c | 93 +++++++----- drivers/md/dm.c | 60 ++++++++ drivers/media/i2c/ov5670.c | 3 +- drivers/media/pci/cx25821/cx25821-core.c | 4 +- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- drivers/media/pci/saa7134/saa7134-empress.c | 5 +- drivers/media/platform/pxa_camera.c | 3 + drivers/media/platform/qcom/camss/camss-video.c | 1 + drivers/media/platform/vsp1/vsp1_drv.c | 4 +- drivers/media/tuners/qm1d1c0042.c | 4 +- drivers/media/usb/dvb-usb-v2/lmedm04.c | 2 +- drivers/media/usb/em28xx/em28xx-core.c | 6 +- drivers/media/usb/tm6000/tm6000-dvb.c | 4 + drivers/media/usb/uvc/uvc_v4l2.c | 18 +-- drivers/memory/ti-aemif.c | 8 +- drivers/mfd/bd9571mwv.c | 6 +- drivers/mfd/wm831x-auxadc.c | 3 +- drivers/misc/aspeed-lpc-snoop.c | 30 +++- drivers/misc/cardreader/rts5227.c | 5 + drivers/misc/eeprom/eeprom_93xx46.c | 1 + drivers/misc/vmw_vmci/vmci_queue_pair.c | 5 +- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 4 +- drivers/mmc/host/sdhci-esdhc-imx.c | 3 +- drivers/mmc/host/usdhi6rol0.c | 4 +- drivers/mtd/spi-nor/cadence-quadspi.c | 2 +- drivers/mtd/spi-nor/hisi-sfc.c | 4 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 14 ++ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 3 +- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 39 ++++- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 + drivers/net/ethernet/chelsio/cxgb4/sge.c | 11 +- drivers/net/ethernet/ibm/ibmvnic.c | 16 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 41 ++---- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 9 +- drivers/net/ethernet/marvell/mvneta.c | 9 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 1 + drivers/net/ethernet/realtek/r8169.c | 4 +- drivers/net/ethernet/sun/sunvnet_common.c | 23 +-- drivers/net/gtp.c | 5 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/vxlan.c | 11 +- drivers/net/wireless/ath/ath10k/snoc.c | 5 +- drivers/net/wireless/ath/ath9k/debug.c | 5 +- drivers/net/wireless/broadcom/b43/phy_n.c | 2 +- drivers/net/xen-netback/interface.c | 8 +- drivers/nvdimm/dimm_devs.c | 18 ++- drivers/of/fdt.c | 12 +- drivers/pci/controller/dwc/pcie-qcom.c | 4 +- drivers/pci/syscall.c | 10 +- drivers/power/reset/at91-sama5d2_shdwc.c | 2 +- drivers/pwm/pwm-rockchip.c | 1 - drivers/regulator/axp20x-regulator.c | 7 +- drivers/regulator/s5m8767.c | 8 +- drivers/rtc/Kconfig | 1 + drivers/scsi/bnx2fc/Kconfig | 1 + drivers/spi/spi-atmel.c | 2 +- drivers/spi/spi-pxa2xx-pci.c | 27 ++-- drivers/spi/spi-s3c24xx-fiq.S | 9 +- drivers/spi/spi-stm32.c | 4 + drivers/staging/gdm724x/gdm_usb.c | 10 +- drivers/staging/mt7621-dma/Makefile | 2 +- .../mt7621-dma/{mtk-hsdma.c => hsdma-mt7621.c} | 2 +- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- drivers/target/iscsi/cxgbit/cxgbit_target.c | 3 +- drivers/usb/core/quirks.c | 9 +- drivers/usb/dwc2/hcd.c | 15 +- drivers/usb/dwc2/hcd_intr.c | 14 +- drivers/usb/dwc3/gadget.c | 19 ++- drivers/usb/gadget/function/u_audio.c | 17 ++- drivers/usb/musb/musb_core.c | 31 ++-- drivers/usb/serial/ftdi_sio.c | 5 +- drivers/usb/serial/mos7720.c | 4 +- drivers/usb/serial/mos7840.c | 4 +- drivers/usb/serial/option.c | 3 +- drivers/video/fbdev/Kconfig | 2 +- drivers/watchdog/mei_wdt.c | 1 + fs/affs/namei.c | 4 +- fs/btrfs/ctree.c | 7 +- fs/btrfs/free-space-cache.c | 6 +- fs/btrfs/relocation.c | 4 +- fs/cifs/connect.c | 1 + fs/ext4/namei.c | 7 +- fs/f2fs/file.c | 7 +- fs/f2fs/inline.c | 4 + fs/gfs2/lock_dlm.c | 8 +- fs/isofs/dir.c | 1 + fs/isofs/namei.c | 1 + fs/jffs2/summary.c | 3 + fs/jfs/jfs_dmap.c | 2 +- fs/ntfs/inode.c | 6 + fs/ocfs2/cluster/heartbeat.c | 8 +- fs/pstore/platform.c | 4 +- fs/quota/quota_v2.c | 11 +- include/acpi/acexcep.h | 10 +- include/asm-generic/vmlinux.lds.h | 7 +- include/linux/blkdev.h | 2 + include/linux/device-mapper.h | 5 + include/linux/filter.h | 2 +- include/linux/icmpv6.h | 44 +++++- include/linux/ipv6.h | 2 +- include/linux/kexec.h | 5 + include/linux/key.h | 1 + include/linux/rmap.h | 3 +- include/net/icmp.h | 10 ++ include/net/tcp.h | 9 +- kernel/bpf/bpf_lru_list.c | 7 +- kernel/debug/kdb/kdb_private.h | 2 +- kernel/jump_label.c | 26 ++-- kernel/kexec_file.c | 5 + kernel/module.c | 21 ++- kernel/printk/printk_safe.c | 16 ++- kernel/seccomp.c | 2 + kernel/tracepoint.c | 80 ++++++++--- mm/hugetlb.c | 4 +- mm/memory.c | 16 ++- net/bluetooth/a2mp.c | 3 +- net/bluetooth/hci_core.c | 6 +- net/core/filter.c | 13 +- net/ipv4/icmp.c | 34 +++++ net/ipv6/icmp.c | 19 +-- net/ipv6/ip6_icmp.c | 46 +++++- net/mac80211/mesh_hwmp.c | 2 +- net/qrtr/tun.c | 12 +- net/xfrm/xfrm_interface.c | 6 +- scripts/Makefile | 9 +- scripts/recordmcount.pl | 6 +- security/commoncap.c | 12 +- security/integrity/ima/ima_kexec.c | 3 + security/integrity/ima/ima_mok.c | 5 +- security/keys/key.c | 2 + security/keys/trusted.c | 2 +- sound/pci/hda/patch_realtek.c | 11 ++ sound/soc/codecs/cpcap.c | 12 +- sound/soc/codecs/cs42l56.c | 3 +- sound/usb/pcm.c | 2 +- tools/perf/tests/sample-parsing.c | 2 +- tools/perf/util/event.c | 2 + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 3 + 240 files changed, 1568 insertions(+), 737 deletions(-)

2 years, 9 months

11
276
0 0

[PATCH v2] drm/bridge: analogix_dp: Grab runtime PM reference for DP-AUX

by Brian Norris

If the display is not enable()d, then we aren't holding a runtime PM reference here. Thus, it's easy to accidentally cause a hang, if user space is poking around at /dev/drm_dp_aux0 at the "wrong" time. Let's get the panel and PM state right before trying to talk AUX. Fixes: 0d97ad03f422 ("drm/bridge: analogix_dp: Remove duplicated code") Cc: <stable(a)vger.kernel.org> Cc: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> Signed-off-by: Brian Norris <briannorris(a)chromium.org> --- Changes in v2: - Fix spelling in Subject - DRM_DEV_ERROR() -> drm_err() - Propagate errors from un-analogix_dp_prepare_panel() .../drm/bridge/analogix/analogix_dp_core.c | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index b7d2e4449cfa..6fc46ac93ef8 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1632,8 +1632,27 @@ static ssize_t analogix_dpaux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) { struct analogix_dp_device *dp = to_dp(aux); + int ret, ret2; - return analogix_dp_transfer(dp, msg); + ret = analogix_dp_prepare_panel(dp, true, false); + if (ret) { + drm_err(dp->drm_dev, "Failed to prepare panel (%d)\n", ret); + return ret; + } + + pm_runtime_get_sync(dp->dev); + ret = analogix_dp_transfer(dp, msg); + pm_runtime_put(dp->dev); + + ret2 = analogix_dp_prepare_panel(dp, false, false); + if (ret2) { + drm_err(dp->drm_dev, "Failed to unprepare panel (%d)\n", ret2); + /* Prefer the analogix_dp_transfer() error, if it exists. */ + if (!ret) + ret = ret2; + } + + return ret; } struct analogix_dp_device * -- 2.33.0.800.g4c38ced690-goog

2 years, 10 months

3
8
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror October 2021