4.19.21-stable review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 82/313 firmware/efi: Add NULL pointer checks in efivars API functions
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ]
Since commit:
ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
we have a device driver accessing the efivars API. Several functions in the efivars API assume __efivars is set, i.e., that they will be accessed only after efivars_register() has been called. However, the following NULL pointer access was reported calling efivar_entry_size() from the brcmfmac device driver:
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = 60bfa5f1 [00000008] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM ... Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events request_firmware_work_func PC is at efivar_entry_size+0x28/0x90 LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] pc : [<c0c40718>] lr : [<bf2a3ef4>] psr: a00d0113 sp : ede7fe28 ip : ee983410 fp : c1787f30 r10: 00000000 r9 : 00000000 r8 : bf2b2258 r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: ad16804a DAC: 00000051
Disassembly showed that the local static variable __efivars is NULL, which is not entirely unexpected given that it is a non-EFI platform.
So add a NULL pointer check to efivar_entry_size(), and to related functions while at it. In efivars_register() a couple of sanity checks are added as well.
--- drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 21 deletions(-)
drivers/firmware/efi/vars.c +78 -21
@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable);static efi_status_t check_var_size (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size)static efi_status_t check_var_size_nonblocking (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *),void *data,bool duplicates,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;unsigned long variable_name_size =1024 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;int err =0 ; +if (!__efivars) +return -EFAULT ; + + ops = __efivars->ops; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry)*/ int __efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -0 ,0 ,NULL ); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL );return efi_status_to_err (status); }
@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete);*/ int efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->set_variable (entry->var.VariableName, &entry->var.VendorGuid,0 ,0 ,NULL );
@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete);int efivar_entry_set (struct efivar_entry *entry,u32 attributes,unsigned long size,void *data,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;efi_char16_t *name = entry->var.VariableName;efi_guid_t vendor = entry->var.VendorGuid;if (down_interruptible (&efivars_lock))return -EINTR ; + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops;if (head &&efivar_entry_find (name, vendor, head, false)) {up (&efivars_lock);return -EEXIST ;
@@ -687,12 +715,17 @@ static int efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, u32 attributes, unsigned long size, void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_trylock (&efivars_lock))return -EBUSY ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + status =check_var_size_nonblocking (attributes, size +ucs2_strsize (name,1024 ));if (status !=EFI_SUCCESS ) {
@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,return -ENOSPC ; } + ops = __efivars->ops; status = ops->set_variable_nonblocking (name, &vendor, attributes, size, data);
@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,int efivar_entry_set_safe (efi_char16_t *name,efi_guid_t vendor,u32 attributes,bool block,unsigned long size,void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; +if (!__efivars) +return -EINVAL ; + + ops = __efivars->ops;if (!ops->query_variable_store)return -ENOSYS ;
@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find);*/ int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; *size =0 ;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->get_variable (entry->var.VariableName, &entry->var.VendorGuid,NULL , size,NULL );up (&efivars_lock);
@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size);int __efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);return efi_status_to_err (status); }
@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get);int efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);up (&efivars_lock);return efi_status_to_err (status);
@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get);int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes,unsigned long *size,void *data,bool *set) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_char16_t *name = entry->var.VariableName;efi_guid_t *vendor = &entry->var.VendorGuid;efi_status_t status;
@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { + err = -EINVAL ; + goto out; + } +/* * Ensure that the available space hasn't shrunk below the safe level */
@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, } } + ops = __efivars->ops; + status = ops->set_variable (name, vendor, attributes, *size, data);if (status !=EFI_SUCCESS ) { err =efi_status_to_err (status);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 89/313 ARM: dts: aspeed: add missing memory unit-address
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]
The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so '/memory' in the board files create a duplicate node. We're probably getting lucky that the bootloader fixes up the memory node that the kernel ends up using. Add the unit-address so it's merged with the base node.
Found with DT json-schema checks.
--- arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -2
@@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
@@ -322,4 +322,3 @@ &adc { status = "okay"; }; -
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +1 -1
@@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 90/313 x86/fpu: Add might_fault() to user_insn()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ]
Every user of user_insn() passes an user memory pointer to this macro.
Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed.
[ bp: Space it out to make it more visible. ]
--- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/fpu/internal.h +3 -0
@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 291/313 futex: Handle early deadlock return correctly
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 1a1fb985f2e2b85ec0d3dc2e519ee48389ec2434 upstream.
commit 56222b212e8e ("futex: Drop hb->lock before enqueueing on the rtmutex") changed the locking rules in the futex code so that the hash bucket lock is not longer held while the waiter is enqueued into the rtmutex wait list. This made the lock and the unlock path symmetric, but unfortunately the possible early exit from __rt_mutex_proxy_start() due to a detected deadlock was not updated accordingly. That allows a concurrent unlocker to observe inconsitent state which triggers the warning in the unlock path.
futex_lock_pi() futex_unlock_pi()
lock(hb->lock)
queue(hb_waiter) lock(hb->lock)
lock(rtmutex->wait_lock)
unlock(hb->lock)
// acquired hb->lock
hb_waiter = futex_top_waiter()
lock(rtmutex->wait_lock)
__rt_mutex_proxy_start()
---> fail
remove(rtmutex_waiter);
---> returns -EDEADLOCK
unlock(rtmutex->wait_lock)
// acquired wait_lock
wake_futex_pi()
rt_mutex_next_owner()
--> returns NULL
--> WARN lock(hb->lock)
unqueue(hb_waiter)
The problem is caused by the remove(rtmutex_waiter) in the failure case of __rt_mutex_proxy_start() as this lets the unlocker observe a waiter in the hash bucket but no waiter on the rtmutex, i.e. inconsistent state.
The original commit handles this correctly for the other early return cases (timeout, signal) by delaying the removal of the rtmutex waiter until the returning task reacquired the hash bucket lock.
Treat the failure case of __rt_mutex_proxy_start() in the same way and let the existing cleanup code handle the eventual handover of the rtmutex gracefully. The regular rt_mutex_proxy_start() gains the rtmutex waiter removal for the failure case, so that the other callsites are still operating correctly.
Add proper comments to the code so all these details are fully documented.
Thanks to Peter for helping with the analysis and writing the really valuable code comments.
--- kernel/futex.c | 28 ++++++++++++++++++---------- kernel/locking/rtmutex.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 50 insertions(+), 15 deletions(-)
kernel/futex.c +18 -10
@@ -2850,35 +2850,39 @@ retry_private:* and BUG when futex_unlock_pi() interleaves with this. * * Therefore acquire wait_lock while holding hb->lock, but drop the -* latter before calling rt_mutex_start_proxy_lock(). This still fully -* serializes against futex_unlock_pi() as that does the exact same -* lock handoff sequence. +* latter before calling __rt_mutex_start_proxy_lock(). This +* interleaves with futex_unlock_pi() -- which does a similar lock +* handoff -- such that the latter can observe the futex_q::pi_state +* before __rt_mutex_start_proxy_lock() is done. */ raw_spin_lock_irq (&q.pi_state->pi_mutex.wait_lock);spin_unlock (q.lock_ptr); +/* +* __rt_mutex_start_proxy_lock() unconditionally enqueues the @rt_waiter +* such that futex_unlock_pi() is guaranteed to observe the waiter when +* it sees the futex_q::pi_state. +*/ ret =__rt_mutex_start_proxy_lock (&q.pi_state->pi_mutex, &rt_waiter, current);raw_spin_unlock_irq (&q.pi_state->pi_mutex.wait_lock);if (ret) {if (ret ==1 ) ret =0 ; - -spin_lock (q.lock_ptr); - goto no_block; + goto cleanup; } -if (unlikely (to))hrtimer_start_expires (&to->timer,HRTIMER_MODE_ABS ); ret =rt_mutex_wait_proxy_lock (&q.pi_state->pi_mutex, to, &rt_waiter); +cleanup:spin_lock (q.lock_ptr);/* -* If we failed to acquire the lock (signal/timeout), we must +* If we failed to acquire the lock (deadlock/signal/timeout), we must * first acquire the hb->lock before removing the lock from the -* rt_mutex waitqueue, such that we can keep the hb and rt_mutex -* wait lists consistent. +* rt_mutex waitqueue, such that we can keep the hb and rt_mutex wait +* lists consistent. * * In particular; it is important that futex_unlock_pi() can not * observe this inconsistency.
@@ -3002,6 +3006,10 @@ retry:* there is no point where we hold neither; and therefore * wake_futex_pi() must observe a state consistent with what we * observed. +* +* In particular; this forces __rt_mutex_start_proxy() to +* complete such that we're guaranteed to observe the +* rt_waiter. Also see the WARN in wake_futex_pi(). */ raw_spin_lock_irq (&pi_state->pi_mutex.wait_lock);spin_unlock (&hb->lock);
kernel/locking/rtmutex.c +32 -5
@@ -1726,12 +1726,33 @@ void rt_mutex_proxy_unlock(struct rt_mutrt_mutex_set_owner (lock,NULL ); } +/** +* __rt_mutex_start_proxy_lock() - Start lock acquisition for another task +* @lock: the rt_mutex to take +* @waiter: the pre-initialized rt_mutex_waiter +* @task: the task to prepare +* +* Starts the rt_mutex acquire; it enqueues the @waiter and does deadlock +* detection. It does not wait, see rt_mutex_wait_proxy_lock() for that. +* +* NOTE: does _NOT_ remove the @waiter on failure; must either call +* rt_mutex_wait_proxy_lock() or rt_mutex_cleanup_proxy_lock() after this. +* +* Returns: +* 0 - task blocked on lock +* 1 - acquired the lock for task, caller should wake it up +* <0 - error +* +* Special API call for PI-futex support. +*/ int __rt_mutex_start_proxy_lock (struct rt_mutex *lock,struct rt_mutex_waiter *waiter,struct task_struct *task) {int ret; +lockdep_assert_held (&lock->wait_lock); +if (try_to_take_rt_mutex (lock, task,NULL ))return 1 ;
@@ -1749,9 +1770,6 @@ int __rt_mutex_start_proxy_lock(struct r ret =0 ; } -if (unlikely (ret)) -remove_waiter (lock, waiter); -debug_rt_mutex_print_deadlock (waiter);return ret;
@@ -1763,12 +1781,18 @@ int __rt_mutex_start_proxy_lock(struct r* @waiter: the pre-initialized rt_mutex_waiter * @task: the task to prepare * +* Starts the rt_mutex acquire; it enqueues the @waiter and does deadlock +* detection. It does not wait, see rt_mutex_wait_proxy_lock() for that. +* +* NOTE: unlike __rt_mutex_start_proxy_lock this _DOES_ remove the @waiter +* on failure. +* * Returns: * 0 - task blocked on lock * 1 - acquired the lock for task, caller should wake it up * <0 - error * -* Special API call for FUTEX_REQUEUE_PI support. +* Special API call for PI-futex support. */ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, struct rt_mutex_waiter *waiter,
@@ -1778,6 +1802,8 @@ int rt_mutex_start_proxy_lock(struct rt_raw_spin_lock_irq (&lock->wait_lock); ret =__rt_mutex_start_proxy_lock (lock, waiter, task); +if (unlikely (ret)) +remove_waiter (lock, waiter);raw_spin_unlock_irq (&lock->wait_lock);return ret;
@@ -1845,7 +1871,8 @@ int rt_mutex_wait_proxy_lock(struct rt_m* @lock: the rt_mutex we were woken on * @waiter: the pre-initialized rt_mutex_waiter * -* Attempt to clean up after a failed rt_mutex_wait_proxy_lock(). +* Attempt to clean up after a failed __rt_mutex_start_proxy_lock() or +* rt_mutex_wait_proxy_lock(). * * Unless we acquired the lock; we're still enqueued on the wait-list and can * in fact still be granted ownership until we're removed. Therefore we can
Greg Kroah-Hartman
maintainerPATCH 303/313 cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Poimboeuf <[email protected]>
commit b284909abad48b07d3071a9fc9b5692b3e64914b upstream.
With the following commit:
73d5e2b47264 ("cpu/hotplug: detect SMT disabled by BIOS")
... the hotplug code attempted to detect when SMT was disabled by BIOS, in which case it reported SMT as permanently disabled. However, that code broke a virt hotplug scenario, where the guest is booted with only primary CPU threads, and a sibling is brought online later.
The problem is that there doesn't seem to be a way to reliably distinguish between the HW "SMT disabled by BIOS" case and the virt "sibling not yet brought online" case. So the above-mentioned commit was a bit misguided, as it permanently disabled SMT for both cases, preventing future virt sibling hotplugs.
Going back and reviewing the original problems which were attempted to be solved by that commit, when SMT was disabled in BIOS:
1) /sys/devices/system/cpu/smt/control showed "on" instead of "notsupported"; and
2) vmx_vm_init() was incorrectly showing the L1TF_MSG_SMT warning.
I'd propose that we instead consider #1 above to not actually be a problem. Because, at least in the virt case, it's possible that SMT wasn't disabled by BIOS and a sibling thread could be brought online later. So it makes sense to just always default the smt control to "on" to allow for that possibility (assuming cpuid indicates that the CPU supports SMT).
The real problem is #2, which has a simple fix: change vmx_vm_init() to query the actual current SMT state -- i.e., whether any siblings are currently online -- instead of looking at the SMT "control" sysfs value.
So fix it by:
a) reverting the original "fix" and its followup fix:
73d5e2b47264 ("cpu/hotplug: detect SMT disabled by BIOS") bc2d8d262cba ("cpu/hotplug: Fix SMT supported evaluation")
and
b) changing vmx_vm_init() to query the actual current SMT state -- instead of the sysfs control value -- to determine whether the L1TF warning is needed. This also requires the 'sched_smt_present' variable to exported, instead of 'cpu_smt_control'.
--- arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kvm/vmx.c | 3 ++- include/linux/cpu.h | 2 -- kernel/cpu.c | 33 ++++----------------------------- kernel/sched/fair.c | 1 + kernel/smp.c | 2 -- 6 files changed, 8 insertions(+), 35 deletions(-)
arch/x86/kernel/cpu/bugs.c +1 -1
@@ -69,7 +69,7 @@ void __init check_bugs(void)* identify_boot_cpu() initialized SMT support information, let the * core code know. */ -cpu_smt_check_topology_early (); +cpu_smt_check_topology ();if (!IS_ENABLED (CONFIG_SMP )) {pr_info ("CPU: " );
arch/x86/kvm/vmx.c +2 -1
@@ -27,6 +27,7 @@#include <linux/mm.h> #include <linux/highmem.h> #include <linux/sched.h> +#include <linux/sched/smt.h> #include <linux/moduleparam.h> #include <linux/mod_devicetable.h> #include <linux/trace_events.h>
@@ -11129,7 +11130,7 @@ static int vmx_vm_init(struct kvm *kvm)* Warn upon starting the first VM in a potentially * insecure environment. */ -if (cpu_smt_control ==CPU_SMT_ENABLED ) +if (sched_smt_active ())pr_warn_once (L1TF_MSG_SMT );if (l1tf_vmx_mitigation ==VMENTER_L1D_FLUSH_NEVER )pr_warn_once (L1TF_MSG_L1D );
include/linux/cpu.h +0 -2
@@ -180,12 +180,10 @@ enum cpuhp_smt_control {#if defined(CONFIG_SMP ) && defined(CONFIG_HOTPLUG_SMT )extern enum cpuhp_smt_control cpu_smt_control;extern void cpu_smt_disable (bool force); -extern void cpu_smt_check_topology_early (void );extern void cpu_smt_check_topology (void );#else # define cpu_smt_control (CPU_SMT_ENABLED)static inline void cpu_smt_disable (bool force) { } -static inline void cpu_smt_check_topology_early (void ) { }static inline void cpu_smt_check_topology (void ) { }#endif
kernel/cpu.c +4 -29
@@ -355,9 +355,6 @@ void __weak arch_smt_update(void) { }#ifdef CONFIG_HOTPLUG_SMT enum cpuhp_smt_control cpu_smt_control__read_mostly =CPU_SMT_ENABLED ; -EXPORT_SYMBOL_GPL (cpu_smt_control); - -static bool cpu_smt_available__read_mostly ;void __init cpu_smt_disable (bool force) {
@@ -375,25 +372,11 @@ void __init cpu_smt_disable(bool force)/* * The decision whether SMT is supported can only be done after the full -* CPU identification. Called from architecture code before non boot CPUs -* are brought up. -*/ -void __init cpu_smt_check_topology_early (void ) -{ -if (!topology_smt_supported ()) - cpu_smt_control =CPU_SMT_NOT_SUPPORTED ; -} - -/* -* If SMT was disabled by BIOS, detect it here, after the CPUs have been -* brought online. This ensures the smt/l1tf sysfs entries are consistent -* with reality. cpu_smt_available is set to true during the bringup of non -* boot CPUs when a SMT sibling is detected. Note, this may overwrite -* cpu_smt_control's previous setting. +* CPU identification. Called from architecture code. */ void __init cpu_smt_check_topology (void ) { -if (!cpu_smt_available) +if (!topology_smt_supported ()) cpu_smt_control =CPU_SMT_NOT_SUPPORTED ; }
@@ -406,18 +389,10 @@ early_param("nosmt", smt_cmdline_disablestatic inline bool cpu_smt_allowed (unsigned int cpu) { -if (topology_is_primary_thread (cpu)) +if (cpu_smt_control ==CPU_SMT_ENABLED )return true; -/* -* If the CPU is not a 'primary' thread and the booted_once bit is -* set then the processor has SMT support. Store this information -* for the late check of SMT support in cpu_smt_check_topology(). -*/ -if (per_cpu (cpuhp_state, cpu).booted_once) - cpu_smt_available = true; - -if (cpu_smt_control ==CPU_SMT_ENABLED ) +if (topology_is_primary_thread (cpu))return true;/*
kernel/sched/fair.c +1 -0
@@ -5932,6 +5932,7 @@ static inline int find_idlest_cpu(struct#ifdef CONFIG_SCHED_SMT DEFINE_STATIC_KEY_FALSE (sched_smt_present); +EXPORT_SYMBOL_GPL (sched_smt_present);static inline void set_idle_cores (int cpu,int val) {
kernel/smp.c +0 -2
@@ -584,8 +584,6 @@ void __init smp_init(void) num_nodes, (num_nodes >1 ?"s" :"" ), num_cpus, (num_cpus > 1 ? "s" : "")); -/* Final decision about SMT support */ -cpu_smt_check_topology ();/* Any cleanup work */ smp_cpus_done (setup_max_cpus); }
Greg Kroah-Hartman
maintainerPATCH 1/313 devres: Align data[] to ARCH_KMALLOC_MINALIGN
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Brodkin <[email protected]>
commit a66d972465d15b1d89281258805eb8b47d66bd36 upstream.
Initially we bumped into problem with 32-bit aligned atomic64_t on ARC, see [1]. And then during quite lengthly discussion Peter Z. mentioned ARCH_KMALLOC_MINALIGN which IMHO makes perfect sense. If allocation is done by plain kmalloc() obtained buffer will be ARCH_KMALLOC_MINALIGN aligned and then why buffer obtained via devm_kmalloc() should have any other alignment?
This way we at least get the same behavior for both types of allocation.
[1] http://lists.infradead.org/pipermail/linux-snps-arc/2018-July/004009.html
[2] http://lists.infradead.org/pipermail/linux-snps-arc/2018-July/004036.html
--- drivers/base/devres.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/base/devres.c +8 -2
@@ -24,8 +24,14 @@ struct devres_node {struct devres {struct devres_node node; -/* -- 3 pointers */ -unsigned long long data[];/* guarantee ull alignment */ +/* +* Some archs want to perform DMA into kmalloc caches +* and need a guaranteed alignment larger than +* the alignment of a 64-bit integer. +* Thus we use ARCH_KMALLOC_MINALIGN here and get exactly the same +* buffer alignment as if it was allocated by plain kmalloc(). +*/ +u8 __aligned(ARCH_KMALLOC_MINALIGN) data[]; };struct devres_group {
Greg Kroah-Hartman
maintainerPATCH 10/313 gpu: ipu-v3: image-convert: Prevent race between run and unprepare
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 819bec35c8c9706185498c9222bd244e0781ad35 ]
Prevent possible race by parallel threads between ipu_image_convert_run() and ipu_image_convert_unprepare(). This involves setting ctx->aborting to true unconditionally so that no new job runs can be queued during unprepare, and holding the ctx->aborting flag until the context is freed.
Note that the "normal" ipu_image_convert_abort() case (e.g. not during context unprepare) should clear the ctx->aborting flag after aborting any active run and clearing the context's pending queue. This is because it should be possible to continue to use the conversion context and queue more runs after an abort.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +7 -3
@@ -1524,7 +1524,7 @@ unlock:EXPORT_SYMBOL_GPL (ipu_image_convert_queue);/* Abort any active or pending conversions for this context */ -void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +static void __ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) {struct ipu_image_convert_chan *chan = ctx->chan;struct ipu_image_convert_priv *priv = chan->priv;
@@ -1551,7 +1551,7 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) need_abort = (run_count || active_run); - ctx->aborting = need_abort; + ctx->aborting = true;spin_unlock_irqrestore (&chan->irqlock, flags);
@@ -1572,7 +1572,11 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx)dev_warn (priv->ipu->dev,"%s: timeout\n" , __func__);force_abort (ctx); } +} +void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +{ +__ipu_image_convert_abort (ctx); ctx->aborting = false; }EXPORT_SYMBOL_GPL (ipu_image_convert_abort);
@@ -1586,7 +1590,7 @@ void ipu_image_convert_unprepare(struct ipu_image_convert_ctx *ctx)bool put_res;/* make sure no runs are hanging around */ -ipu_image_convert_abort (ctx); +__ipu_image_convert_abort (ctx);dev_dbg (priv->ipu->dev,"%s: task %u: removing ctx %p\n" , __func__, chan->ic_task, ctx);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 11/313 nds32: Fix gcc 8.0 compiler option incompatible.
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4c3d6174e0e17599549f636ec48ddf78627a17fe ]
When the kernel configs of ftrace and frame pointer options are
choosed, the compiler option of kernel will incompatible.
Error message:
nds32le-linux-gcc: error: -pg and -fomit-frame-pointer are incompatible
--- arch/nds32/mm/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/nds32/mm/Makefile +5 -1
@@ -4,4 +4,8 @@ obj-y := extable.o tlb.o \ obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o -CFLAGS_proc-n13.o += -fomit-frame-pointer + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE) +endif +CFLAGS_proc.o += -fomit-frame-pointer
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 12/313 wil6210: fix reset flow for Talyn-mb
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d083b2e2b7db5cca1791643d036e6597af27f49b ]
With current reset flow, Talyn sometimes get stuck causing PCIe enumeration to fail. Fix this by removing some reset flow operations that are not relevant for Talyn.
Setting bit 15 in RGF_HP_CTRL is WBE specific and is not in use for all wil6210 devices.
For Sparrow, BIT_HPAL_PERST_FROM_PAD and BIT_CAR_PERST_RST were set as a WA an HW issue.
--- drivers/net/wireless/ath/wil6210/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +7 -4
@@ -995,10 +995,13 @@ static int wil_target_reset(struct wil6210_priv *wil, int no_flash)wil_dbg_misc (wil,"Resetting \"%s\"...\n" , wil->hw_name); -/* Clear MAC link up */ -wil_s (wil,RGF_HP_CTRL ,BIT (15 )); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_HPAL_PERST_FROM_PAD ); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); +if (wil->hw_version <HW_VER_TALYN ) { +/* Clear MAC link up */ +wil_s (wil,RGF_HP_CTRL ,BIT (15 )); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 , +BIT_HPAL_PERST_FROM_PAD ); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); + }wil_halt_cpu (wil);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 13/313 wil6210: fix memory leak in wil_find_tx_bcast_2
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 664497400c89a4d40aee51bcf48bbd2e4dc71104 ]
A successful call to wil_tx_ring takes skb reference so it will only be freed in wil_tx_complete. Consume the skb in wil_find_tx_bcast_2 to prevent memory leak.
--- drivers/net/wireless/ath/wil6210/txrx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/wil6210/txrx.c +2 -0
@@ -1313,6 +1313,8 @@ found:wil_dbg_txrx (wil,"BCAST DUP -> ring %d\n" , i);wil_set_da_for_vring (wil, skb2, i);wil_tx_ring (wil, vif, v2, skb2); +/* successful call to wil_tx_ring takes skb2 ref */ +dev_kfree_skb_any (skb2); }else {wil_err (wil,"skb_copy failed\n" ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 14/313 ath10k: assign n_cipher_suites for WCN3990
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2bd345cd2bfc0bd44528896313c0b45f087bdf67 ]
Commit 2ea9f12cefe4 ("ath10k: add new cipher suite support") added a new n_cipher_suites HW param with a fallback value and a warning log. Commit 03a72288c546 ("ath10k: wmi: add hw params entry for wcn3990") later added WCN3990 HW entries, but it missed the n_cipher_suites.
Rather than seeing this warning every boot
ath10k_snoc 18800000.wifi: invalid hw_params.n_cipher_suites 0
let's provide the appropriate value.
--- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/core.c +1 -0
@@ -532,6 +532,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .hw_ops = &wcn3990_ops, .decap_align_bytes = 1, .num_peers = TARGET_HL_10_TLV_NUM_PEERS, + .n_cipher_suites = 8, .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT, .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES, .target_64bit = true,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 15/313 ath9k: dynack: use authentication messages for late ack
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link
--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/dynack.c +2 -1
@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 17/313 scsi: mpt3sas: Call sas_remove_host before removing the target devices
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ]
Call sas_remove_host() before removing the target devices in the driver's .remove() callback function(i.e. during driver unload time). So that driver can provide a way to allow SYNC CACHE, START STOP unit commands etc. (which are issued from SML) to the target drives during driver unload time.
Once sas_remove_host() is called before removing the target drives then driver can just clean up the resources allocated for target devices and no need to call sas_port_delete_phy(), sas_port_delete() API's as these API's internally called from sas_remove_host().
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -9809,6 +9809,7 @@ static void scsih_remove(struct pci_dev *pdev)/* release all the volumes */ _scsih_ir_shutdown (ioc); +sas_remove_host (shost);list_for_each_entry_safe (raid_device, next, &ioc->raid_device_list, list) {if (raid_device->starget) {
@@ -9851,7 +9852,6 @@ static void scsih_remove(struct pci_dev *pdev) ioc->sas_hba.num_phys =0 ; } -sas_remove_host (shost);mpt3sas_base_detach (ioc);spin_lock (&gioc_lock);list_del (&ioc->list);
drivers/scsi/mpt3sas/mpt3sas_transport.c +5 -2
@@ -834,10 +834,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, mpt3sas_port->remote_identify.sas_address, mpt3sas_phy->phy_id); mpt3sas_phy->phy_belongs_to_port =0 ; -sas_port_delete_phy (mpt3sas_port->port, mpt3sas_phy->phy); +if (!ioc->remove_host) +sas_port_delete_phy (mpt3sas_port->port, + mpt3sas_phy->phy);list_del (&mpt3sas_phy->port_siblings); } -sas_port_delete (mpt3sas_port->port); +if (!ioc->remove_host) +sas_port_delete (mpt3sas_port->port);kfree (mpt3sas_port); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 18/313 scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ]
After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to re-establish the login. An nlp_type check in the LOGO completion handler failed to restart discovery for NVME targets. Revised the nlp_type check for NVME as well as SCSI.
While reviewing the LOGO handling a few other issues were seen and were addressed:
- Better lock synchronization around ndlp data types
- When the ABTS times out, unregister the RPI before sending the LOGO so that all local exchange contexts are cleared and nothing received while awaiting LOGO/PLOGI handling will be accepted.
- LOGO handling optimized to:
Wait only R_A_TOV for a response.
It doesn't need to be retried on timeout. If there wasn't a
response, a PLOGI will be sent, thus an implicit logout applies as well when the other port sees it.
If there is a response, any kind of response is considered "good"
and the XRI quarantined for a exchange qualifier window.
- PLOGI is issued as soon a LOGO state is resolved.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +21 -28
@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, icmd->ulpCommand =CMD_ELS_REQUEST64_CR ;if (elscmd ==ELS_CMD_FLOGI ) icmd->ulpTimeout =FF_DEF_RATOV *2 ; +else if (elscmd ==ELS_CMD_LOGO ) + icmd->ulpTimeout = phba->fc_ratov;else icmd->ulpTimeout = phba->fc_ratov *2 ; }else {
@@ -2682,16 +2684,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* The LOGO will not be retried on failure. A LOGO was +* issued to the remote rport and a ACC or RJT or no Answer are +* all acceptable. Note the failure and move forward with +* discovery. The PLOGI will retry. +*/ if (irsp->ulpStatus) { -/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { -/* ELS command is being retried */ - skip_recovery =1 ; - goto out; - }/* LOGO failed */ lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"2756 LOGO failure DID:%06X Status:x%x/x%x\n" , +"2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n" , ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ]);/* Do not call DSM for lpfc_els_abort'ed ELS cmds */
@@ -2737,7 +2738,8 @@ out:* For any other port type, the rpi is unregistered as an implicit * LOGO. */ -if ((ndlp->nlp_type &NLP_FCP_TARGET ) && (skip_recovery ==0 )) { +if (ndlp->nlp_type & (NLP_FCP_TARGET |NLP_NVME_TARGET ) && + skip_recovery ==0 ) {lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;
@@ -2770,6 +2772,8 @@ out:* will be stored into the context1 field of the IOCB for the completion * callback function to the LOGO ELS command. * +* Callers of this routine are expected to unregister the RPI first +* * Return code * 0 - successfully issued logo * 1 - failed to issue logo
@@ -2811,22 +2815,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue LOGO: did:x%x" , ndlp->nlp_DID, 0, 0); -/* -* If we are issuing a LOGO, we may try to recover the remote NPort -* by issuing a PLOGI later. Even though we issue ELS cmds by the -* VPI, if we have a valid RPI, and that RPI gets unreg'ed while -* that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI -* for that ELS cmd. To avoid this situation, lets get rid of the -* RPI right now, before any ELS cmds are sent. -*/ -spin_lock_irq (shost->host_lock); - ndlp->nlp_flag |=NLP_ISSUE_LOGO ; -spin_unlock_irq (shost->host_lock); -if (lpfc_unreg_rpi (vport, ndlp)) { -lpfc_els_free_iocb (phba, elsiocb); -return 0 ; - } - phba->fc_stat.elsXmitLOGO++; elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;spin_lock_irq (shost->host_lock);
@@ -2834,7 +2822,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (shost->host_lock); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;
@@ -2842,6 +2829,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_els_free_iocb (phba, elsiocb);return 1 ; } + +spin_lock_irq (shost->host_lock); + ndlp->nlp_prev_state = ndlp->nlp_state; +spin_unlock_irq (shost->host_lock); +lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; }
@@ -9505,7 +9497,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, "rport in state 0x%x\n", ndlp->nlp_state);return ; } - lpfc_printf_log(phba, KERN_INFO, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, + LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, "3094 Start rport recovery on shost id 0x%x " "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " "flags 0x%x\n",
@@ -9518,8 +9511,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,*/ spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE ; + ndlp->nlp_flag |=NLP_ISSUE_LOGO ;spin_unlock_irqrestore (shost->host_lock, flags); -lpfc_issue_els_logo (vport, ndlp,0 ); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE ); +lpfc_unreg_rpi (vport, ndlp); }
drivers/scsi/lpfc/lpfc_nportdisc.c +5 -0
@@ -836,7 +836,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if (!(ndlp->nlp_flag &NLP_RPI_REGISTERED )) { +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);return 0 ; }
@@ -851,7 +853,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)return 1 ; } } + +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);lpfc_unreg_rpi (vport, ndlp);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 20/313 clk: boston: fix possible memory leak in clk_boston_setup()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ]
Smatch report warnings:drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell'
'onecell' is malloced in clk_boston_setup(), but not be freed before leaving from the error handling cases.
--- drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clk/imgtec/clk-boston.c +8 -3
@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) hw =clk_hw_register_fixed_rate (NULL ,"input" ,NULL ,0 , in_freq);if (IS_ERR (hw)) {pr_err ("failed to register input clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_INPUT ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"sys" ,"input" ,0 , sys_freq);if (IS_ERR (hw)) {pr_err ("failed to register sys clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_SYS ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"cpu" ,"input" ,0 , cpu_freq);if (IS_ERR (hw)) {pr_err ("failed to register cpu clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_CPU ] = hw; err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, onecell);if (err)pr_err ("failed to add DT provider: %d\n" , err); + +return ; + +error: +kfree (onecell); }/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 21/313 dlm: Dont swamp the CPU with callbacks queued during recovery
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]
Before this patch, recovery would cause all callbacks to be delayed, put on a queue, and afterward they were all queued to the callback work queue. This patch does the same thing, but occasionally takes a break after 25 of them so it won't swamp the CPU at the expense of other RT processes like corosync.
--- fs/dlm/ast.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/dlm/ast.c +10 -0
@@ -292,6 +292,8 @@ void dlm_callback_suspend(struct dlm_ls *ls)flush_workqueue (ls->ls_callback_wq); } +#define MAX_CB_QUEUE 25 +void dlm_callback_resume (struct dlm_ls *ls) {struct dlm_lkb *lkb, *safe;
@@ -302,15 +304,23 @@ void dlm_callback_resume(struct dlm_ls *ls)if (!ls->ls_callback_wq)return ; +more:mutex_lock (&ls->ls_cb_mutex);list_for_each_entry_safe (lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {list_del_init (&lkb->lkb_cb_list);queue_work (ls->ls_callback_wq, &lkb->lkb_cb_work); count++; +if (count ==MAX_CB_QUEUE ) +break ; }mutex_unlock (&ls->ls_cb_mutex);if (count)log_rinfo (ls,"dlm_callback_resume %d" , count); +if (count ==MAX_CB_QUEUE ) { + count =0 ; +cond_resched (); + goto more; + } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 4/313 drm/vgem: Fix vgem_init to get drm device available.
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ]
Modify vgem_init to take platform dev as parent in drm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.
v2: rebase, address checkpatch typo and line over 80 characters
--- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +8 -8
@@ -471,31 +471,31 @@ static int __init vgem_init(void)if (!vgem_device)return -ENOMEM ; - ret =drm_dev_init (&vgem_device->drm, &vgem_driver,NULL ); -if (ret) - goto out_free; - vgem_device->platform =platform_device_register_simple ("vgem" ,-1 ,NULL ,0 );if (IS_ERR (vgem_device->platform)) { ret =PTR_ERR (vgem_device->platform); - goto out_fini; + goto out_free; }dma_coerce_mask_and_coherent (&vgem_device->platform->dev,DMA_BIT_MASK (64 )); + ret =drm_dev_init (&vgem_device->drm, &vgem_driver, + &vgem_device->platform->dev); +if (ret) + goto out_unregister;/* Final step: expose the device/driver to userspace */ ret =drm_dev_register (&vgem_device->drm,0 );if (ret) - goto out_unregister; + goto out_fini;return 0 ; -out_unregister: -platform_device_unregister (vgem_device->platform); out_fini:drm_dev_fini (&vgem_device->drm); +out_unregister: +platform_device_unregister (vgem_device->platform); out_free:kfree (vgem_device);return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 5/313 pinctrl: bcm2835: Use raw spinlock for RT compatibility
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3c7b30f704b6f5e53eed6bf89cf2c8d1b38b02c0 ]
The BCM2835 pinctrl driver acquires a spinlock in its ->irq_enable, ->irq_disable and ->irq_set_type callbacks. Spinlocks become sleeping locks with CONFIG_PREEMPT_RT_FULL=y, therefore invocation of one of the callbacks in atomic context may cause a hard lockup if at least two GPIO pins in the same bank are used as interrupts. The issue doesn't occur with just a single interrupt pin per bank because the lock is never contended. I'm experiencing such lockups with GPIO 8 and 28 used as level-triggered interrupts, i.e. with ->irq_disable being invoked on reception of every IRQ.
The critical section protected by the spinlock is very small (one bitop and one RMW of an MMIO register), hence converting to a raw spinlock seems a better trade-off than converting the driver to threaded IRQ handling (which would increase latency to handle an interrupt).
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +8 -8
@@ -90,7 +90,7 @@ struct bcm2835_pinctrl {struct gpio_chip gpio_chip;struct pinctrl_gpio_range gpio_range; -spinlock_t irq_lock[BCM2835_NUM_BANKS ]; +raw_spinlock_t irq_lock[BCM2835_NUM_BANKS ]; };/* pins are just named GPIO0..GPIO53 */
@@ -461,10 +461,10 @@ static void bcm2835_gpio_irq_enable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);set_bit (offset, &pc->enabled_irq_map[bank]);bcm2835_gpio_irq_config (pc, gpio, true); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); }static void bcm2835_gpio_irq_disable (struct irq_data *data)
@@ -476,12 +476,12 @@ static void bcm2835_gpio_irq_disable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);bcm2835_gpio_irq_config (pc, gpio, false);/* Clear events that were latched prior to clearing event sources */ bcm2835_gpio_set_bit (pc,GPEDS0 , gpio);clear_bit (offset, &pc->enabled_irq_map[bank]); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); } static int __bcm2835_gpio_irq_set_type_disabled(struct bcm2835_pinctrl *pc,
@@ -584,7 +584,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)unsigned long flags;int ret; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);if (test_bit (offset, &pc->enabled_irq_map[bank])) ret =__bcm2835_gpio_irq_set_type_enabled (pc, gpio, type);
@@ -596,7 +596,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)else irq_set_handler_locked (data, handle_level_irq); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags);return ret; }
@@ -1047,7 +1047,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)for_each_set_bit (offset, &events,32 )bcm2835_gpio_wr (pc,GPEDS0 + i *4 ,BIT (offset)); -spin_lock_init (&pc->irq_lock[i]); +raw_spin_lock_init (&pc->irq_lock[i]); } err =gpiochip_add_data (&pc->gpio_chip, pc);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 7/313 gpiolib: Fix possible use after free on label
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 18534df419041e6c1f4b41af56ee7d41f757815c ]
gpiod_request_commit() copies the pointer to the label passed as an argument only to be used later. But there's a chance the caller could immediately free the passed string(e.g., local variable). This could trigger a use after free when we use gpio label(e.g., gpiochip_unlock_as_irq(), gpiochip_is_requested()).
To be on the safe side: duplicate the string with kstrdup_const() so that if an unaware user passes an address to a stack-allocated buffer, we won't get the arbitrary label.
Also fix gpiod_set_consumer_name().
--- drivers/gpio/gpiolib.c | 25 +++++++++++++++++++++---- include/linux/gpio/consumer.h | 6 ++++-- 2 files changed, 25 insertions(+), 6 deletions(-)
drivers/gpio/gpiolib.c +21 -4
@@ -2279,6 +2279,12 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)unsigned long flags;unsigned offset; +if (label) { + label =kstrdup_const (label,GFP_KERNEL ); +if (!label) +return -ENOMEM ; + } +spin_lock_irqsave (&gpio_lock, flags);/* NOTE: gpio_request() can be called in early boot,
@@ -2289,6 +2295,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)desc_set_label (desc, label ? :"?" ); status =0 ; }else { +kfree_const (label); status = -EBUSY ; goto done; }
@@ -2305,6 +2312,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)if (status <0 ) {desc_set_label (desc,NULL ); +kfree_const (label);clear_bit (FLAG_REQUESTED , &desc->flags); goto done; }
@@ -2400,6 +2408,7 @@ static bool gpiod_free_commit(struct gpio_desc *desc) chip->free (chip,gpio_chip_hwgpio (desc));spin_lock_irqsave (&gpio_lock, flags); } +kfree_const (desc->label);desc_set_label (desc,NULL );clear_bit (FLAG_ACTIVE_LOW , &desc->flags);clear_bit (FLAG_REQUESTED , &desc->flags);
@@ -3221,11 +3230,19 @@ EXPORT_SYMBOL_GPL(gpiod_cansleep);* @desc: gpio to set the consumer name on * @name: the new consumer name */ -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) { -VALIDATE_DESC_VOID (desc); -/* Just overwrite whatever the previous name was */ - desc->label = name; +VALIDATE_DESC (desc); +if (name) { + name =kstrdup_const (name,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + } + +kfree_const (desc->label); +desc_set_label (desc, name); + +return 0 ; }EXPORT_SYMBOL_GPL (gpiod_set_consumer_name);
include/linux/gpio/consumer.h +4 -2
@@ -142,7 +142,7 @@ int gpiod_is_active_low(const struct gpio_desc *desc);int gpiod_cansleep (const struct gpio_desc *desc);int gpiod_to_irq (const struct gpio_desc *desc); -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name); +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name);/* Convert between the old gpio_ and new gpiod_ interfaces */ struct gpio_desc *gpio_to_desc (unsigned gpio);
@@ -465,10 +465,12 @@ static inline int gpiod_to_irq(const struct gpio_desc *desc)return -EINVAL ; } -static inline void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +static inline int gpiod_set_consumer_name (struct gpio_desc *desc, +const char *name) {/* GPIO can never have been requested */ WARN_ON (1 ); +return -EINVAL ; }static inline struct gpio_desc *gpio_to_desc (unsigned gpio)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 8/313 drm/sun4i: Initialize registers in tcon-top driver
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c96d62215fb540e2ae61de44cb7caf4db50958e3 ]
It turns out that TCON TOP registers in H6 SoC have non-zero reset value. This may cause issues if bits are not changed during configuration.
To prevent that, initialize registers to 0.
--- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +7 -0
@@ -168,6 +168,13 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, goto err_assert_reset; } +/* +* At least on H6, some registers have some bits set by default +* which may cause issues. Clear them here. +*/ +writel (0 , regs +TCON_TOP_PORT_SEL_REG ); +writel (0 , regs +TCON_TOP_GATE_SRC_REG ); +/* * TCON TOP has two muxes, which select parent clock for each TCON TV * channel clock. Parent could be either TCON TV or TVE clock. For now
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 9/313 genirq/affinity: Spread IRQs to all available NUMA nodes
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b82592199032bf7c778f861b936287e37ebc9f62 ]
If the number of NUMA nodes exceeds the number of MSI/MSI-X interrupts which are allocated for a device, the interrupt affinity spreading code fails to spread them across all nodes.
The reason is, that the spreading code starts from node 0 and continues up to the number of interrupts requested for allocation. This leaves the nodes past the last interrupt unused.
This results in interrupt concentration on the first nodes which violates the assumption of the block layer that all nodes are covered evenly. As a consequence the NUMA nodes above the number of interrupts are all assigned to hardware queue 0 and therefore NUMA node 0, which results in bad performance and has CPU hotplug implications, because queue 0 gets shut down when the last CPU of node 0 is offlined.
Go over all NUMA nodes and assign them round-robin to all requested interrupts to solve this.
[ tglx: Massaged changelog ]
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -117,12 +117,11 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,*/ if (numvecs <= nodes) {for_each_node_mask (n, nodemsk) { -cpumask_copy (masks + curvec, node_to_cpumask[n]); -if (++done == numvecs) -break ; +cpumask_or (masks + curvec, masks + curvec, node_to_cpumask[n]);if (++curvec == last_affv) curvec = affd->pre_vectors; } + done = numvecs; goto out; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainercover 4.19.21-stable review
This is the start of the stable review cycle for the 4.19.21 release. There are 313 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 Feb 13 14:17:25 UTC 2019. 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.21-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-4.19.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.19.21-rc1
Peter Zijlstra <[email protected]>
perf/x86/intel: Delay memory deallocation until x86_pmu_dead_cpu()
Mike Marciniszyn <[email protected]>
IB/hfi1: Add limit test for RC/UC send via loopback
Huacai Chen <[email protected]>
cacheinfo: Keep the old value if of_property_read_u32 fails
Chris Brandt <[email protected]>
serial: sh-sci: Do not free irqs that have already been freed
Andy Shevchenko <[email protected]>
serial: 8250_pci: Make PCI class test non fatal
Greg Kroah-Hartman <[email protected]>
serial: fix race between flush_to_ldisc and tty_open
Gustavo A. R. Silva <[email protected]>
perf tests evsel-tp-sched: Fix bitwise operator
Mark Rutland <[email protected]>
perf/core: Don't WARN() for impossible ring-buffer sizes
Tony Luck <[email protected]>
x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
Kan Liang <[email protected]>
perf/x86/intel/uncore: Add Node ID mask
Josh Poimboeuf <[email protected]>
cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
Peter Shier <[email protected]>
KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
Jann Horn <[email protected]>
kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
Paolo Bonzini <[email protected]>
KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
James Bottomley <[email protected]>
scsi: aic94xx: fix module loading
Vaibhav Jain <[email protected]>
scsi: cxlflash: Prevent deadlock when adapter probe fails
Johan Hovold <[email protected]>
staging: speakup: fix tty-operation NULL derefs
Paul Elder <[email protected]>
usb: gadget: musb: fix short isoc packets with inventra dma
Gustavo A. R. Silva <[email protected]>
usb: gadget: udc: net2272: Fix bitwise and boolean operations
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Handle 0 xfer length for OUT EP
Bin Liu <[email protected]>
usb: phy: am335x: fix race condition in _probe
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Plug allocation race for devices sharing a DevID
Thomas Gleixner <[email protected]>
futex: Handle early deadlock return correctly
Leonid Iziumtsev <[email protected]>
dmaengine: imx-dma: fix wrong callback invoke
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix abort of transactions
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix interrupt race on RT
Vladis Dronov <[email protected]>
HID: debug: fix the ring buffer implementation
Miklos Szeredi <[email protected]>
fuse: handle zero sized retrieve correctly
Miklos Szeredi <[email protected]>
fuse: decrement NR_WRITEBACK_TEMP on the right page
Jann Horn <[email protected]>
fuse: call pipe_buf_release() under pipe lock
Jeremy Soller <[email protected]>
ALSA: hda/realtek - Headset microphone support for System76 darp5
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Use a common helper for hp pin reference
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fix lose hp_pins for disable auto mute
Takashi Iwai <[email protected]>
ALSA: hda - Serialize codec registrations
Udo Eberhardt <[email protected]>
ALSA: usb-audio: Add support for new T+A USB DAC
Charles Keepax <[email protected]>
ALSA: compress: Fix stop handling on compressed capture streams
Brian Foster <[email protected]>
xfs: eof trim writeback mapping as soon as it is cached
Raed Salem <[email protected]>
net/mlx5e: FPGA, fix Innova IPsec TX offload data path performance
Toshiaki Makita <[email protected]>
virtio_net: Account for tx bytes and packets on sending xdp_frames
Dan Carpenter <[email protected]>
skge: potential memory corruption in skge_get_regs()
Greg Kroah-Hartman <[email protected]>
sctp: walk the list of asoc safely
Xin Long <[email protected]>
sctp: check and update stream->out_curr when allocating stream_out
Eric Dumazet <[email protected]>
rxrpc: bad unlock balance in rxrpc_recvmsg
Russell King <[email protected]>
Revert "net: phy: marvell: avoid pause mode on SGMII-to-Copper for 88e151x"
Eric Dumazet <[email protected]>
rds: fix refcount bug in rds_sock_addref
Florian Fainelli <[email protected]>
net: systemport: Fix WoL with password after deep sleep
Cong Wang <[email protected]>
net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames
Rundong Ge <[email protected]>
net: dsa: slave: Don't propagate flag changes on down slave interfaces
Andrew Lunn <[email protected]>
net: dsa: mv88e6xxx: Fix counting of ATU violations
Dan Carpenter <[email protected]>
net: dsa: Fix NULL checking in dsa_slave_set_eee()
Marc Zyngier <[email protected]>
net: dsa: Fix lockdep false positive splat
Sebastian Andrzej Siewior <[email protected]>
net: dp83640: expire old TX-skb
Bart Van Assche <[email protected]>
lib/test_rhashtable: Make test_insert_dup() allocate its hash table dynamically
Govindarajulu Varadarajan <[email protected]>
enic: fix checksum validation for IPv6
Eric Dumazet <[email protected]>
dccp: fool proof ccid_hc_[rt]x_parse_options()
Eduardo Valentin <[email protected]>
thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set
Eric Sandeen <[email protected]>
xfs: fix inverted return from xfs_btree_sblock_verify_crc
Darrick J. Wong <[email protected]>
xfs: fix PAGE_MASK usage in xfs_free_file_space
Ye Yin <[email protected]>
fs/xfs: fix f_ffree value for statfs when project quota is set
Dave Chinner <[email protected]>
xfs: delalloc -> unwritten COW fork allocation can go wrong
Dave Chinner <[email protected]>
xfs: fix transient reference count error in xfs_buf_resubmit_failed_buffers
Brian Foster <[email protected]>
xfs: fix shared extent data corruption due to missing cow reservation
Dave Chinner <[email protected]>
xfs: fix overflow in xfs_attr3_leaf_verify
Christophe JAILLET <[email protected]>
xfs: Fix error code in 'xfs_ioc_getbmap()'
Christoph Hellwig <[email protected]>
xfs: cancel COW blocks before swapext
Carlos Maiolino <[email protected]>
xfs: Fix xqmstats offsets in /proc/fs/xfs/xqmstat
Du Changbin <[email protected]>
scripts/gdb: fix lx-version string output
Anders Roxell <[email protected]>
kernel/kcov.c: mark write_comp_data() as notrace
Oleg Nesterov <[email protected]>
exec: load_script: don't blindly truncate shebang string
Davidlohr Bueso <[email protected]>
fs/epoll: drop ovflist branch prediction
Liu, Chuansheng <[email protected]>
kernel/hung_task.c: force console verbose before panic
Cheng Lin <[email protected]>
proc/sysctl: fix return error for proc_doulongvec_minmax()
Tetsuo Handa <[email protected]>
kernel/hung_task.c: break RCU locks based on jiffies
Benjamin Gordon <[email protected]>
fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
Dave Martin <[email protected]>
arm64/sve: ptrace: Fix SVE_PT_REGS_OFFSET definition
Aditya Pakki <[email protected]>
HID: lenovo: Add checks to fix of_led_classdev_register
Bjorn Andersson <[email protected]>
thermal: generic-adc: Fix adc to temp interpolation
Richard Zhu <[email protected]>
PCI: imx: Enable MSI from downstream components
Douglas Anderson <[email protected]>
kdb: Don't back trace on a cpu that didn't round up
Matthias Brugger <[email protected]>
thermal: bcm2835: enable hwmon explicitly
Finn Thain <[email protected]>
block/swim3: Fix -EBUSY error when re-opening device after unmount
Scott Wood <[email protected]>
fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address()
Wenwen Wang <[email protected]>
gdrom: fix a memory leak bug
Jia-Ju Bai <[email protected]>
isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug in HFCPCI_l1hw()
Minchan Kim <[email protected]>
zram: fix lockdep warning of free block handling
Waiman Long <[email protected]>
mm/page_alloc.c: don't call kasan_free_pages() at deferred mem init
Larry Chen <[email protected]>
ocfs2: improve ocfs2 Makefile
Junxiao Bi <[email protected]>
ocfs2: don't clear bh uptodate for block read
Randy Dunlap <[email protected]>
arch/sh/boards/mach-kfr2r09/setup.c: fix struct mtd_oob_ops build warning
Marc Zyngier <[email protected]>
scripts/decode_stacktrace: only strip base path when a prefix of the path
Jiri Olsa <[email protected]>
perf python: Do not force closing original perf descriptor in evlist.get_pollfd()
Ondrej Mosnacek <[email protected]>
cgroup: fix parsing empty mount option string
Sahitya Tummala <[email protected]>
f2fs: fix sbi->extent_list corruption issue
Kangjie Lu <[email protected]>
niu: fix missing checks of niu_pci_eeprom_read
Anton Ivanov <[email protected]>
um: Avoid marking pages with "changed protection"
Sahitya Tummala <[email protected]>
f2fs: fix use-after-free issue when accessing sbi->stat_info
Ronnie Sahlberg <[email protected]>
cifs: check ntwrk_buf_start for NULL before dereferencing it
Stefan Roese <[email protected]>
MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in hash_set_dma_transfer
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in cryp_set_dma_transfer
Michael Ellerman <[email protected]>
seq_buf: Make seq_buf_puts() null-terminate the buffer
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of bus read in lm80 probe
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of the status of SMBus read
Stanislav Fomichev <[email protected]>
perf build: Don't unconditionally link the libbfd feature test to -liberty and -lz
Chris Perl <[email protected]>
NFS: nfs_compare_mount_options always compare auth flavors.
Jim Mattson <[email protected]>
kvm: Change offset in kvm_write_guest_offset_cached to unsigned
Mahesh Salgaonkar <[email protected]>
powerpc/fadump: Do not allow hot-remove memory from fadump reserved area.
Vitaly Kuznetsov <[email protected]>
KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
Christophe Leroy <[email protected]>
powerpc/mm: Fix reporting of kernel execute faults on the 8xx
Noralf Trønnes <[email protected]>
fbdev: fbcon: Fix unregister crash when more than one framebuffer
Lenny Szubowicz <[email protected]>
ACPI/APEI: Clear GHES block_status before panic()
Kai-Heng Feng <[email protected]>
igb: Fix an issue that PME is not enabled during runtime suspend
Young Xiao <[email protected]>
ice: Do not enable NAPI on q_vectors that have no rings
Konstantin Khorenko <[email protected]>
i40e: define proper net_device::neigh_priv_len
Peter Rosin <[email protected]>
fbdev: fbmem: behave better with small rotated displays and many CPUs
Guoqing Jiang <[email protected]>
md: fix raid10 hang issue caused by barrier
Alexey Khoroshilov <[email protected]>
video: clps711x-fb: release disp device node in probe()
Wenjing Liu <[email protected]>
drm/amd/display: validate extended dongle caps
Nathan Chancellor <[email protected]>
drbd: Avoid Clang warning about pointless switch statment
Lars Ellenberg <[email protected]>
drbd: skip spurious timeout (ping-timeo) when failing promote
Lars Ellenberg <[email protected]>
drbd: disconnect, if the wrong UUIDs are attached on a connected peer
Roland Kammerer <[email protected]>
drbd: narrow rcu_read_lock in drbd_sync_handshake
Miroslav Lichvar <[email protected]>
mlx5: update timecounter at least twice per counter overflow
Alexey Kardashevskiy <[email protected]>
powerpc/powernv/ioda: Allocate indirect TCE levels of cached userspace addresses on demand
Naftali Goldstein <[email protected]>
iwlwifi: mvm: fix setting HE ppe FW config
Madhavan Srinivasan <[email protected]>
powerpc/perf: Fix thresholding counter data for unknown type
Jian Shen <[email protected]>
net: hns3: add max vector number check for pf
Jia-Ju Bai <[email protected]>
cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: increase fw status register read timeout
Dave Carroll <[email protected]>
scsi: smartpqi: correct volume status
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: correct host serial num for ssa
Ido Schimmel <[email protected]>
mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG
YueHaibing <[email protected]>
xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi
Johannes Berg <[email protected]>
mac80211: fix radiotap vendor presence bitmap handling
Christophe Leroy <[email protected]>
powerpc/uaccess: fix warning/error with access_ok()
Eric Yang <[email protected]>
drm/amd/display: fix YCbCr420 blank color
Chen-Yu Tsai <[email protected]>
Bluetooth: hci_bcm: Handle deferred probing for the clock supply
Paul Hsieh <[email protected]>
drm/amd/display: Add retry to read ddc_clock pin
Huazhong Tan <[email protected]>
net: hns3: fix incomplete uninitialization of IRQ in the hns3_nic_uninit_vector_data()
Dennis Zhou <[email protected]>
percpu: convert spin_lock_irq to spin_lock_irqsave.
Arnaldo Carvalho de Melo <[email protected]>
perf tools: Cast off_t to s64 to avoid warning on bionic libc
Arnaldo Carvalho de Melo <[email protected]>
perf header: Fix up argument to ctime()
Bin Liu <[email protected]>
usb: musb: dsps: fix runtime pm for peripheral mode
Bin Liu <[email protected]>
usb: musb: dsps: fix otg state machine
Mark Rutland <[email protected]>
arm64: KVM: Skip MMIO insn after emulation
Nicholas Mc Guire <[email protected]>
livepatch: check kzalloc return values
Doug Smythies <[email protected]>
tools/power/x86/intel_pstate_tracer: Fix non root execution for post processing a trace file
Michael Mueller <[email protected]>
KVM: s390: unregister debug feature on failing arch init
Michael Chan <[email protected]>
bnxt_en: Disable MSIX before re-reserving NQs/CMPL rings.
Fabrizio Castro <[email protected]>
i2c: sh_mobile: Add support for r8a774c0 (RZ/G2E)
Arnaldo Carvalho de Melo <[email protected]>
perf probe: Fix unchecked usage of strncpy()
Ethan Lien <[email protected]>
btrfs: use tagged writepage to mitigate livelock of snapshot
Arnaldo Carvalho de Melo <[email protected]>
perf header: Fix unchecked usage of strncpy()
Arnaldo Carvalho de Melo <[email protected]>
perf dso: Fix unchecked usage of strncpy()
Adrian Hunter <[email protected]>
perf test: Fix perf_event_attr test failure
Beomho Seo <[email protected]>
tty: serial: samsung: Properly set flags in autoCTS mode
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Resume PIO in sci_rx_interrupt() on DMA failure
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Fix locking in sci_submit_rx()
David Sterba <[email protected]>
btrfs: reada: reorder dev-replace locks before radix tree preload
Anand Jain <[email protected]>
btrfs: harden agaist duplicate fsid on scanned devices
Fabrizio Castro <[email protected]>
usb: renesas_usbhs: add support for RZ/G2E
Linus Walleij <[email protected]>
mmc: jz4740: Get CD/WP GPIOs from descriptors
Adrian Hunter <[email protected]>
mmc: sdhci-xenon: Fix timeout checks
Adrian Hunter <[email protected]>
mmc: sdhci-omap: Fix timeout checks
Adrian Hunter <[email protected]>
mmc: sdhci-of-esdhc: Fix timeout checks
Kai-Heng Feng <[email protected]>
memstick: Prevent memstick host from getting runtime suspended during card detection
Nicholas Mc Guire <[email protected]>
mmc: meson-mx-sdio: check devm_kasprintf for failure
Michal Suchanek <[email protected]>
mmc: bcm2835: reset host on timeout
Phil Elwell <[email protected]>
mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
Suraj Jitindar Singh <[email protected]>
KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
Arnd Bergmann <[email protected]>
ARM: mmp: fix timer_init calls
Fabio Estevam <[email protected]>
ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
Arnd Bergmann <[email protected]>
ARM: pxa: avoid section mismatch warning
Stanislav Fomichev <[email protected]>
selftests/bpf: use __bpf_constant_htons in test_prog.c
Joey Zhang <[email protected]>
switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
Jan Kara <[email protected]>
udf: Fix BUG on corrupted inode
Nir Dotan <[email protected]>
mlxsw: spectrum_acl: Limit priority value
Icenowy Zheng <[email protected]>
phy: sun4i-usb: add support for missing USB PHY index
Adamski, Krzysztof (Nokia - PL/Wroclaw) <[email protected]>
i2c-axxia: check for error conditions first
Hua Su <[email protected]>
lightnvm: pblk: add lock protection to list operations
Hans Holmberg <[email protected]>
lightnvm: pblk: fix resubmission of overwritten write err lbas
Sean Paul <[email protected]>
drm/msm: dpu: Only check flush register against pending flushes
Abhinav Kumar <[email protected]>
drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
Zhizhou Zhang <[email protected]>
tee: optee: avoid possible double list_del()
Viresh Kumar <[email protected]>
OPP: Use opp_table->regulators to verify no regulator case
Yangtao Li <[email protected]>
cpuidle: big.LITTLE: fix refcount leak
Vadim Pasternak <[email protected]>
platform/x86: mlx-platform: Fix tachometer registers
Anson Huang <[email protected]>
clk: imx6sl: ensure MMDC CH0 handshake is bypassed
Sergei Shtylyov <[email protected]>
sata_rcar: fix deferred probing
Will Deacon <[email protected]>
iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
Vivek Gautam <[email protected]>
iommu/arm-smmu: Add support for qcom,smmu-v2 variant
Zhen Lei <[email protected]>
iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Disable CSP for stream OUT ep
Andrey Smirnov <[email protected]>
ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
Wolfram Sang <[email protected]>
watchdog: renesas_wdt: don't set divider while watchdog is running
Dan Carpenter <[email protected]>
tracing: Have trace_stack nr_entries compare not be so subtle
Linus Walleij <[email protected]>
ARM: dts: Fix up the D-Link DIR-685 MTD partition info
Philipp Zabel <[email protected]>
media: coda: fix H.264 deblocking filter controls
Jiong Wang <[email protected]>
mips: bpf: fix encoding bug for mm_srlv32_op
Russell King - ARM Linux <[email protected]>
ARM: dts: Fix OMAP4430 SDP Ethernet startup
Yu Zhao <[email protected]>
iommu/amd: Fix amd_iommu=force_isolation
Nicholas Mc Guire <[email protected]>
pinctrl: sx150x: handle failure case of devm_kstrdup
Nicholas Mc Guire <[email protected]>
gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
Nicholas Mc Guire <[email protected]>
gpio: mt7621: report failure of devm_kasprintf()
Andy Shevchenko <[email protected]>
usb: dwc3: trace: add missing break statement to make compiler happy
Kaike Wan <[email protected]>
IB/hfi1: Unreserve a reserved request when it is completed
Peter Rajnoha <[email protected]>
kobject: return error code if writing /sys/.../uevent fails
Alexander Duyck <[email protected]>
driver core: Move async_synchronize_full call
Hoang Le <[email protected]>
tipc: fix node keep alive interval calculation
Alex Deucher <[email protected]>
drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2)
Luca Ceresoli <[email protected]>
media: imx274: select REGMAP_I2C
Chen-Yu Tsai <[email protected]>
clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks
Chunfeng Yun <[email protected]>
usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
Bart Van Assche <[email protected]>
timekeeping: Use proper seqcount initializer
Mathias Nyman <[email protected]>
usb: hub: delay hub autosuspend if USB3 port is still link training
Marek Szyprowski <[email protected]>
usb: dwc2: Disable power down feature on Samsung SoCs
Anurag Kumar Vulisha <[email protected]>
usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
Max Filippov <[email protected]>
xtensa: xtfpga.dtsi: fix dtc warnings about SPI
Zoran Markovic <[email protected]>
smack: fix access permissions for keyring
Alexey Khoroshilov <[email protected]>
media: DaVinci-VPBE: fix error handling in vpbe_initialize()
Arnd Bergmann <[email protected]>
media: i2c: TDA1997x: select CONFIG_HDMI
Sebastian Andrzej Siewior <[email protected]>
x86/fpu: Add might_fault() to user_insn()
Rob Herring <[email protected]>
ARM: dts: aspeed: add missing memory unit-address
Lubomir Rintel <[email protected]>
ARM: mmp/mmp2: dt: enable the clock
Lubomir Rintel <[email protected]>
ARM: dts: mmp2: fix TWSI2
Eric Anholt <[email protected]>
drm/v3d: Fix prime imports of buffers from other drivers.
Mark Rutland <[email protected]>
arm64: ftrace: don't adjust the LR value
Lorenzo Bianconi <[email protected]>
mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
Harald Freudenberger <[email protected]>
s390/zcrypt: improve special ap message cmd handling
Arend van Spriel <[email protected]>
firmware/efi: Add NULL pointer checks in efivars API functions
Thara Gopinath <[email protected]>
thermal: Fix locking in cooling device sysfs update cur_state
Wei Wang <[email protected]>
Thermal: do not clear passive state during system sleep
Will Deacon <[email protected]>
arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
Nicholas Mc Guire <[email protected]>
perf: arm_spe: handle devm_kasprintf() failure
Sean Paul <[email protected]>
drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
J. Bruce Fields <[email protected]>
nfsd4: fix crash on writing v4_end_grace before nfsd startup
Yangtao Li <[email protected]>
soc: bcm: brcmstb: Don't leak device tree node reference
Young Xiao <[email protected]>
sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
YueHaibing <[email protected]>
net: aquantia: return 'err' if set MPI_DEINIT state fails
Will Deacon <[email protected]>
arm64: io: Ensure calls to delay routines are ordered against prior readX()
Simon Horman <[email protected]>
i2c: sh_mobile: add support for r8a77990 (R-Car E3)
Tiezhu Yang <[email protected]>
f2fs: fix wrong return value of f2fs_acl_create
Sheng Yong <[email protected]>
f2fs: fix race between write_checkpoint and write_begin
Jaegeuk Kim <[email protected]>
f2fs: avoid build warn of fall_through
Yunlei He <[email protected]>
f2fs: move dir data flush to write checkpoint process
Michael Straube <[email protected]>
staging: pi433: fix potential null dereference
Andy Shevchenko <[email protected]>
ACPI: SPCR: Consider baud rate 0 as preconfigured state
Hans Verkuil <[email protected]>
media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
Hans de Goede <[email protected]>
iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
Martin Blumenstingl <[email protected]>
iio: adc: meson-saradc: fix internal clock names
Nicholas Mc Guire <[email protected]>
iio: adc: meson-saradc: check for devm_kasprintf failure
Mathieu Malaterre <[email protected]>
powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
Nathan Chancellor <[email protected]>
dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
YueHaibing <[email protected]>
ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: fix the width of the cpu_scale_div clock
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
Babu Moger <[email protected]>
x86/resctrl: Fixup the user-visible strings
Gao Xiang <[email protected]>
staging: erofs: fix the definition of DBG_BUGON
Alexey Khoroshilov <[email protected]>
media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
Akinobu Mita <[email protected]>
media: video-i2c: avoid accessing released memory area when removing driver
Sean Young <[email protected]>
media: rc: ensure close() is called on rc_unregister_device
Yangtao Li <[email protected]>
soc/tegra: Don't leak device tree node reference
Pu Wen <[email protected]>
perf tools: Add Hygon Dhyana support
Sami Tolvanen <[email protected]>
modpost: validate symbol names also in find_elf_symbol
Saeed Mahameed <[email protected]>
net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
Stanislav Fomichev <[email protected]>
bpf: libbpf: retry map creation without the name
Yogesh Mohan Marimuthu <[email protected]>
drm/amd/display: calculate stream->phy_pix_clk before clock mapping
Murton Liu <[email protected]>
drm/amd/display: fix gamma not being applied correctly
Nathan Chancellor <[email protected]>
ARM: OMAP2+: hwmod: Fix some section annotations
Damian Kos <[email protected]>
drm/rockchip: fix for mailbox read size
Ben Dooks <[email protected]>
usbnet: smsc95xx: fix rx packet alignment
Renato Lui Geh <[email protected]>
staging: iio: ad7780: update voltage on read
Xiang Chen <[email protected]>
scsi: hisi_sas: change the time of SAS SSP connection
Alan Brady <[email protected]>
i40e: prevent overlapping tx_timeout recover
Brian Norris <[email protected]>
platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
Arnd Bergmann <[email protected]>
vbox: fix link error with 'gcc -Og'
Anatolij Gustschin <[email protected]>
fpga: altera-cvp: fix 'bad IO access' on x86_64
Dexuan Cui <[email protected]>
Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
Andreas Puhm <[email protected]>
fpga: altera-cvp: Fix registration for CvP incapable devices
Matheus Tavares <[email protected]>
staging:iio:ad2s90: Make probe handle spi_setup failure
Naftali Goldstein <[email protected]>
iwlwifi: fw: do not set sgi bits for HE connection
Ioana Ciornei <[email protected]>
dpaa2-ptp: defer probe when portal allocation failed
Paul Burton <[email protected]>
MIPS: Boston: Disable EG20T prefetch
Miroslav Lichvar <[email protected]>
ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
Andy Duan <[email protected]>
serial: fsl_lpuart: clear parity enable bit when disable parity
Boris Brezillon <[email protected]>
drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
Eric Biggers <[email protected]>
crypto: aes_ti - disable interrupts while accessing S-box
Frank Rowand <[email protected]>
powerpc/pseries: add of_node_put() in dlpar_detach_node()
Colin Ian King <[email protected]>
x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
Bob Peterson <[email protected]>
dlm: Don't swamp the CPU with callbacks queued during recovery
Yi Wang <[email protected]>
clk: boston: fix possible memory leak in clk_boston_setup()
Yufen Wang <[email protected]>
ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
James Smart <[email protected]>
scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
Suganath Prabu <[email protected]>
scsi: mpt3sas: Call sas_remove_host before removing the target devices
James Smart <[email protected]>
scsi: lpfc: Correct LCB RJT handling
Lorenzo Bianconi <[email protected]>
ath9k: dynack: use authentication messages for 'late' ack
Brian Norris <[email protected]>
ath10k: assign 'n_cipher_suites' for WCN3990
Lior David <[email protected]>
wil6210: fix memory leak in wil_find_tx_bcast_2
Alexei Avshalom Lazar <[email protected]>
wil6210: fix reset flow for Talyn-mb
Nickhu <[email protected]>
nds32: Fix gcc 8.0 compiler option incompatible.
Steve Longerbeam <[email protected]>
gpu: ipu-v3: image-convert: Prevent race between run and unprepare
Long Li <[email protected]>
genirq/affinity: Spread IRQs to all available NUMA nodes
Jernej Skrabec <[email protected]>
drm/sun4i: Initialize registers in tcon-top driver
Muchun Song <[email protected]>
gpiolib: Fix possible use after free on label
Arnd Bergmann <[email protected]>
ASoC: Intel: mrfld: fix uninitialized variable access
Lukas Wunner <[email protected]>
pinctrl: bcm2835: Use raw spinlock for RT compatibility
Deepak Sharma <[email protected]>
drm/vgem: Fix vgem_init to get drm device available.
Slawomir Stepien <[email protected]>
staging: iio: adc: ad7280a: handle error from __ad7280_read32()
Gustavo A. R. Silva <[email protected]>
drm/bufs: Fix Spectre v1 vulnerability
Alexey Brodkin <[email protected]>
devres: Align data[] to ARCH_KMALLOC_MINALIGN
-------------
Diffstat:
Makefile | 4 +- .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++- arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 ++- arch/arm/boot/dts/mmp2.dtsi | 9 +- arch/arm/boot/dts/omap4-sdp.dts | 1 + arch/arm/kernel/smp.c | 15 +++ arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 32 +++--- arch/arm/mach-omap2/omap_hwmod.c | 6 +- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- arch/arm64/include/asm/io.h | 32 ++++-- arch/arm64/include/uapi/asm/ptrace.h | 2 +- arch/arm64/kernel/entry-ftrace.S | 1 - arch/mips/boot/dts/img/boston.dts | 6 ++ arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 2 - arch/mips/include/uapi/asm/inst.h | 2 +- arch/mips/jz4740/board-qi_lb60.c | 12 ++- arch/mips/ralink/Kconfig | 1 + arch/nds32/mm/Makefile | 6 +- arch/powerpc/include/asm/fadump.h | 2 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/kernel/fadump.c | 10 +- arch/powerpc/kernel/vmlinux.lds.S | 4 + arch/powerpc/kvm/powerpc.c | 5 +- arch/powerpc/mm/fault.c | 4 +- arch/powerpc/perf/isa207-common.c | 7 +- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- arch/powerpc/platforms/pseries/dlpar.c | 2 + arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +- arch/s390/include/uapi/asm/zcrypt.h | 4 +- arch/s390/kvm/kvm-s390.c | 17 ++- arch/sh/boards/mach-kfr2r09/setup.c | 1 - arch/um/include/asm/pgtable.h | 9 +- arch/x86/events/intel/core.c | 10 +- arch/x86/events/intel/uncore_snbep.c | 4 +- arch/x86/include/asm/fpu/internal.h | 3 + arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++-- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++--- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 +++---- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kvm/svm.c | 7 ++ arch/x86/kvm/vmx.c | 4 +- arch/x86/kvm/x86.c | 7 ++ arch/x86/pci/broadcom_bus.c | 4 +- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- crypto/Kconfig | 3 +- crypto/aes_ti.c | 18 ++++ drivers/acpi/apei/ghes.c | 2 + drivers/acpi/spcr.c | 11 ++ drivers/ata/sata_rcar.c | 4 +- drivers/base/bus.c | 12 ++- drivers/base/cacheinfo.c | 6 +- drivers/base/core.c | 8 +- drivers/base/dd.c | 6 +- drivers/base/devres.c | 10 +- drivers/block/drbd/drbd_nl.c | 15 +-- drivers/block/drbd/drbd_receiver.c | 13 +-- drivers/block/sunvdc.c | 5 + drivers/block/swim3.c | 6 +- drivers/block/zram/zram_drv.c | 38 ++++--- drivers/block/zram/zram_drv.h | 2 +- drivers/bluetooth/hci_bcm.c | 4 + drivers/cdrom/gdrom.c | 1 + drivers/clk/imgtec/clk-boston.c | 11 +- drivers/clk/imx/clk-imx6sl.c | 6 ++ drivers/clk/meson/meson8b.c | 16 ++- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +- drivers/cpuidle/cpuidle-big_little.c | 7 +- drivers/crypto/ux500/cryp/cryp_core.c | 4 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/bcm2835-dma.c | 70 +++++------- drivers/dma/imx-dma.c | 8 +- drivers/dma/xilinx/zynqmp_dma.c | 2 +- drivers/firmware/efi/vars.c | 99 +++++++++++++---- drivers/fpga/altera-cvp.c | 15 ++- drivers/gpio/gpio-mt7621.c | 10 +- drivers/gpio/gpiolib.c | 25 ++++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 23 ++-- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 ++- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 ++- drivers/gpu/drm/drm_atomic_helper.c | 8 +- drivers/gpu/drm/drm_bufs.c | 3 + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 +- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 ++ drivers/gpu/drm/v3d/v3d_bo.c | 1 + drivers/gpu/drm/vc4/vc4_plane.c | 12 ++- drivers/gpu/drm/vgem/vgem_drv.c | 16 +-- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +- drivers/hid/hid-debug.c | 120 ++++++++------------- drivers/hid/hid-lenovo.c | 10 +- drivers/hwmon/lm80.c | 26 +++-- drivers/i2c/busses/i2c-axxia.c | 32 +++--- drivers/i2c/busses/i2c-sh_mobile.c | 2 + drivers/iio/accel/kxcjk-1013.c | 1 + drivers/iio/adc/meson_saradc.c | 14 ++- drivers/infiniband/hw/hfi1/rc.c | 2 + drivers/infiniband/hw/hfi1/ruc.c | 7 +- drivers/infiniband/hw/qib/qib_ruc.c | 7 +- drivers/iommu/amd_iommu.c | 9 +- drivers/iommu/arm-smmu-v3.c | 14 ++- drivers/iommu/arm-smmu.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 32 +++++- drivers/isdn/hisax/hfc_pci.c | 2 + drivers/lightnvm/pblk-core.c | 13 ++- drivers/lightnvm/pblk-write.c | 8 +- drivers/md/raid10.c | 4 + drivers/media/i2c/Kconfig | 2 + drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 +- drivers/media/i2c/adv7842.c | 4 +- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- drivers/media/i2c/video-i2c.c | 11 +- drivers/media/platform/coda/coda-bit.c | 19 ++-- drivers/media/platform/coda/coda-common.c | 15 ++- drivers/media/platform/coda/coda.h | 6 +- drivers/media/platform/coda/coda_regs.h | 2 +- drivers/media/platform/davinci/vpbe.c | 7 +- .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 +- drivers/media/rc/rc-main.c | 2 + drivers/memstick/core/memstick.c | 3 + drivers/mmc/host/bcm2835.c | 12 +++ drivers/mmc/host/jz4740_mmc.c | 20 ++-- drivers/mmc/host/meson-mx-sdio.c | 6 ++ drivers/mmc/host/sdhci-of-esdhc.c | 16 ++- drivers/mmc/host/sdhci-omap.c | 16 ++- drivers/mmc/host/sdhci-xenon-phy.c | 10 +- drivers/mmc/host/sdhci-xenon.c | 10 +- drivers/net/dsa/mv88e6xxx/global1_atu.c | 21 ++-- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 + drivers/net/ethernet/broadcom/bcmsysport.c | 25 ++--- drivers/net/ethernet/broadcom/bcmsysport.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 ++-- drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 16 +-- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++ drivers/net/ethernet/intel/ice/ice_main.c | 16 ++- drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 14 +++ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 ++ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 27 +---- drivers/net/ethernet/sun/niu.c | 10 +- drivers/net/phy/dp83640.c | 13 ++- drivers/net/phy/marvell.c | 12 --- drivers/net/usb/smsc95xx.c | 1 + drivers/net/virtio_net.c | 20 +++- drivers/net/wireless/ath/ath10k/core.c | 1 + drivers/net/wireless/ath/ath9k/dynack.c | 3 +- drivers/net/wireless/ath/wil6210/main.c | 11 +- drivers/net/wireless/ath/wil6210/txrx.c | 2 + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 + drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c | 8 +- drivers/net/wireless/st/cw1200/scan.c | 13 ++- drivers/opp/core.c | 11 +- drivers/pci/controller/dwc/pci-imx6.c | 10 ++ drivers/pci/switch/switchtec.c | 3 + drivers/perf/arm_spe_pmu.c | 5 + drivers/phy/allwinner/phy-sun4i-usb.c | 7 ++ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 +-- drivers/pinctrl/meson/pinctrl-meson8.c | 3 + drivers/pinctrl/meson/pinctrl-meson8b.c | 13 ++- drivers/pinctrl/pinctrl-sx150x.c | 11 +- drivers/platform/chrome/cros_ec_proto.c | 18 +++- drivers/platform/x86/mlx-platform.c | 12 +-- drivers/ptp/ptp_chardev.c | 5 +- drivers/ptp/ptp_clock.c | 5 +- drivers/s390/crypto/zcrypt_error.h | 2 + drivers/scsi/aic94xx/aic94xx_init.c | 8 +- drivers/scsi/cxlflash/main.c | 2 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/lpfc/lpfc_els.c | 52 +++++---- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- drivers/scsi/smartpqi/smartpqi_init.c | 6 ++ drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- drivers/soc/bcm/brcmstb/common.c | 6 +- drivers/soc/tegra/common.c | 6 +- drivers/staging/erofs/internal.h | 2 +- drivers/staging/fsl-dpaa2/rtc/rtc.c | 5 +- drivers/staging/iio/adc/ad7280a.c | 17 ++- drivers/staging/iio/adc/ad7780.c | 6 +- drivers/staging/iio/resolver/ad2s90.c | 7 +- drivers/staging/pi433/pi433_if.c | 4 + drivers/staging/speakup/spk_ttyio.c | 6 +- drivers/tee/optee/supp.c | 13 +-- drivers/thermal/broadcom/bcm2835_thermal.c | 11 ++ drivers/thermal/thermal-generic-adc.c | 12 ++- drivers/thermal/thermal_core.c | 12 ++- drivers/thermal/thermal_hwmon.h | 4 +- drivers/thermal/thermal_sysfs.c | 11 +- drivers/tty/serial/8250/8250_pci.c | 9 +- drivers/tty/serial/fsl_lpuart.c | 4 + drivers/tty/serial/samsung.c | 3 + drivers/tty/serial/serial_core.c | 6 ++ drivers/tty/serial/sh-sci.c | 32 ++++-- drivers/usb/core/hub.c | 10 ++ drivers/usb/dwc2/params.c | 10 +- drivers/usb/dwc3/gadget.c | 16 +-- drivers/usb/dwc3/trace.h | 2 + drivers/usb/gadget/udc/net2272.c | 2 +- drivers/usb/mtu3/mtu3_core.c | 4 +- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 +- drivers/usb/musb/musb_dsps.c | 21 +++- drivers/usb/musb/musb_gadget.c | 13 +-- drivers/usb/musb/musbhsdma.c | 21 ++-- drivers/usb/phy/phy-am335x.c | 5 +- drivers/usb/renesas_usbhs/common.c | 4 + drivers/video/fbdev/clps711x-fb.c | 5 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 8 +- drivers/virt/vboxguest/vboxguest_core.c | 2 +- drivers/watchdog/renesas_wdt.c | 9 +- fs/binfmt_script.c | 10 +- fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/ctree.h | 2 +- fs/btrfs/extent_io.c | 17 ++- fs/btrfs/inode.c | 11 +- fs/btrfs/ioctl.c | 2 +- fs/btrfs/reada.c | 12 ++- fs/btrfs/volumes.c | 29 +++++ fs/cifs/readdir.c | 9 +- fs/dlm/ast.c | 10 ++ fs/eventpoll.c | 2 +- fs/f2fs/acl.c | 14 +-- fs/f2fs/data.c | 12 ++- fs/f2fs/f2fs.h | 12 ++- fs/f2fs/file.c | 3 + fs/f2fs/shrinker.c | 2 +- fs/f2fs/super.c | 27 ++--- fs/fuse/dev.c | 4 +- fs/fuse/file.c | 2 +- fs/nfs/super.c | 3 +- fs/nfsd/nfsctl.c | 2 + fs/ocfs2/Makefile | 2 +- fs/ocfs2/buffer_head_io.c | 2 - fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlmfs/Makefile | 2 +- fs/proc/base.c | 12 ++- fs/udf/inode.c | 6 ++ fs/xfs/libxfs/xfs_attr_leaf.c | 11 +- fs/xfs/libxfs/xfs_bmap.c | 5 +- fs/xfs/libxfs/xfs_btree.c | 2 +- fs/xfs/xfs_aops.c | 2 + fs/xfs/xfs_bmap_util.c | 10 +- fs/xfs/xfs_buf_item.c | 28 +++-- fs/xfs/xfs_ioctl.c | 2 +- fs/xfs/xfs_qm_bhv.c | 2 +- fs/xfs/xfs_reflink.c | 1 + fs/xfs/xfs_stats.c | 2 +- include/linux/cpu.h | 2 - include/linux/genl_magic_struct.h | 5 +- include/linux/gpio/consumer.h | 6 +- include/linux/hid-debug.h | 9 +- include/linux/kvm_host.h | 3 +- include/linux/mlx5/driver.h | 2 +- include/sound/compress_driver.h | 6 +- kernel/cgroup/cgroup.c | 2 +- kernel/cpu.c | 33 +----- kernel/debug/debug_core.c | 4 + kernel/debug/kdb/kdb_bt.c | 11 +- kernel/debug/kdb/kdb_debugger.c | 7 -- kernel/events/ring_buffer.c | 3 + kernel/futex.c | 28 +++-- kernel/hung_task.c | 20 ++-- kernel/irq/affinity.c | 5 +- kernel/kcov.c | 2 +- kernel/locking/rtmutex.c | 37 ++++++- kernel/module.c | 6 +- kernel/sched/fair.c | 1 + kernel/smp.c | 2 - kernel/sysctl.c | 2 + kernel/time/timekeeping.c | 4 +- kernel/trace/trace_stack.c | 2 +- lib/seq_buf.c | 6 +- lib/test_rhashtable.c | 23 ++-- mm/page_alloc.c | 37 +++++-- mm/percpu-km.c | 5 +- net/dccp/ccid.h | 4 +- net/dsa/master.c | 4 + net/dsa/slave.c | 17 +-- net/ipv6/xfrm6_tunnel.c | 3 + net/mac80211/rx.c | 5 +- net/rds/bind.c | 6 +- net/rxrpc/recvmsg.c | 3 +- net/sctp/socket.c | 4 +- net/sctp/stream.c | 20 ++++ net/tipc/node.c | 6 ++ samples/livepatch/livepatch-shadow-fix1.c | 5 + samples/livepatch/livepatch-shadow-mod.c | 4 + scripts/decode_stacktrace.sh | 2 +- scripts/gdb/linux/proc.py | 2 +- scripts/mod/modpost.c | 50 ++++----- security/smack/smack_lsm.c | 12 ++- sound/pci/hda/hda_bind.c | 3 +- sound/pci/hda/hda_codec.h | 1 + sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 62 ++++++----- sound/soc/fsl/Kconfig | 2 +- sound/soc/intel/atom/sst/sst_loader.c | 8 +- sound/usb/quirks.c | 1 + tools/build/Makefile.feature | 4 +- tools/build/feature/Makefile | 10 +- tools/hv/hv_kvp_daemon.c | 15 ++- tools/lib/bpf/bpf.c | 11 +- tools/perf/Makefile.config | 44 ++++---- tools/perf/arch/x86/util/kvm-stat.c | 2 +- tools/perf/tests/attr.py | 2 +- tools/perf/tests/evsel-tp-sched.c | 2 +- tools/perf/util/dso.c | 2 +- tools/perf/util/header.c | 6 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/python.c | 3 +- tools/perf/util/s390-cpumsf.c | 2 +- .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 4 +- tools/testing/selftests/bpf/test_progs.c | 8 +- virt/kvm/arm/mmio.c | 11 +- virt/kvm/kvm_main.c | 6 +- 345 files changed, 2152 insertions(+), 1087 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 33/313 Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ]
The patch fixes:
hv_kvp_daemon.c: In function 'kvp_set_ip_info':
hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes into a destination of size 4096
The "(unsigned int)str_len" is to avoid:
hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/hv/hv_kvp_daemon.c +13 -2
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)FILE *file;char cmd[PATH_MAX ];char *mac_addr; +int str_len;/* * Set the configuration for the specified interface with
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)* invoke the external script to do its magic. */ -snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , -"hv_set_ifconfig" , if_file); + str_len =snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , +"hv_set_ifconfig" , if_file); +/* +* This is a little overcautious, but it's necessary to suppress some +* false warnings from gcc 8.0.1. +*/ +if (str_len <=0 || (unsigned int )str_len >=sizeof (cmd)) { +syslog (LOG_ERR ,"Cmd '%s' (len=%d) may be too long" , + cmd, str_len); +return HV_E_FAIL ; + } +if (system (cmd)) {syslog (LOG_ERR ,"Failed to execute cmd '%s'; error: %d %s" , cmd, errno,strerror (errno));
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 35/313 vbox: fix link error with gcc -Og
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b8ae30a7020d61e0504529adf45abb08fa5c59f5 ]
With the new CONFIG_CC_OPTIMIZE_FOR_DEBUGGING option, we get a link error in the vboxguest driver, when that fails to optimize out the call to the compat handler:
drivers/virt/vboxguest/vboxguest_core.o: In function `vbg_ioctl_hgcm_call':
vboxguest_core.c:(.text+0x1f6e): undefined reference to `vbg_hgcm_call32'
Another compile-time check documents better what we want and avoids the error.
--- drivers/virt/vboxguest/vboxguest_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virt/vboxguest/vboxguest_core.c +1 -1
@@ -1312,7 +1312,7 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev,return -EINVAL ; } -if (f32bit) +if (IS_ENABLED (CONFIG_COMPAT ) && f32bit) ret = vbg_hgcm_call32(gdev, client_id, call->function, call->timeout_ms, VBG_IOCTL_HGCM_CALL_PARMS32(call),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 37/313 i40e: prevent overlapping tx_timeout recover
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d5585b7b6846a6d0f9517afe57be3843150719da ]
If a TX hang occurs, we attempt to recover by incrementally resetting. If we're starved for CPU time, it's possible the reset doesn't actually complete (or even fire) before another tx_timeout fires causing us to fly through the different resets without actually doing them.
This adds a bit to set and check if a timeout recovery is already pending and, if so, bail out of tx_timeout. The bit will get cleared at the end of i40e_rebuild when reset is complete.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -122,6 +122,7 @@ enum i40e_state_t { __I40E_MDD_EVENT_PENDING, __I40E_VFLR_EVENT_PENDING, __I40E_RESET_RECOVERY_PENDING, + __I40E_TIMEOUT_RECOVERY_PENDING, __I40E_MISC_IRQ_REQUESTED, __I40E_RESET_INTR_RECEIVED, __I40E_REINIT_REQUESTED,
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -336,6 +336,10 @@ static void i40e_tx_timeout(struct net_device *netdev) (pf->tx_timeout_last_recovery + netdev->watchdog_timeo))) return; /* don't do any new action before the next timeout */ +/* don't kick off another recovery if one is already pending */ +if (test_and_set_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state)) +return ; +if (tx_ring) { head =i40e_get_head (tx_ring);/* Read interrupt register */
@@ -9566,6 +9570,7 @@ end_core_reset:clear_bit (__I40E_RESET_FAILED, pf->state); clear_recovery:clear_bit (__I40E_RESET_RECOVERY_PENDING, pf->state); +clear_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state); }/**
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 38/313 scsi: hisi_sas: change the time of SAS SSP connection
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 15bc43f31a074076f114e0b87931e3b220b7bff1 ]
Currently the time of SAS SSP connection is 1ms, which means the link connection will fail if no IO response after this period.
For some disks handling large IO (such as 512k), 1ms is not enough, so change it to 5ms.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -492,7 +492,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)hisi_sas_phy_write32 (hisi_hba, i,PHYCTRL_OOB_RESTART_MSK ,0x1 );hisi_sas_phy_write32 (hisi_hba, i,STP_LINK_TIMER ,0x7f7a120 );hisi_sas_phy_write32 (hisi_hba, i,CON_CFG_DRIVER ,0x2a0a01 ); - +hisi_sas_phy_write32 (hisi_hba, i,SAS_SSP_CON_TIMER_CFG ,0x32 );/* used for 12G negotiate */ hisi_sas_phy_write32 (hisi_hba, i,COARSETUNE_TIME ,0x1e ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 40/313 usbnet: smsc95xx: fix rx packet alignment
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ]
The smsc95xx driver already takes into account the NET_IP_ALIGN parameter when setting up the receive packet data, which means we do not need to worry about aligning the packets in the usbnet driver.
Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now passed to the ip_rcv() routine with the start on an aligned address.
Tested on Raspberry Pi B3.
--- drivers/net/usb/smsc95xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/smsc95xx.c +1 -0
@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->features |=NETIF_F_RXCSUM ; dev->net->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM ; +set_bit (EVENT_NO_IP_ALIGN , &dev->flags);smsc95xx_init_mac_address (dev);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 41/313 drm/rockchip: fix for mailbox read size
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ]
Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is used by them, can read only up to 255 bytes at once. Normally, it's not a big issue as DPCD or EDID reads won't (hopefully) exceed that value.
The real issue here is the revocation list read during the HDCP authentication process. (problematic use case:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152)
The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + 4 bytes of an additional info).
In other words - CTSes with HDCP Repeater won't pass without this fix. Oh, and the driver will most likely stop working (best case scenario).
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, }static int cdn_dp_mailbox_read_receive (struct cdn_dp_device *dp, -u8 *buff,u8 buff_size) +u8 *buff,u16 buff_size) {u32 i;int ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 24/313 crypto: aes_ti - disable interrupts while accessing S-box
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0a6a40c2a8c184a2fb467efacfb1cd338d719e0b ]
In the "aes-fixed-time" AES implementation, disable interrupts while accessing the S-box, in order to make cache-timing attacks more difficult. Previously it was possible for the CPU to be interrupted while the S-box was loaded into L1 cache, potentially evicting the cachelines and causing later table lookups to be time-variant.
In tests I did on x86 and ARM, this doesn't affect performance significantly. Responsiveness is potentially a concern, but interrupts are only disabled for a single AES block.
Note that even after this change, the implementation still isn't necessarily guaranteed to be constant-time; see
https://cr.yp.to/antiforgery/cachetiming-20050414.pdf for a discussion of the many difficulties involved in writing truly constant-time AES software. But it's valuable to make such attacks more difficult.
--- crypto/Kconfig | 3 ++- crypto/aes_ti.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
crypto/Kconfig +2 -1
@@ -1056,7 +1056,8 @@ config CRYPTO_AES_TI 8 for decryption), this implementation only uses just two S-boxes of 256 bytes each, and attempts to eliminate data dependent latencies by prefetching the entire table into the cache at the start of each - block. + block. Interrupts are also disabled to avoid races where cachelines + are evicted when the CPU is interrupted to do something else. config CRYPTO_AES_586 tristate "AES cipher algorithms (i586)"
crypto/aes_ti.c +18 -0
@@ -269,6 +269,7 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_enc +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_enc[0 ] ^get_unaligned_le32 (in);
@@ -276,6 +277,12 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_enc[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_enc[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_sbox[0 ] ^ __aesti_sbox[128 ]; st0[1 ] ^= __aesti_sbox[32 ] ^ __aesti_sbox[160 ]; st0[2 ] ^= __aesti_sbox[64 ] ^ __aesti_sbox[192 ];
@@ -300,6 +307,8 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static void aesti_decrypt (struct crypto_tfm *tfm,u8 *out,const u8 *in)
@@ -308,6 +317,7 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_dec +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_dec[0 ] ^get_unaligned_le32 (in);
@@ -315,6 +325,12 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_dec[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_dec[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_inv_sbox[0 ] ^ __aesti_inv_sbox[128 ]; st0[1 ] ^= __aesti_inv_sbox[32 ] ^ __aesti_inv_sbox[160 ]; st0[2 ] ^= __aesti_inv_sbox[64 ] ^ __aesti_inv_sbox[192 ];
@@ -339,6 +355,8 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (inv_subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (inv_subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (inv_subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static struct crypto_alg aes_alg = {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 42/313 ARM: OMAP2+: hwmod: Fix some section annotations
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ]
When building the kernel with Clang, the following section mismatch warnings appears:
WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from the function _setup() to the function .init.text:_setup_iclk_autoidle() The function _setup() references
the function __init _setup_iclk_autoidle().
This is often because _setup lacks a __init
annotation or the annotation of _setup_iclk_autoidle is wrong.
WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from the function _setup() to the function .init.text:_setup_reset() The function _setup() references
the function __init _setup_reset().
This is often because _setup lacks a __init
annotation or the annotation of _setup_reset is wrong.
WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from the function _setup() to the function .init.text:_setup_postsetup() The function _setup() references
the function __init _setup_postsetup().
This is often because _setup lacks a __init
annotation or the annotation of _setup_postsetup is wrong.
_setup is used in omap_hwmod_allocate_module, which isn't marked __init and looks like it shouldn't be, meaning to fix these warnings, those functions must be moved out of the init section, which this patch does.
--- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +3 -3
@@ -2397,7 +2397,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)* a stub; implementing this properly requires iclk autoidle usecounting in * the clock code. No return value. */ -static void __init _setup_iclk_autoidle (struct omap_hwmod *oh) +static void _setup_iclk_autoidle (struct omap_hwmod *oh) {struct omap_hwmod_ocp_if *os;
@@ -2428,7 +2428,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)* reset. Returns 0 upon success or a negative error code upon * failure. */ -static int __init _setup_reset (struct omap_hwmod *oh) +static int _setup_reset (struct omap_hwmod *oh) {int r;
@@ -2489,7 +2489,7 @@ static int __init _setup_reset(struct omap_hwmod *oh)* * No return value. */ -static void __init _setup_postsetup (struct omap_hwmod *oh) +static void _setup_postsetup (struct omap_hwmod *oh) {u8 postsetup_state;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 43/313 drm/amd/display: fix gamma not being applied correctly
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ce504b9389be846bcdf512ed5be8f661b3bf097 ]
[why]
Gamma was always being set as identity on SDR monitor, leading to no changes in gamma. This caused nightlight to not apply correctly.
[how]
Added a default gamma structure to compare against in the sdr case.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +2 -1
@@ -1190,7 +1190,8 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx, tf = plane_state->in_transfer_func;if (plane_state->gamma_correction && - !plane_state->gamma_correction->is_identity + !dpp_base->ctx->dc->debug.always_use_regamma + && !plane_state->gamma_correction->is_identity &&dce_use_lut (plane_state->format)) dpp_base->funcs->dpp_program_input_lut (dpp_base, plane_state->gamma_correction);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 44/313 drm/amd/display: calculate stream->phy_pix_clk before clock mapping
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 08e1c28dd521c7b08d1b0af0bae9fb22ccc012a4 ]
[why]phy_pix_clk is one of the variable used to check if one PLL can be shared with displays having common mode set configuration. As of now phy_pix_clock varialbe is calculated in function dc_validate_stream(). dc_validate_stream() function is called after clocks are assigned for the new display. Due to this during hotplug, when PLL sharing conditions are checked for new display phy_pix_clk variable will be 0 and for displays that are already enabled phy_pix_clk will have some value. Hence PLL will not be shared and if the display hardware doesn't have any more PLL to assign, mode set will fail due to resource unavailability.
[how]
Instead of only calculating the phy_pix_clk variable after the PLL is assigned for new display, this patch calculates phy_pix_clk also during the before assigning the PLL for new display.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
@@ -1917,6 +1917,8 @@ enum dc_status resource_map_pool_resources(} */ +calculate_phy_pix_clks (stream); +/* acquire new resources */ pipe_idx =acquire_first_free_pipe (&context->res_ctx, pool, stream);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 45/313 bpf: libbpf: retry map creation without the name
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 23499442c319412aa8e54e7a939e2eb531bdd77d ]
Since commit 88cda1c9da02 ("bpf: libbpf: Provide basic API support to specify BPF obj name"), libbpf unconditionally sets bpf_attr->name for maps. Pre v4.14 kernels don't know about map names and return an error about unexpected non-zero data. Retry sys_bpf without a map name to cover older kernels.
v2 changes:
* check for errno == EINVAL as suggested by Daniel Borkmann
--- tools/lib/bpf/bpf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/lib/bpf/bpf.c +10 -1
@@ -77,6 +77,7 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) {__u32 name_len = create_attr->name ?strlen (create_attr->name) :0 ;union bpf_attr attr; +int ret;memset (&attr,'\0' ,sizeof (attr));
@@ -94,7 +95,15 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) attr.map_ifindex = create_attr->map_ifindex; attr.inner_map_fd = create_attr->inner_map_fd; -return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + ret =sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); +if (ret <0 && errno ==EINVAL && create_attr->name) { +/* Retry the same syscall, but without the name. +* Pre v4.14 kernels don't support map names. +*/ +memset (attr.map_name,0 ,sizeof (attr.map_name)); +return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + } +return ret; } int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 47/313 modpost: validate symbol names also in find_elf_symbol
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ]
If an ARM mapping symbol shares an address with a valid symbol, find_elf_symbol can currently return the mapping symbol instead, as the symbol is not validated. This can result in confusing warnings:
WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference from the function set_reset_devices() to the variable .init.text:$x.0
This change adds a call to is_valid_name to find_elf_symbol, similarly to how it's already used in find_elf_symbol2.
--- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
scripts/mod/modpost.c +26 -24
@@ -1204,6 +1204,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch,return 1 ; } +static inline int is_arm_mapping_symbol (const char *str) +{ +return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) + && (str[2 ] =='\0' || str[2 ] =='.' ); +} + +/* +* If there's no name there, ignore it; likewise, ignore it if it's +* one of the magic symbols emitted used by current ARM tools. +* +* Otherwise if find_symbols_between() returns those symbols, they'll +* fail the whitelist tests and cause lots of false alarms ... fixable +* only by merging __exit and __init sections into __text, bloating +* the kernel (which is especially evil on embedded platforms). +*/ +static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) +{ +const char *name = elf->strtab + sym->st_name; + +if (!name || !strlen (name)) +return 0 ; +return !is_arm_mapping_symbol (name); +} +/** * Find symbol based on relocation record info. * In some cases the symbol supplied is a valid symbol so
@@ -1229,6 +1253,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,continue ;if (ELF_ST_TYPE (sym->st_info) ==STT_SECTION )continue ; +if (!is_valid_name (elf, sym)) +continue ;if (sym->st_value == addr)return sym;/* Find a symbol nearby - addr are maybe negative */
@@ -1247,30 +1273,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,return NULL ; } -static inline int is_arm_mapping_symbol (const char *str) -{ -return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) - && (str[2 ] =='\0' || str[2 ] =='.' ); -} - -/* -* If there's no name there, ignore it; likewise, ignore it if it's -* one of the magic symbols emitted used by current ARM tools. -* -* Otherwise if find_symbols_between() returns those symbols, they'll -* fail the whitelist tests and cause lots of false alarms ... fixable -* only by merging __exit and __init sections into __text, bloating -* the kernel (which is especially evil on embedded platforms). -*/ -static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) -{ -const char *name = elf->strtab + sym->st_name; - -if (!name || !strlen (name)) -return 0 ; -return !is_arm_mapping_symbol (name); -} -/* * Find symbols before or equal addr and after addr - in the section sec. * If we find two symbols with equal offset prefer one with a valid name.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 48/313 perf tools: Add Hygon Dhyana support
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4787eff3fa88f62fede6ed7afa06477ae6bf984d ]
The tool perf is useful for the performance analysis on the Hygon Dhyana platform. But right now there is no Hygon support for it to analyze the KVM guest os data. So add Hygon Dhyana support to it by checking vendor string to share the code path of AMD.
--- tools/perf/arch/x86/util/kvm-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/kvm-stat.c +1 -1
@@ -156,7 +156,7 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)if (strstr (cpuid,"Intel" )) { kvm->exit_reasons = vmx_exit_reasons; kvm->exit_reasons_isa ="VMX" ; - }else if (strstr (cpuid,"AMD" )) { + }else if (strstr (cpuid,"AMD" ) ||strstr (cpuid,"Hygon" )) { kvm->exit_reasons = svm_exit_reasons; kvm->exit_reasons_isa ="SVM" ; }else
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 49/313 soc/tegra: Dont leak device tree node reference
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it.
--- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/tegra/common.c +5 -1
@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = {bool soc_is_tegra (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (tegra_machine_match, root) !=NULL ; + match =of_match_node (tegra_machine_match, root); +of_node_put (root); + +return match !=NULL ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 50/313 media: rc: ensure close() is called on rc_unregister_device
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8e782fcf78275f505194e767c515202d4fd274bc ]
If userspace has an open file descriptor on the rc input device or lirc device when rc_unregister_device() is called, then the rc close() is never called.
This ensures that the receiver is turned off on the nuvoton-cir driver during shutdown.
--- drivers/media/rc/rc-main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/rc-main.c +2 -0
@@ -1956,6 +1956,8 @@ void rc_unregister_device(struct rc_dev *dev)rc_free_rx_device (dev);mutex_lock (&dev->lock); +if (dev->users && dev->close) + dev->close (dev); dev->registered = false;mutex_unlock (&dev->lock);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 51/313 media: video-i2c: avoid accessing released memory area when removing driver
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c764da98a600a4b068d25c77164f092f159cecec ]
The video device release() callback for video-i2c driver frees the whole struct video_i2c_data. If there is no user left for the video device when video_unregister_device() is called, the release callback is executed.
However, in video_i2c_remove() some fields (v4l2_dev, lock, and queue_lock) in struct video_i2c_data are still accessed after video_unregister_device() is called.
This fixes the use after free by moving the code from video_i2c_remove() to the release() callback.
--- drivers/media/i2c/video-i2c.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/i2c/video-i2c.c +6 -5
@@ -510,7 +510,12 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = {static void video_i2c_release (struct video_device *vdev) { -kfree (video_get_drvdata (vdev)); +struct video_i2c_data *data =video_get_drvdata (vdev); + +v4l2_device_unregister (&data->v4l2_dev); +mutex_destroy (&data->lock); +mutex_destroy (&data->queue_lock); +kfree (data); } static int video_i2c_probe(struct i2c_client *client,
@@ -608,10 +613,6 @@ static int video_i2c_remove(struct i2c_client *client)struct video_i2c_data *data =i2c_get_clientdata (client);video_unregister_device (&data->vdev); -v4l2_device_unregister (&data->v4l2_dev); - -mutex_destroy (&data->lock); -mutex_destroy (&data->queue_lock);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 16/313 scsi: lpfc: Correct LCB RJT handling
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ]
When LCB's are rejected, if beaconing was already in progress, the Reason Code Explanation was not being set. Should have been set to command in progress.
--- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +3 -0
@@ -5701,6 +5701,9 @@ error: stat = (struct ls_rjt *)(pcmd +sizeof (uint32_t )); stat->un.b.lsRjtRsnCode =LSRJT_UNABLE_TPC ; +if (shdr_add_status ==ADD_STATUS_OPERATION_ALREADY_ACTIVE ) + stat->un.b.lsRjtRsnCodeExp =LSEXP_CMD_IN_PROGRESS ; + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitLSRJT++; rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 25/313 drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ]
For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens.
The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment).
--- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +7 -5
@@ -315,12 +315,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)vc4_get_scaling_mode (vc4_state->src_h[1 ], vc4_state->crtc_h); -/* YUV conversion requires that horizontal scaling be enabled, -* even on a plane that's otherwise 1:1. Looks like only PPF -* works in that case, so let's pick that one. +/* YUV conversion requires that horizontal scaling be enabled +* on the UV plane even if vc4_get_scaling_mode() returned +* VC4_SCALING_NONE (which can happen when the down-scaling +* ratio is 0.5). Let's force it to VC4_SCALING_PPF in this +* case. */ -if (vc4_state->is_unity) - vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; +if (vc4_state->x_scaling[1 ] ==VC4_SCALING_NONE ) + vc4_state->x_scaling[1 ] =VC4_SCALING_PPF ; }else { vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 26/313 serial: fsl_lpuart: clear parity enable bit when disable parity
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ]
Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1477,6 +1477,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,else cr1 &= ~UARTCR1_PT ; } + }else { + cr1 &= ~UARTCR1_PE ; }/* ask the core to calculate the divisor */
@@ -1688,6 +1690,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,else ctrl &= ~UARTCTRL_PT ; } + }else { + ctrl &= ~UARTCTRL_PE ; }/* ask the core to calculate the divisor */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 53/313 staging: erofs: fix the definition of DBG_BUGON
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit eef168789866514e5d4316f030131c9fe65b643f ]
It's better not to positively BUG_ON the kernel, however developers need a way to locate issues as soon as possible.
DBG_BUGON is introduced and it could only crash when EROFS_FS_DEBUG (EROFS developping feature) is on. It is helpful for developers to find and solve bugs quickly by eng builds.
Previously, DBG_BUGON is defined as ((void)0) if EROFS_FS_DEBUG is off, but some unused variable warnings as follows could occur:
drivers/staging/erofs/unzip_vle.c: In function `init_alway:':drivers/staging/erofs/unzip_vle.c:61:33: warning: unused variable `work' [-Wunused-variable]
struct z_erofs_vle_work *const work =
^~~~
Fix it to #define DBG_BUGON(x) ((void)(x)).
--- drivers/staging/erofs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/erofs/internal.h +1 -1
@@ -39,7 +39,7 @@#define debugln (x, ...) ((void)0)#define dbg_might_sleep () ((void)0) -#define DBG_BUGON (...) ((void)0) +#define DBG_BUGON (x) ((void)(x))#endif #ifdef CONFIG_EROFS_FAULT_INJECTION
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 28/313 MIPS: Boston: Disable EG20T prefetch
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ]
The Intel EG20T Platform Controller Hub used on the MIPS Boston development board supports prefetching memory to optimize DMA transfers. Unfortunately for unknown reasons this doesn't work well with some MIPS CPUs such as the P6600, particularly when using an I/O Coherence Unit (IOCU) to provide cache-coherent DMA. In these systems it is common for DMA data to be lost, resulting in broken access to EG20T devices such as the MMC or SATA controllers.
Support for a DT property to configure the prefetching was added a while back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from device tree if passed") but we never added the DT snippet to make use of it. Add that now in order to disable the prefetching & fix DMA on the affected systems.
Patchwork: https://patchwork.linux-mips.org/patch/21068/
--- arch/mips/boot/dts/img/boston.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -141,6 +141,12 @@ #size-cells = <2>; #interrupt-cells = <1>; + eg20t_phub@2,0,0 { + compatible = "pci8086,8801"; + reg = <0x00020000 0 0 0 0>; + intel,eg20t-prefetch = <0>; + }; + eg20t_mac@2,0,1 { compatible = "pci8086,8802"; reg = <0x00020100 0 0 0 0>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 29/313 dpaa2-ptp: defer probe when portal allocation failed
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5500598abbfb5b46201b9768bd9ea873a5eeaece ]
The fsl_mc_portal_allocate can fail when the requested MC portals are not yet probed by the fsl_mc_allocator. In this situation, the driver should defer the probe.
--- drivers/staging/fsl-dpaa2/rtc/rtc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/staging/fsl-dpaa2/rtc/rtc.c +4 -1
@@ -142,7 +142,10 @@ static int rtc_probe(struct fsl_mc_device *mc_dev) err =fsl_mc_portal_allocate (mc_dev,0 , &mc_dev->mc_io);if (err) { -dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); +if (err == -ENXIO ) + err = -EPROBE_DEFER ; +else +dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); goto err_exit; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 31/313 staging:iio:ad2s90: Make probe handle spi_setup failure
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b3a3eafeef769c6982e15f83631dcbf8d1794efb ]
Previously, ad2s90_probe ignored the return code from spi_setup, not handling its possible failure. This patch makes ad2s90_probe check if the code is an error code and, if so, do the following:
- Call dev_err with an appropriate error message.
- Return the spi_setup's error code.
Note: The 'return ret' statement could be out of the 'if' block, but this whole block will be moved up in the function in the patch:
'staging:iio:ad2s90: Move device registration to the end of probe'.
--- drivers/staging/iio/resolver/ad2s90.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s90.c +6 -1
@@ -85,7 +85,12 @@ static int ad2s90_probe(struct spi_device *spi)/* need 600ns between CS and the first falling edge of SCLK */ spi->max_speed_hz =830000 ; spi->mode =SPI_MODE_3 ; -spi_setup (spi); + ret =spi_setup (spi); + +if (ret <0 ) { +dev_err (&spi->dev,"spi_setup failed!\n" ); +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 22/313 x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ]
In the expression "word1 << 16", word1 starts as u16, but is promoted to a signed int, then sign-extended to resource_size_t, which is probably not what was intended. Cast to resource_size_t to avoid the sign extension.
This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI:
Fix Broadcom CNB20LE unintended sign extension") back in 2014.
Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension")
--- arch/x86/pci/broadcom_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/broadcom_bus.c +2 -2
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) word1 =read_pci_config_16 (bus, slot, func,0xc0 ); word2 =read_pci_config_16 (bus, slot, func,0xc2 );if (word1 != word2) { - res.start = (word1 <<16 ) |0x0000 ; - res.end = (word2 <<16 ) |0xffff ; + res.start = ((resource_size_t ) word1 <<16 ) |0x0000 ; + res.end = ((resource_size_t ) word2 <<16 ) |0xffff ; res.flags =IORESOURCE_MEM ;update_res (info, res.start, res.end, res.flags,0 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 64/313 media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ]
The v4l2_dv_timings_cap struct is used to do sanity checks when setting and enumerating DV timings, ensuring that only valid timings as per the HW capabilities are allowed.
However, many drivers just filled in 0 for the minimum width, height or pixelclock frequency. This can cause timings with e.g. 0 as width and height to be accepted, which will in turn lead to a potential division by zero.
Fill in proper values are minimum boundaries. 640x350 was chosen since it is the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the v4l2-dv-timings.h header).
--- drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 ++-- drivers/media/i2c/adv7842.c | 4 ++-- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
drivers/media/i2c/ad9389b.c +1 -1
@@ -578,7 +578,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7511.c +1 -1
@@ -130,7 +130,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, + V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT, ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
drivers/media/i2c/adv7604.c +2 -2
@@ -766,7 +766,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -777,7 +777,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7842.c +2 -2
@@ -663,7 +663,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -674,7 +674,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/tc358743.c +1 -1
@@ -59,7 +59,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = {/* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 },/* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */ - V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE |
drivers/media/i2c/ths8200.c +1 -1
@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, -V4L2_INIT_BT_TIMINGS (0 ,1920 ,0 ,1080 ,25000000 ,148500000 , +V4L2_INIT_BT_TIMINGS (640 ,1920 ,350 ,1080 ,25000000 ,148500000 , V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 55/313 clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a5ac1ead32c9aac285f6436e09b4f6111996e9b8 ]
The cpu_div3 clock (cpu_in divided by 3) generates a signal with a duty cycle of 33%. The CPU clock however requires a clock signal with a duty cycle of 50% to run stable.cpu_div3 was observed to be problematic when cycling through all available CPU frequencies (with additional patches on top of this one) while running "stress --cpu 4" in the background. This caused sporadic hangs where the whole system would fully lock up.
Amlogic's 3.10 kernel code also does not use the cpu_div3 clock either when changing the CPU clock.
--- drivers/clk/meson/meson8b.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/clk/meson/meson8b.c +9 -2
@@ -596,20 +596,27 @@ static struct clk_regmap meson8b_cpu_scale_div = { }, }; +static u32 mux_table_cpu_scale_out_sel[] = {0 ,1 ,3 };static struct clk_regmap meson8b_cpu_scale_out_sel = { .data = &(struct clk_regmap_mux_data ){ .offset =HHI_SYS_CPU_CLK_CNTL0 , .mask =0x3 , .shift =2 , + .table = mux_table_cpu_scale_out_sel, }, .hw.init = &(struct clk_init_data ){ .name ="cpu_scale_out_sel" , .ops = &clk_regmap_mux_ro_ops, +/* +* NOTE: We are skipping the parent with value 0x2 (which is +* "cpu_div3") because it results in a duty cycle of 33% which +* makes the system unstable and can result in a lockup of the +* whole system. +*/ .parent_names = (const char *[]) {"cpu_in_sel" ,"cpu_div2" , -"cpu_div3" ,"cpu_scale_div" }, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , }, };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 66/313 staging: pi433: fix potential null dereference
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 64c4c4ca6c129a4191e8e1e91b2d5d9b8d08c518 ]
Add a test for successful call to cdev_alloc() to avoid potential null dereference. Issue reported by smatch.
--- drivers/staging/pi433/pi433_if.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/pi433/pi433_if.c +4 -0
@@ -1255,6 +1255,10 @@ static int pi433_probe(struct spi_device *spi)/* create cdev */ device->cdev =cdev_alloc (); +if (!device->cdev) { +dev_dbg (device->dev,"allocation of cdev failed" ); + goto cdev_failed; + } device->cdev->owner =THIS_MODULE ;cdev_init (device->cdev, &pi433_fops); retval =cdev_add (device->cdev, device->devt,1 );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 69/313 f2fs: fix race between write_checkpoint and write_begin
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ]
The following race could lead to inconsistent SIT bitmap:
Task A Task B
====== ======f2fs_write_checkpoint
block_operations
f2fs_lock_all
down_write(node_change)
down_write(node_write)
... sync ...
up_write(node_change)
f2fs_file_write_iter
set_inode_flag(FI_NO_PREALLOC)
......
f2fs_write_begin(index=0, has inline data)
prepare_write_begin
__do_map_lock(AIO) => down_read(node_change)
f2fs_convert_inline_page => update SIT
__do_map_lock(AIO) => up_read(node_change) f2fs_flush_sit_entries <= inconsistent SIT finish write checkpoint sudden-power-off
If SPO occurs after checkpoint is finished, SIT bitmap will be set incorrectly.
--- fs/f2fs/data.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +10 -2
@@ -2259,6 +2259,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,bool locked = false;struct extent_info ei = {0 ,0 ,0 };int err =0 ; +int flag;/* * we already allocated all the blocks, so we don't need to get
@@ -2268,9 +2269,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, !is_inode_flag_set(inode, FI_NO_PREALLOC))return 0 ; +/* f2fs_lock_op avoids race between write CP and convert_inline_page */ +if (f2fs_has_inline_data (inode) && pos + len >MAX_INLINE_DATA (inode)) + flag =F2FS_GET_BLOCK_DEFAULT ; +else + flag =F2FS_GET_BLOCK_PRE_AIO ; +if (f2fs_has_inline_data (inode) || (pos &PAGE_MASK ) >=i_size_read (inode)) { -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +__do_map_lock (sbi, flag, true); locked = true; } restart:
@@ -2308,6 +2315,7 @@ restart:f2fs_put_dnode (&dn);__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +WARN_ON (flag !=F2FS_GET_BLOCK_PRE_AIO ); locked = true; goto restart; }
@@ -2321,7 +2329,7 @@ out:f2fs_put_dnode (&dn); unlock_out:if (locked) -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +__do_map_lock (sbi, flag, false);return err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 70/313 f2fs: fix wrong return value of f2fs_acl_create
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() should return -EIO instead of -ENOMEM, this patch makes it consistent with posix_acl_create() which has been fixed in commit beaf226b863a ("posix_acl: don't ignore return value of posix_acl_create_masq()").
--- fs/f2fs/acl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/acl.c +8 -6
@@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return PTR_ERR (p); clone =f2fs_acl_clone (p,GFP_NOFS ); -if (!clone) - goto no_mem; +if (!clone) { + ret = -ENOMEM ; + goto release_acl; + } ret =f2fs_acl_create_masq (clone, mode);if (ret <0 ) - goto no_mem_clone; + goto release_clone;if (ret ==0 )posix_acl_release (clone);
@@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return 0 ; -no_mem_clone: +release_clone:posix_acl_release (clone); -no_mem: +release_acl:posix_acl_release (p); -return -ENOMEM ; +return ret; } int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 71/313 i2c: sh_mobile: add support for r8a77990 (R-Car E3)
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ]
Add support for the IIC code for the r8a77990 (R-Car E3).
It is not considered compatible with existing fallback bindings due to the documented absence of automatic transmission registers.
These registers are currently not used by the driver and thus the provides the same behaviour for "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic". The point of declaring incompatibility is to allow for automatic transmission register support to be added to "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -808,6 +808,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {},
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 72/313 arm64: io: Ensure calls to delay routines are ordered against prior readX()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ]
A relatively standard idiom for ensuring that a pair of MMIO writes to a device arrive at that device with a specified minimum delay between them is as follows:
writel_relaxed(42, dev_base + CTL1); readl(dev_base + CTL1); udelay(10); writel_relaxed(42, dev_base + CTL2);
the intention being that the read-back from the device will push the prior write to CTL1, and the udelay will hold up the write to CTL1 until at least 10us have elapsed.
Unfortunately, on arm64 where the underlying delay loop is implemented as a read of the architected counter, the CPU does not guarantee ordering from the readl() to the delay loop and therefore the delay loop could in theory be speculated and not provide the desired interval between the two writes.
Fix this in a similar manner to PowerPC by introducing a dummy control dependency on the output of readX() which, combined with the ISB in the read of the architected counter, guarantees that a subsequent delay loop can not be executed until the readX() has returned its result.
--- arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/arm64/include/asm/io.h +23 -8
@@ -106,7 +106,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb () rmb() +#define __iormb (v) \ +({ \ + unsigned long tmp; \ + \ + rmb(); \ + \ +/* \ +* Create a dummy control dependency from the IO read to any \ +* later instructions. This ensures that a subsequent call to \ +* udelay() will be ordered due to the ISB in get_cycles(). \ +*/ \ + asmvolatile ("eor %0, %1, %1\n" \ +"cbnz %0, ." \ + :"=r" (tmp) :"r" (v) :"memory" ); \ +}) +#define __iowmb () wmb()#define mmiowb () do { } while (0)
@@ -131,10 +146,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)* following Normal memory access. Writes are ordered relative to any prior * Normal memory access. */ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) +#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) +#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) +#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) +#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; })#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); })#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); })
@@ -185,9 +200,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);/* * io{read,write}{16,32,64}be() macros */ -#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) -#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) -#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) +#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) +#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) +#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; })#define iowrite16be (v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })#define iowrite32be (v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 56/313 clk: meson: meson8b: fix the width of the cpu_scale_div clock
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a8662eadd1032018f31e37deda811790b2326662 ]
According to the public S805 datasheet HHI_SYS_CPU_CLK_CNTL1[29:20] is the register for the CPU scale_div clock. This matches the code in Amlogic's 3.10 GPL kernel sources:
N = (aml_read_reg32(P_HHI_SYS_CPU_CLK_CNTL1) >> 20) & 0x3FF;
This means that the divider register is 10 bit wide instead of 9 bits. So far this is not a problem since all u-boot versions I have seen are not using the cpu_scale_div clock at all (instead they are configuring the CPU clock to run off cpu_in_sel directly).
The fixes tag points to the latest rework of the CPU clocks. However, even before the rework it was wrong. Commit 7a29a869434e8b ("clk: meson:
Add support for Meson clock controller") defines MESON_N_WIDTH as 9 (in drivers/clk/meson/clk-cpu.c). But since the old clk-cpu implementation this only carries the fixes tag for the CPU clock rewordk.
--- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +1 -1
@@ -583,7 +583,7 @@ static struct clk_regmap meson8b_cpu_scale_div = { .data = &(struct clk_regmap_div_data){ .offset =HHI_SYS_CPU_CLK_CNTL1 , .shift =20 , - .width =9 , + .width =10 , .table = cpu_scale_table, .flags =CLK_DIVIDER_ALLOW_ZERO , },
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 74/313 sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ]
__vdc_tx_trigger should only loop on EAGAIN a finite number of times.
See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail.
--- drivers/block/sunvdc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/sunvdc.c +5 -0
@@ -45,6 +45,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);#define WAITING_FOR_GEN_CMD 0x04#define WAITING_FOR_ANY -1 +#define VDC_MAX_RETRIES 10 +static struct workqueue_struct *sunvdc_wq;struct vdc_req_entry {
@@ -431,6 +433,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) .end_idx = dr->prod, };int err, delay; +int retries =0 ; hdr.seq = dr->snd_nxt; delay =1 ;
@@ -443,6 +446,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)udelay (delay);if ((delay <<=1 ) >128 ) delay =128 ; +if (retries++ >VDC_MAX_RETRIES ) +break ; }while (err == -EAGAIN );if (err == -ENOTCONN )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 75/313 soc: bcm: brcmstb: Dont leak device tree node reference
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_brcmstb() doesn't do that, so fix it.
[treding: slightly rewrite to avoid inline comparison]
--- drivers/soc/bcm/brcmstb/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/common.c +5 -1
@@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = {bool soc_is_brcmstb (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (brcmstb_machine_match, root) !=NULL ; + match =of_match_node (brcmstb_machine_match, root); +of_node_put (root); + +return match !=NULL ; }u32 brcmstb_get_family_id (void )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 76/313 nfsd4: fix crash on writing v4_end_grace before nfsd startup
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ]
Anatoly Trosinenko reports that this:
1) Checkout fresh master Linux branch (tested with commit e195ca6cb)
2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build
3) From kvm-xfstests shell:
results in NULL dereference in locks_end_grace.
Check that nfsd has been started before trying to end the grace period.
--- fs/nfsd/nfsctl.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfsctl.c +2 -0
@@ -1126,6 +1126,8 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)case 'Y' :case 'y' :case '1' : +if (nn->nfsd_serv) +return -EBUSY ;nfsd4_end_grace (nn);break ;default :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 77/313 drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aa394b0dd68cb00c483e151dcd84713d4d517ed1 ]
drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to the context given in the argument and leaves it in state after it quits. The lifetime of state and context are not guaranteed to be the same, so we shouldn't leave that pointer hanging around. This patch resets the context to NULL to avoid any oopses.
Changes in v2:
- Added to the set
--- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +6 -2
@@ -3192,7 +3192,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend);int drm_atomic_helper_commit_duplicated_state (struct drm_atomic_state *state,struct drm_modeset_acquire_ctx *ctx) { -int i; +int i, ret;struct drm_plane *plane;struct drm_plane_state *new_plane_state;struct drm_connector *connector;
@@ -3211,7 +3211,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,for_each_new_connector_in_state (state, connector, new_conn_state, i) state->connectors[i].old_state = connector->state; -return drm_atomic_commit (state); + ret =drm_atomic_commit (state); + + state->acquire_ctx =NULL ; + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_commit_duplicated_state);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 78/313 perf: arm_spe: handle devm_kasprintf() failure
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to 'name' is not safe if unchecked. If NULL is passed in for name then perf_pmu_register() would not fail but rather silently jump to skip_type which is not the intent here. As perf_pmu_register() may also return -ENOMEM returning -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here as well.
--- drivers/perf/arm_spe_pmu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/perf/arm_spe_pmu.c +5 -0
@@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) idx =atomic_inc_return (&pmu_idx); name =devm_kasprintf (dev,GFP_KERNEL ,"%s_%d" ,PMUNAME , idx); +if (!name) { +dev_err (dev,"failed to allocate name for pmu %d\n" , idx); +return -ENOMEM ; + } +return perf_pmu_register (&spe_pmu->pmu, name,-1 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 79/313 arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ]
As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines are ordered against prior readX()"), MMIO reads smaller than 64 bits fail to compile under clang because we end up mixing 32-bit and 64-bit register operands for the same data processing instruction:
./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths]
return readb(addr);
^
./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb'
^
./include/asm-generic/io.h:695:9: note: use constraint modifier "w"
./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb'
^
./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb'
asm volatile("eor %0, %1, %1\n" \
^Fix the build by casting the macro argument to 'unsigned long' when used as an input to the inline asm.
--- arch/arm64/include/asm/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/io.h +2 -1
@@ -119,7 +119,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)*/ \ asmvolatile ("eor %0, %1, %1\n" \"cbnz %0, ." \ - :"=r" (tmp) :"r" (v) :"memory" ); \ + :"=r" (tmp) :"r" ((unsigned long )(v)) \ + :"memory" ); \ })#define __iowmb () wmb()
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 80/313 Thermal: do not clear passive state during system sleep
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ]
commit ff140fea847e ("Thermal: handle thermal zone device properly during system sleep") added PM hook to call thermal zone reset during sleep. However resetting thermal zone will also clear the passive state and thus cancel the polling queue which leads the passive cooling device state not being cleared properly after sleep.
thermal_pm_notify => thermal_zone_device_reset set passive to 0 thermal_zone_trip_update will skip update passive as `old_target == instance->target'.monitor_thermal_zone => thermal_zone_device_set_polling will cancel tz->poll_queue, so the cooling device state will not be changed afterwards.
--- drivers/thermal/thermal_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +8 -4
@@ -451,16 +451,20 @@ static void update_temperature(struct thermal_zone_device *tz) tz->last_temperature, tz->temperature); } -static void thermal_zone_device_reset (struct thermal_zone_device *tz) +static void thermal_zone_device_init (struct thermal_zone_device *tz) {struct thermal_instance *pos; - tz->temperature =THERMAL_TEMP_INVALID ; - tz->passive =0 ;list_for_each_entry (pos, &tz->thermal_instances, tz_node) pos->initialized = false; } +static void thermal_zone_device_reset (struct thermal_zone_device *tz) +{ + tz->passive =0 ; +thermal_zone_device_init (tz); +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
@@ -1502,7 +1506,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { -thermal_zone_device_reset (tz); +thermal_zone_device_init (tz);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 83/313 s390/zcrypt: improve special ap message cmd handling
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit be534791011100d204602e2e0496e9e6ce8edf63 ]
There exist very few ap messages which need to have the 'special' flag enabled. This flag tells the firmware layer to do some pre- and maybe postprocessing. However, it may happen that this special flag is enabled but the firmware is unable to deal with this kind of message and thus returns with reply code 0x41. For example older firmware may not know the newest messages triggered by the zcrypt device driver and thus react with reject and the named reply code. Unfortunately this reply code is not known to the zcrypt error routines and thus default behavior is to switch the ap queue offline.
This patch now makes the ap error routine aware of the reply code and so userspace is informed about the bad processing result but the queue is not switched to offline state any more.
--- arch/s390/include/uapi/asm/zcrypt.h | 4 ++-- drivers/s390/crypto/zcrypt_error.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/zcrypt.h +2 -2
@@ -147,8 +147,8 @@ struct ica_xcRB {* @cprb_len: CPRB header length [0x0020] * @cprb_ver_id: CPRB version id. [0x04] * @pad_000: Alignment pad bytes -* @flags: Admin cmd [0x80] or functional cmd [0x00] -* @func_id: Function id / subtype [0x5434] +* @flags: Admin bit [0x80], Special bit [0x20] +* @func_id: Function id / subtype [0x5434] "T4" * @source_id: Source id [originator id] * @target_id: Target id [usage/ctrl domain id] * @ret_code: Return code
drivers/s390/crypto/zcrypt_error.h +2 -0
@@ -52,6 +52,7 @@ struct error_hdr {#define REP82_ERROR_FORMAT_FIELD 0x29#define REP82_ERROR_INVALID_COMMAND 0x30#define REP82_ERROR_MALFORMED_MSG 0x40 +#define REP82_ERROR_INVALID_SPECIAL_CMD 0x41#define REP82_ERROR_INVALID_DOMAIN_PRECHECK 0x42#define REP82_ERROR_RESERVED_FIELDO 0x50/* old value */ #define REP82_ERROR_WORD_ALIGNMENT 0x60
@@ -90,6 +91,7 @@ static inline int convert_error(struct zcrypt_queue *zq,case REP88_ERROR_MESSAGE_MALFORMD :case REP82_ERROR_INVALID_DOMAIN_PRECHECK :case REP82_ERROR_INVALID_DOMAIN_PENDING : +case REP82_ERROR_INVALID_SPECIAL_CMD :// REP88_ERROR_INVALID_KEY // '82' CEX2A // REP88_ERROR_OPERAND // '84' CEX2A // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 84/313 mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6bf4a8e902aad7df55d7f2b10b850cfa3f880996 ]
Fix IBI_R11 configuration on non-radar channels for mt76x0e driver. This patch improve system stability under heavy load. Moreover use IBI_R11 name and remove magic numbers for 0x212c register
--- drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2_dfs.c +6 -2
@@ -799,7 +799,7 @@ static void mt76x2_dfs_set_bbp_params(struct mt76x2_dev *dev)/* enable detection*/ mt76_wr (dev,MT_BBP (DFS ,0 ),MT_DFS_CH_EN <<16 ); -mt76_wr (dev,0x212c ,0x0c350001 ); +mt76_wr (dev,MT_BBP (IBI ,11 ),0x0c350001 ); }void mt76x2_dfs_adjust_agc (struct mt76x2_dev *dev)
@@ -842,7 +842,11 @@ void mt76x2_dfs_init_params(struct mt76x2_dev *dev)mt76_wr (dev,MT_BBP (DFS ,0 ),0 );/* clear detector status */ mt76_wr (dev,MT_BBP (DFS ,1 ),0xf ); -mt76_wr (dev,0x212c ,0 ); +if (mt76_chip (&dev->mt76) ==0x7610 || +mt76_chip (&dev->mt76) ==0x7630 ) +mt76_wr (dev,MT_BBP (IBI ,11 ),0xfde8081 ); +else +mt76_wr (dev,MT_BBP (IBI ,11 ),0 );mt76x2_irq_disable (dev,MT_INT_GPTIMER ); mt76_rmw_field(dev, MT_INT_TIMER_EN,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 85/313 arm64: ftrace: dont adjust the LR value
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ]
The core ftrace code requires that when it is handed the PC of an instrumented function, this PC is the address of the instrumented instruction. This is necessary so that the core ftrace code can identify the specific instrumentation site. Since the instrumented function will be a BL, the address of the instrumented function is LR - 4 at entry to the ftrace code.
This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, which acquire the PC of the instrumented function.
The mcount_get_lr helper is used to acquire the LR of the instrumented function, whose value does not require this adjustment, and cannot be adjusted to anything meaningful. No adjustment of this value is made on other architectures, including arm. However, arm64 adjusts this value by 4.
This patch brings arm64 in line with other architectures and removes the adjustment of the LR value.
--- arch/arm64/kernel/entry-ftrace.S | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/entry-ftrace.S +0 -1
@@ -79,7 +79,6 @@ .macro mcount_get_lr reg ldr \reg, [x29] ldr \reg, [\reg, #8] - mcount_adjust_addr \reg, \reg .endm .macro mcount_get_lr_addr reg
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 86/313 drm/v3d: Fix prime imports of buffers from other drivers.
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 62d1a752874962f072de8a779e960fcd2ab4847b ]
v3d_bo_get_pages() checks this to decide to map the imported buffer instead of the backing shmem file. The caller was about to set this value anyway, and there's no error path in between. Ideally we wouldn't even allocate the shmem file for our imports, but that's a more invasive fix.
--- drivers/gpu/drm/v3d/v3d_bo.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/v3d/v3d_bo.c +1 -0
@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, bo->resv = attach->dmabuf->resv; bo->sgt = sgt; + obj->import_attach = attach;v3d_bo_get_pages (bo);v3d_mmu_insert_ptes (bo);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 58/313 ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aea0a897af9e44c258e8ab9296fad417f1bc063a ]
Fix smatch warning:
drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn:
passing zero to 'ERR_PTR'
'err' should be set while device_create_with_groups and pps_register_source fails
--- drivers/ptp/ptp_clock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +4 -1
@@ -253,8 +253,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, ptp->dev =device_create_with_groups (ptp_class, parent, ptp->devid, ptp, ptp->pin_attr_groups,"ptp%d" , ptp->index); -if (IS_ERR (ptp->dev)) +if (IS_ERR (ptp->dev)) { + err =PTR_ERR (ptp->dev); goto no_device; + }/* Register a new PPS source. */ if (info->pps) {
@@ -265,6 +267,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, pps.owner = info->owner; ptp->pps_source =pps_register_source (&pps,PTP_PPS_DEFAULTS );if (!ptp->pps_source) { + err = -EINVAL ;pr_err ("failed to register pps source\n" ); goto no_pps; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 60/313 powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit beba24ac59133cb36ecd03f9af9ccb11971ee20e ]
When both CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y and CONFIG_UBSAN=y are set, link step typically produce numberous warnings about orphan section:
+ powerpc-linux-gnu-ld -EB -m elf32ppc -Bstatic --orphan-handling=warn --build-id --gc-sections -X -o .tmp_vmlinux1 -T ./arch/powerpc/kernel/vmlinux.lds --who le-archive built-in.a --no-whole-archive --start-group lib/lib.a --end-group
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data393' from init/main.o' being placed in section `.data..Lubsan_data393'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data394' from init/main.o' being placed in section `.data..Lubsan_data394'.
...
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type11' from init/main.o' being placed in section `.data..Lubsan_type11'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type12' from init/main.o' being placed in section `.data..Lubsan_type12'.
...
This commit remove those warnings produced at W=1.
--- arch/powerpc/kernel/vmlinux.lds.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/vmlinux.lds.S +4 -0
@@ -296,6 +296,10 @@ SECTIONS #ifdef CONFIG_PPC32 .data : AT(ADDR(.data) - LOAD_OFFSET) { DATA_DATA +#ifdef CONFIG_UBSAN + *(.data..Lubsan_data*) + *(.data..Lubsan_type*) +#endif *(.data.rel*) *(SDATA_MAIN) *(.sdata2)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 61/313 iio: adc: meson-saradc: check for devm_kasprintf failure
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aad172b017617994343e36d8659c69e14cd694fd ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_sar_adc_clk_init() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/iio/adc/meson_saradc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/adc/meson_saradc.c +6 -0
@@ -589,6 +589,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =0 ; init.ops = &clk_divider_ops; clk_parents[0 ] =__clk_get_name (priv->clkin);
@@ -608,6 +611,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =CLK_SET_RATE_PARENT ; init.ops = &clk_gate_ops; clk_parents[0 ] =__clk_get_name (priv->adc_div_clk);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 62/313 iio: adc: meson-saradc: fix internal clock names
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ]
Before this patch we are registering the internal clocks (for example on Meson8b, where the SAR ADC IP block implements the divider and gate clocks) with the following names:
- /soc/cbus@c1100000/adc@8680#adc_div
- /soc/cbus@c1100000/adc@8680#adc_en
This is bad because the common clock framework uses the clock to create a directory in <debugfs>/clk. With such name, the directory creation (silently) fails and the debugfs entry ends up being created at the debugfs root.
With this change, the new clock names are:
- c1108680.adc#adc_div
- c1108680.adc#adc_en
This matches the clock naming scheme used in the PWM, Ethernet and MMC drivers. It also fixes the problem with debugfs.
The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson:
Fix mux clock names").
--- drivers/iio/adc/meson_saradc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/meson_saradc.c +4 -4
@@ -587,8 +587,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,struct clk_init_data init;const char *clk_parents[1 ]; - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_div" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
@@ -609,8 +609,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,if (WARN_ON (IS_ERR (priv->adc_div_clk)))return PTR_ERR (priv->adc_div_clk); - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_en" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 63/313 iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7f6232e69539971cf9eaed07a6c14ab4a2361133 ]
Various 2-in-1's use KIOX010A and KIOX020A as HIDs for 2 KXCJ91008 accelerometers. The KIOX010A HID is for the one in the base and the KIOX020A for the accelerometer in the keyboard.
Since userspace does not have a way yet to deal with (or ignore) the accelerometer in the keyboard, this commit just adds the KIOX010A HID for now so that display rotation will work.
Related: https://github.com/hadess/iio-sensor-proxy/issues/166
--- drivers/iio/accel/kxcjk-1013.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
@@ -1490,6 +1490,7 @@ static const struct acpi_device_id kx_acpi_match[] = { {"KXCJ1008", KXCJ91008}, {"KXCJ9000", KXCJ91008}, {"KIOX000A", KXCJ91008}, + {"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */ {"KXTJ1009", KXTJ21009}, {"SMO8500", KXCJ91008}, { },
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 54/313 x86/resctrl: Fixup the user-visible strings
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 723f1a0dd8e26a7523ba068204bee11c95ded38d ]
Fix the messages in rdt_last_cmd_printf() and rdt_last_cmd_puts() to make them more meaningful and consistent.
[ bp: s/cpu/CPU/; s/mem\W/memory ]
--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++++++------- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++++++++---------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 ++++++++++----------- 3 files changed, 46 insertions(+), 46 deletions(-)
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +11 -11
@@ -71,7 +71,7 @@ int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,unsigned long bw_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -97,12 +97,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) ret =kstrtoul (buf,16 , &val);if (ret) { -rdt_last_cmd_printf ("non-hex character in mask %s\n" , buf); +rdt_last_cmd_printf ("Non-hex character in the mask %s\n" , buf);return false; }if (val ==0 || val > r->default_ctrl) { -rdt_last_cmd_puts ("mask out of range\n" ); +rdt_last_cmd_puts ("Mask out of range\n" );return false; }
@@ -110,12 +110,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) zero_bit =find_next_zero_bit (&val, cbm_len, first_bit);if (find_next_bit (&val, cbm_len, zero_bit) < cbm_len) { -rdt_last_cmd_printf ("mask %lx has non-consecutive 1-bits\n" , val); +rdt_last_cmd_printf ("The mask %lx has non-consecutive 1-bits\n" , val);return false; }if ((zero_bit - first_bit) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("Need at least %d bits in mask\n" , +rdt_last_cmd_printf ("Need at least %d bits in the mask\n" , r->cache.min_cbm_bits);return false; }
@@ -135,7 +135,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,u32 cbm_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -145,7 +145,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP &&rdtgroup_pseudo_locked_in_hierarchy (d)) { -rdt_last_cmd_printf ("pseudo-locked region in hierarchy\n" ); +rdt_last_cmd_printf ("Pseudo-locked region in hierarchy\n" );return -EINVAL ; }
@@ -164,14 +164,14 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,* either is exclusive. */ if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, true)) { -rdt_last_cmd_printf ("overlaps with exclusive group\n" ); +rdt_last_cmd_printf ("Overlaps with exclusive group\n" );return -EINVAL ; }if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, false)) {if (rdtgrp->mode ==RDT_MODE_EXCLUSIVE || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { -rdt_last_cmd_printf ("overlaps with other group\n" ); +rdt_last_cmd_printf ("0verlaps with other group\n" );return -EINVAL ; } }
@@ -293,7 +293,7 @@ static int rdtgroup_parse_resource(char *resname, char *tok,if (!strcmp (resname, r->name) && rdtgrp->closid < r->num_closid)return parse_line (tok, r, rdtgrp); } -rdt_last_cmd_printf ("unknown/unsupported resource name '%s'\n" , resname); +rdt_last_cmd_printf ("Unknown or unsupported resource name '%s'\n" , resname);return -EINVAL ; }
@@ -326,7 +326,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret = -EINVAL ; -rdt_last_cmd_puts ("resource group is pseudo-locked\n" ); +rdt_last_cmd_puts ("Resource group is pseudo-locked\n" ); goto out; }
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +17 -17
@@ -221,7 +221,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)for_each_cpu (cpu, &plr->d->cpu_mask) { pm_req =kzalloc (sizeof (*pm_req),GFP_KERNEL );if (!pm_req) { -rdt_last_cmd_puts ("fail allocating mem for PM QoS\n" ); +rdt_last_cmd_puts ("Failure to allocate memory for PM QoS\n" ); ret = -ENOMEM ; goto out_err; }
@@ -230,7 +230,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)DEV_PM_QOS_RESUME_LATENCY , 30);if (ret <0 ) { -rdt_last_cmd_printf ("fail to add latency req cpu%d\n" , +rdt_last_cmd_printf ("Failed to add latency req CPU%d\n" , cpu);kfree (pm_req); ret =-1 ;
@@ -297,7 +297,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) plr->cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (plr->cpu)) { -rdt_last_cmd_printf ("cpu %u associated with cache not online\n" , +rdt_last_cmd_printf ("CPU %u associated with cache not online\n" , plr->cpu); ret = -ENODEV ; goto out_region;
@@ -315,7 +315,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) } ret =-1 ; -rdt_last_cmd_puts ("unable to determine cache line size\n" ); +rdt_last_cmd_puts ("Unable to determine cache line size\n" ); out_region:pseudo_lock_region_clear (plr);return ret;
@@ -369,14 +369,14 @@ static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)* KMALLOC_MAX_SIZE. */ if (plr->size >KMALLOC_MAX_SIZE ) { -rdt_last_cmd_puts ("requested region exceeds maximum size\n" ); +rdt_last_cmd_puts ("Requested region exceeds maximum size\n" ); ret = -E2BIG ; goto out_region; } plr->kmem =kzalloc (plr->size,GFP_KERNEL );if (!plr->kmem) { -rdt_last_cmd_puts ("unable to allocate memory\n" ); +rdt_last_cmd_puts ("Unable to allocate memory\n" ); ret = -ENOMEM ; goto out_region; }
@@ -673,7 +673,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)* default closid associated with it. */ if (rdtgrp == &rdtgroup_default) { -rdt_last_cmd_puts ("cannot pseudo-lock default group\n" ); +rdt_last_cmd_puts ("Cannot pseudo-lock default group\n" );return -EINVAL ; }
@@ -715,17 +715,17 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)*/ prefetch_disable_bits =get_prefetch_disable_bits ();if (prefetch_disable_bits ==0 ) { -rdt_last_cmd_puts ("pseudo-locking not supported\n" ); +rdt_last_cmd_puts ("Pseudo-locking not supported\n" );return -EINVAL ; }if (rdtgroup_monitor_in_progress (rdtgrp)) { -rdt_last_cmd_puts ("monitoring in progress\n" ); +rdt_last_cmd_puts ("Monitoring in progress\n" );return -EINVAL ; }if (rdtgroup_tasks_assigned (rdtgrp)) { -rdt_last_cmd_puts ("tasks assigned to resource group\n" ); +rdt_last_cmd_puts ("Tasks assigned to resource group\n" );return -EINVAL ; }
@@ -735,13 +735,13 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp) }if (rdtgroup_locksetup_user_restrict (rdtgrp)) { -rdt_last_cmd_puts ("unable to modify resctrl permissions\n" ); +rdt_last_cmd_puts ("Unable to modify resctrl permissions\n" );return -EIO ; } ret =pseudo_lock_init (rdtgrp);if (ret) { -rdt_last_cmd_puts ("unable to init pseudo-lock region\n" ); +rdt_last_cmd_puts ("Unable to init pseudo-lock region\n" ); goto out_release; }
@@ -778,7 +778,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" );return ret; } rdtgrp->mon.rmid = ret;
@@ -1234,7 +1234,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) "pseudo_lock/%u", plr->cpu);if (IS_ERR (thread)) { ret =PTR_ERR (thread); -rdt_last_cmd_printf ("locking thread returned error %d\n" , ret); +rdt_last_cmd_printf ("Locking thread returned error %d\n" , ret); goto out_cstates; }
@@ -1252,13 +1252,13 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)* the cleared, but not freed, plr struct resulting in an * empty pseudo-locking loop. */ -rdt_last_cmd_puts ("locking thread interrupted\n" ); +rdt_last_cmd_puts ("Locking thread interrupted\n" ); goto out_cstates; } ret =pseudo_lock_minor_get (&new_minor);if (ret <0 ) { -rdt_last_cmd_puts ("unable to obtain a new minor number\n" ); +rdt_last_cmd_puts ("Unable to obtain a new minor number\n" ); goto out_cstates; }
@@ -1290,7 +1290,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)if (IS_ERR (dev)) { ret =PTR_ERR (dev); -rdt_last_cmd_printf ("failed to create character device: %d\n" , +rdt_last_cmd_printf ("Failed to create character device: %d\n" , ret); goto out_debugfs; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +18 -18
@@ -335,7 +335,7 @@ static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,/* Check whether cpus belong to parent ctrl group */ cpumask_andnot (tmpmask, newmask, &prgrp->cpu_mask);if (cpumask_weight (tmpmask)) { -rdt_last_cmd_puts ("can only add CPUs to mongroup that belong to parent\n" ); +rdt_last_cmd_puts ("Can only add CPUs to mongroup that belong to parent\n" );return -EINVAL ; }
@@ -460,14 +460,14 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,rdt_last_cmd_clear ();if (!rdtgrp) { ret = -ENOENT ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto unlock; }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -477,7 +477,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, ret =cpumask_parse (buf, newmask);if (ret) { -rdt_last_cmd_puts ("bad cpu list/mask\n" ); +rdt_last_cmd_puts ("Bad CPU list/mask\n" ); goto unlock; }
@@ -485,7 +485,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,cpumask_andnot (tmpmask, newmask, cpu_online_mask);if (cpumask_weight (tmpmask)) { ret = -EINVAL ; -rdt_last_cmd_puts ("can only assign online cpus\n" ); +rdt_last_cmd_puts ("Can only assign online CPUs\n" ); goto unlock; }
@@ -564,7 +564,7 @@ static int __rdtgroup_move_task(struct task_struct *tsk,*/ atomic_dec (&rdtgrp->waitcount);kfree (callback); -rdt_last_cmd_puts ("task exited\n" ); +rdt_last_cmd_puts ("Task exited\n" ); }else {/* * For ctrl_mon groups move both closid and rmid.
@@ -682,7 +682,7 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -1042,14 +1042,14 @@ static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)list_for_each_entry (d, &r->domains, list) {if (rdtgroup_cbm_overlaps (r, d, d->ctrl_val[closid], rdtgrp->closid, false)) { -rdt_last_cmd_puts ("schemata overlaps\n" ); +rdt_last_cmd_puts ("Schemata overlaps\n" );return false; } } }if (!has_cache) { -rdt_last_cmd_puts ("cannot be exclusive without CAT/CDP\n" ); +rdt_last_cmd_puts ("Cannot be exclusive without CAT/CDP\n" );return false; }
@@ -1090,7 +1090,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out;if (mode ==RDT_MODE_PSEUDO_LOCKED ) { -rdt_last_cmd_printf ("cannot change pseudo-locked group\n" ); +rdt_last_cmd_printf ("Cannot change pseudo-locked group\n" ); ret = -EINVAL ; goto out; }
@@ -1119,7 +1119,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out; rdtgrp->mode =RDT_MODE_PSEUDO_LOCKSETUP ; }else { -rdt_last_cmd_printf ("unknown/unsupported mode\n" ); +rdt_last_cmd_printf ("Unknown orunsupported mode\n" ); ret = -EINVAL ; }
@@ -2403,7 +2403,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) tmp_cbm = d->new_ctrl;if (bitmap_weight (&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("no space on %s:%d\n" , +rdt_last_cmd_printf ("No space on %s:%d\n" , r->name, d->id);return -ENOSPC ; }
@@ -2420,7 +2420,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)continue ; ret =update_domains (r, rdtgrp->closid);if (ret <0 ) { -rdt_last_cmd_puts ("failed to initialize allocations\n" ); +rdt_last_cmd_puts ("Failed to initialize allocations\n" );return ret; } rdtgrp->mode =RDT_MODE_SHAREABLE ;
@@ -2443,7 +2443,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,rdt_last_cmd_clear ();if (!prdtgrp) { ret = -ENODEV ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto out_unlock; }
@@ -2451,7 +2451,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, (prdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || prdtgrp->mode == RDT_MODE_PSEUDO_LOCKED)) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto out_unlock; }
@@ -2459,7 +2459,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, rdtgrp =kzalloc (sizeof (*rdtgrp),GFP_KERNEL );if (!rdtgrp) { ret = -ENOSPC ; -rdt_last_cmd_puts ("kernel out of memory\n" ); +rdt_last_cmd_puts ("Kernel out of memory\n" ); goto out_unlock; } *r = rdtgrp;
@@ -2500,7 +2500,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" ); goto out_destroy; } rdtgrp->mon.rmid = ret;
@@ -2588,7 +2588,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, kn = rdtgrp->kn; ret =closid_alloc ();if (ret <0 ) { -rdt_last_cmd_puts ("out of CLOSIDs\n" ); +rdt_last_cmd_puts ("Out of CLOSIDs\n" ); goto out_common_fail; } closid = ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 88/313 ARM: mmp/mmp2: dt: enable the clock
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ]
The device-tree booted MMP2 needs to enable the timer clock, otherwise it would stop ticking when the boot finishes.
It can also use the clock rate from the clk, the non-DT boards need to keep using the hardcoded rates.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ 4 files changed, 23 insertions(+), 15 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq); +extern void timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ); +timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ); +timer_init (IRQ_PXA168_TIMER1 ,6500000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/time.c +20 -12
@@ -22,6 +22,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clk.h> #include <linux/io.h> #include <linux/irq.h>
@@ -38,12 +39,6 @@#include "cputype.h" #include "clock.h" -#ifdef CONFIG_CPU_MMP2 -#define MMP_CLOCK_FREQ 6500000 -#else -#define MMP_CLOCK_FREQ 3250000 -#endif -#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE#define MAX_DELTA (0xfffffffe)
@@ -189,19 +184,18 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq) +void __init timer_init (int irq,unsigned long rate) {timer_config (); -sched_clock_register (mmp_read_sched_clock,32 ,MMP_CLOCK_FREQ ); +sched_clock_register (mmp_read_sched_clock,32 , rate); ckevt.cpumask =cpumask_of (0 );setup_irq (irq, &timer_irq); -clocksource_register_hz (&cksrc,MMP_CLOCK_FREQ ); -clockevents_config_and_register (&ckevt,MMP_CLOCK_FREQ , -MIN_DELTA ,MAX_DELTA ); +clocksource_register_hz (&cksrc, rate); +clockevents_config_and_register (&ckevt, rate,MIN_DELTA ,MAX_DELTA ); }#ifdef CONFIG_OF
@@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = {void __init mmp_dt_init_timer (void ) {struct device_node *np; +struct clk *clk;int irq, ret; +unsigned long rate; np =of_find_matching_node (NULL , mmp_timer_dt_ids);if (!np) {
@@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) goto out; } + clk =of_clk_get (np,0 ); +if (!IS_ERR (clk)) { + ret =clk_prepare_enable (clk); +if (ret) + goto out; + rate =clk_get_rate (clk) /2 ; + }else if (cpu_is_pj4 ()) { + rate =6500000 ; + }else { + rate =3250000 ; + } + irq =irq_of_parse_and_map (np,0 );if (!irq) { ret = -EINVAL ;
@@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq); +timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 97/313 usb: hub: delay hub autosuspend if USB3 port is still link training
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ]
When initializing a hub we want to give a USB3 port in link training the same debounce delay time before autosuspening the hub as already trained, connected enabled ports.
USB3 ports won't reach the enabled state with "current connect status" and "connect status change" bits set until the USB3 link training finishes.
Catching the port in link training (polling) and adding the debounce delay prevents unnecessary failed attempts to autosuspend the hub.
--- drivers/usb/core/hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/core/hub.c +10 -0
@@ -1111,6 +1111,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } +/* +* Add debounce if USB3 link is in polling/link training state. +* Link will automatically transition to Enabled state after +* link training completes. +*/ +if (hub_is_superspeed (hdev) && + ((portstatus &USB_PORT_STAT_LINK_STATE ) == +USB_SS_PORT_LS_POLLING )) + need_debounce_delay = true; +/* Clear status-change flags; we'll debounce later */ if (portchange &USB_PORT_STAT_C_CONNECTION ) { need_debounce_delay = true;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 99/313 usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a0678e2eed41e81004308693ac84ea95614b0920 ]
Fix the issue: device doesn't accept LGO_U1/U2:
1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2
by default;
2. enable/disable controller to initiate requests for transition into
U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE;--- drivers/usb/mtu3/mtu3_core.c | 4 +++- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/usb/mtu3/mtu3_core.c +3 -1
@@ -578,8 +578,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* disable LGO_U1/U2 by default */ mtu3_clrbits (mbase,U3D_LINK_POWER_CONTROL , -SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE |SW_U1_REQUEST_ENABLE |SW_U2_REQUEST_ENABLE ); +/* enable accept LGO_U1/U2 link command from host */ +mtu3_setbits (mbase,U3D_LINK_POWER_CONTROL , +SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE );/* device responses to u3_exit from host automatically */ mtu3_clrbits (mbase,U3D_LTSSM_CTRL ,SOFT_U3_EXIT_EN );/* automatically build U2 link when U3 detect fail */
drivers/usb/mtu3/mtu3_gadget_ep0.c +4 -4
@@ -336,9 +336,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U1_ACCEPT_ENABLE ; + lpc |=SW_U1_REQUEST_ENABLE ;else - lpc &= ~SW_U1_ACCEPT_ENABLE ; + lpc &= ~SW_U1_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u1_enable = !!set;
@@ -351,9 +351,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U2_ACCEPT_ENABLE ; + lpc |=SW_U2_REQUEST_ENABLE ;else - lpc &= ~SW_U2_ACCEPT_ENABLE ; + lpc &= ~SW_U2_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u2_enable = !!set;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 101/313 media: imx274: select REGMAP_I2C
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f9d7225c70dd9d3f406b79e60f8dbd2cd5ae743 ]
The imx274 driver uses regmap and the build will fail without it.
Fixes:
drivers/media/i2c/imx274.c:142:21: error: variable ‘imx274_regmap_config’ has initializer but incomplete type
static const struct regmap_config imx274_regmap_config = {
^~~~~~~~~~~~~
drivers/media/i2c/imx274.c:1869:19: error: implicit declaration of function ‘devm_regmap_init_i2c’ [-Werror=implicit-function-declaration]
imx274->regmap = devm_regmap_init_i2c(client, &imx274_regmap_config);
^~~~~~~~~~~~~~~~~~~~and others.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -611,6 +611,7 @@ config VIDEO_IMX274 tristate "Sony IMX274 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT + select REGMAP_I2C ---help--- This is a V4L2 sensor driver for the Sony IMX274 CMOS image sensor.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 103/313 tipc: fix node keep alive interval calculation
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f5d6c3e5a359c0507800e7ac68d565c21de9b5a1 ]
When setting LINK tolerance, node timer interval will be calculated base on the LINK with lowest tolerance.
But when calculated, the old node timer interval only updated if current setting value (tolerance/4) less than old ones regardless of number of links as well as links' lowest tolerance value.
This caused to two cases missing if tolerance changed as following:
Case 1:
1.1/ There is one link (L1) available in the system
1.2/ Set L1's tolerance from 1500ms => lower (i.e 500ms) 1.3/ Then, fallback to default (1500ms) or higher (i.e 2000ms)
Expected:
node timer interval is 1500/4=375ms after 1.3
Result:
node timer interval will not being updated after changing tolerance at 1.3 since its value 1500/4=375ms is not less than 500/4=125ms at 1.2.
Case 2:
2.1/ There are two links (L1, L2) available in the system 2.2/ L1 and L2 tolerance value are 2000ms as initial 2.3/ Set L2's tolerance from 2000ms => lower 1500ms 2.4/ Disable link L2 (bring down its bearer)
Expected:
node timer interval is 2000ms/4=500ms after 2.4
Result:
node timer interval will not being updated after disabling L2 since its value 2000ms/4=500ms is still not less than 1500/4=375ms at 2.3 although L2 is already not available in the system.
To fix this, we start the node interval calculation by initializing it to a value larger than any conceivable calculated value. This way, the link with the lowest tolerance will always determine the calculated value.
--- net/tipc/node.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tipc/node.c +6 -0
@@ -624,6 +624,12 @@ static void tipc_node_timeout(struct timer_list *t)__skb_queue_head_init (&xmitq); +/* Initial node interval to value larger (10 seconds), then it will be +* recalculated with link lowest tolerance +*/ +tipc_node_read_lock (n); + n->keepalive_intv =10000 ; +tipc_node_read_unlock (n);for (bearer_id =0 ; remains && (bearer_id <MAX_BEARERS ); bearer_id++) {tipc_node_read_lock (n); le = &n->links[bearer_id];
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 107/313 usb: dwc3: trace: add missing break statement to make compiler happy
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 54d48183d21e03f780053d7129312049cb5dd591 ]
The missed break statement in the outer switch makes the code fall through always and thus always same value will be printed.
Besides that, compiler warns about missed fall through marker:
drivers/usb/dwc3/./trace.h: In function ‘trace_raw_output_dwc3_log_trb’:drivers/usb/dwc3/./trace.h:246:4: warning: this statement may fall through [-Wimplicit-fallthrough=]
switch (pcm) {
^~~~~~Add the missing break statement to work correctly without compilation warnings.
--- drivers/usb/dwc3/trace.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/trace.h +2 -0
@@ -251,9 +251,11 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, s ="2x " ;break ;case 3 : +default : s ="3x " ;break ; } +break ;default : s ="" ; } s; }),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 108/313 gpio: mt7621: report failure of devm_kasprintf()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 59d646c775d6ae688ee90fda9f2a4270c47b7490 ]
kasprintf() may return NULL on failure of internal allocation thus the assigned label is not safe if not explicitly checked. On error mediatek_gpio_bank_probe() returns negative values so -ENOMEM in the (unlikely) failure case should be fine here.
--- drivers/gpio/gpio-mt7621.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-mt7621.c +2 -0
@@ -244,6 +244,8 @@ mediatek_gpio_bank_probe(struct device *dev, rg->chip.of_xlate = mediatek_gpio_xlate; rg->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"%s-bank%d" ,dev_name (dev), bank); +if (!rg->chip.label) +return -ENOMEM ; ret =devm_gpiochip_add_data (dev, &rg->chip, mtk);if (ret <0 ) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 109/313 gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a109c2dbb571b10bb9969285b646f57309c98251 ]
The error cases of mediatek_gpio_bank_probe() would go unnoticed (except for the dev_err() messages). The probe function should return an error if one of the banks failed to initialize properly indicated by not returning non-0.
--- drivers/gpio/gpio-mt7621.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpio/gpio-mt7621.c +6 -2
@@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct mtk *mtk;int i; +int ret; mtk =devm_kzalloc (dev,sizeof (*mtk),GFP_KERNEL );if (!mtk)
@@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, mtk); mediatek_gpio_irq_chip.name =dev_name (dev); -for (i =0 ; i <MTK_BANK_CNT ; i++) -mediatek_gpio_bank_probe (dev, np, i); +for (i =0 ; i <MTK_BANK_CNT ; i++) { + ret =mediatek_gpio_bank_probe (dev, np, i); +if (ret) +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 110/313 pinctrl: sx150x: handle failure case of devm_kstrdup
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ]
devm_kstrdup() may return NULL if internal allocation failed. Thus using label, name is unsafe without checking. Therefor in the unlikely case of allocation failure, sx150x_probe() simply returns -ENOMEM.
--- drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-sx150x.c +8 -3
@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, }/* Register GPIO controller */ - pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); pctl->gpio.base =-1 ; pctl->gpio.ngpio = pctl->data->npins; pctl->gpio.get_direction = sx150x_gpio_get_direction;
@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, pctl->gpio.of_node = dev->of_node;#endif pctl->gpio.can_sleep = true; + pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); +if (!pctl->gpio.label) +return -ENOMEM ; +/* * Setting multiple pins is not safe when all pins are not * handled by the same regmap register. The oscio pin (present
@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client,/* Add Interrupt support if an irq is specified */ if (client->irq >0 ) { - pctl->irq_chip.name =devm_kstrdup (dev, client->name, -GFP_KERNEL ); pctl->irq_chip.irq_mask = sx150x_irq_mask; pctl->irq_chip.irq_unmask = sx150x_irq_unmask; pctl->irq_chip.irq_set_type = sx150x_irq_set_type; pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; + pctl->irq_chip.name =devm_kstrdup (dev, client->name, +GFP_KERNEL ); +if (!pctl->irq_chip.name) +return -ENOMEM ; pctl->irq.masked = ~0 ; pctl->irq.sense =0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 111/313 iommu/amd: Fix amd_iommu=force_isolation
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c12b08ebbe16f0d3a96a116d86709b04c1ee8e74 ]
The parameter is still there but it's ignored. We need to check its value before deciding to go into passthrough mode for AMD IOMMU v2 capable device.
We occasionally use this parameter to force v2 capable device into translation mode to debug memory corruption that we suspect is caused by DMA writes.
To address the following comment from Joerg Roedel on the first version, v2 capability of device is completely ignored.
Quoted 2 lines
This breaks the
iommu_v2use-case, as it needs a direct mapping for the devices that support it.
And from Documentation/admin-guide/kernel-parameters.txt:
This option does not override iommu=pt
--- drivers/iommu/amd_iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +8 -1
@@ -438,7 +438,14 @@ static int iommu_init_device(struct device *dev) dev_data->alias =get_alias (dev); -if (dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) { +/* +* By default we use passthrough mode for IOMMUv2 capable device. +* But if amd_iommu=force_isolation is set (e.g. to debug DMA to +* invalid address), we ignore the capability for the device so +* it'll be forced to go into translation mode. +*/ +if ((iommu_pass_through || !amd_iommu_force_isolation) && +dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) {struct amd_iommu *iommu; iommu = amd_iommu_rlookup_table[dev_data->devid];
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 113/313 mips: bpf: fix encoding bug for mm_srlv32_op
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ]
For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90.
Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav.
v1->v2:
- Keep mm_srlv32_op sorted by value.
--- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/uapi/asm/inst.h +1 -1
@@ -369,8 +369,8 @@ enum mm_32a_minor_op { mm_ext_op =0x02c , mm_pool32axf_op =0x03c , mm_srl32_op =0x040 , + mm_srlv32_op =0x050 , mm_sra_op =0x080 , - mm_srlv32_op =0x090 , mm_rotr_op =0x0c0 , mm_lwxs_op =0x118 , mm_addu32_op = 0x150,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 114/313 media: coda: fix H.264 deblocking filter controls
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]
Add support for the third loop filter mode V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.
The filter offset controls are signed values in the -6 to 6 range and are stored into the slice header fields slice_alpha_c0_offset_div2 and slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are double their value, in range of -12 to 12.
Rename variables to more closely match the nomenclature in the H.264 specification.
--- drivers/media/platform/coda/coda-bit.c | 19 +++++++++---------- drivers/media/platform/coda/coda-common.c | 15 +++++++-------- drivers/media/platform/coda/coda.h | 6 +++--- drivers/media/platform/coda/coda_regs.h | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-)
drivers/media/platform/coda/coda-bit.c +9 -10
@@ -991,16 +991,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)else coda_write (dev,CODA_STD_H264 ,CODA_CMD_ENC_SEQ_COD_STD ); -if (ctx->params.h264_deblk_enabled) { - value = ((ctx->params.h264_deblk_alpha & -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | - ((ctx->params.h264_deblk_beta & -CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET ); - }else { - value =1 <<CODA_264PARAM_DISABLEDEBLK_OFFSET ; - } + value = ((ctx->params.h264_disable_deblocking_filter_idc & +CODA_264PARAM_DISABLEDEBLK_MASK ) << +CODA_264PARAM_DISABLEDEBLK_OFFSET ) | + ((ctx->params.h264_slice_alpha_c0_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | + ((ctx->params.h264_slice_beta_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET );coda_write (dev, value,CODA_CMD_ENC_SEQ_264_PARA );break ;case V4L2_PIX_FMT_JPEG :
drivers/media/platform/coda/coda-common.c +7 -8
@@ -1793,14 +1793,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) ctx->params.h264_max_qp = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA : - ctx->params.h264_deblk_alpha = ctrl->val; + ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA : - ctx->params.h264_deblk_beta = ctrl->val; + ctx->params.h264_slice_beta_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE : - ctx->params.h264_deblk_enabled = (ctrl->val == -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); + ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_PROFILE :/* TODO: switch between baseline and constrained baseline */
@@ -1882,13 +1881,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_MAX_QP ,0 ,51 ,1 ,51 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std_menu (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED ,0x0 , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); +V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY , +0x0 ,V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE, V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
drivers/media/platform/coda/coda.h +3 -3
@@ -115,9 +115,9 @@ struct coda_params {u8 h264_inter_qp;u8 h264_min_qp;u8 h264_max_qp; -u8 h264_deblk_enabled; -u8 h264_deblk_alpha; -u8 h264_deblk_beta; +u8 h264_disable_deblocking_filter_idc; +s8 h264_slice_alpha_c0_offset_div2; +s8 h264_slice_beta_offset_div2;u8 h264_profile_idc;u8 h264_level_idc;u8 mpeg4_intra_qp;
drivers/media/platform/coda/coda_regs.h +1 -1
@@ -292,7 +292,7 @@#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f#define CODA_264PARAM_DISABLEDEBLK_OFFSET 6 -#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01 +#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01#define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 115/313 ARM: dts: Fix up the D-Link DIR-685 MTD partition info
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ]
The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains:
dev: size erasesize name
mtd0: 01e7ff40 00020000 "rootfs"
mtd1: 01f40000 00020000 "upgrade"
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd4: 00040000 00020000 "RedBoot"
mtd5: 00020000 00020000 "LangPack"
mtd6: 02000000 00020000 "flash"
Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered.
Remains:
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd5: 00020000 00020000 "LangPack"
Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000.
--- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/gemini-dlink-dir-685.dts +6 -10
@@ -274,20 +274,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 117/313 watchdog: renesas_wdt: dont set divider while watchdog is running
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e990e12741877e9bfac402ca468f4007a75f6e2a ]
The datasheet says we must stop the timer before changing the clock divider. This can happen when the restart handler is called while the watchdog is running.
--- drivers/watchdog/renesas_wdt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/watchdog/renesas_wdt.c +7 -2
@@ -77,12 +77,17 @@ static int rwdt_init_timeout(struct watchdog_device *wdev)static int rwdt_start (struct watchdog_device *wdev) {struct rwdt_priv *priv =watchdog_get_drvdata (wdev); +u8 val;pm_runtime_get_sync (wdev->parent); -rwdt_write (priv,0 ,RWTCSRB ); -rwdt_write (priv, priv->cks,RWTCSRA ); +/* Stop the timer before we modify any register */ + val =readb_relaxed (priv->base +RWTCSRA ) & ~RWTCSRA_TME ; +rwdt_write (priv, val,RWTCSRA ); +rwdt_init_timeout (wdev); +rwdt_write (priv, priv->cks,RWTCSRA ); +rwdt_write (priv,0 ,RWTCSRB );while (readb_relaxed (priv->base +RWTCSRA ) &RWTCSRA_WRFLG )cpu_relax ();
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 119/313 usb: dwc3: gadget: Disable CSP for stream OUT ep
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ]
In stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. So we don't want controller to carry on transfers when short packet is received. So disable the CSP for stream capable endpoint.
This is based on the 3.30a Programming guide, where table 3-1 device descriptor structure field definitions says for CSP bit If this bit is 0, the controller generates an XferComplete event and remove the stream. So if we keep CSP as 1 then switching between streams would not happen as in stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned.
--- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +6 -2
@@ -981,9 +981,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, usb_endpoint_type(dep->endpoint.desc)); } -/* always enable Continue on Short Packet */ +/* +* Enable Continue on Short Packet +* when endpoint is not a stream capable +*/ if (usb_endpoint_dir_out (dep->endpoint.desc)) { - trb->ctrl |=DWC3_TRB_CTRL_CSP ; +if (!dep->stream_capable) + trb->ctrl |=DWC3_TRB_CTRL_CSP ;if (short_not_ok) trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 92/313 media: DaVinci-VPBE: fix error handling in vpbe_initialize()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]
If vpbe_set_default_output() or vpbe_set_default_mode() fails, vpbe_initialize() returns error code without releasing resources.
The patch adds error handling for that case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +5 -2
@@ -740,7 +740,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , def_output); -return ret; + goto fail_kfree_amp; }printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode);
@@ -748,12 +748,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , def_mode); -return ret; + goto fail_kfree_amp; } vpbe_dev->initialized =1 ;/* TBD handling of bootargs for default output and mode */ return 0 ; +fail_kfree_amp: +mutex_lock (&vpbe_dev->lock); +kfree (vpbe_dev->amp); fail_kfree_encoders:kfree (vpbe_dev->encoders); fail_dev_unregister:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 93/313 smack: fix access permissions for keyring
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ]
Function smack_key_permission() only issues smack requests for the following operations:
- KEY_NEED_READ (issues MAY_READ)
- KEY_NEED_WRITE (issues MAY_WRITE)
- KEY_NEED_LINK (issues MAY_WRITE)
- KEY_NEED_SETATTR (issues MAY_WRITE)
A blank smack request is issued in all other cases, resulting in smack access being granted if there is any rule defined between subject and object, or denied with -EACCES otherwise.
Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. Fix the logic in the unlikely case when both MAY_READ and MAY_WRITE are needed. Validate access permission field for valid contents.
--- security/smack/smack_lsm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
security/smack/smack_lsm.c +9 -3
@@ -4333,6 +4333,12 @@ static int smack_key_permission(key_ref_t key_ref,int request =0 ;int rc; +/* +* Validate requested permissions +*/ +if (perm & ~KEY_NEED_ALL ) +return -EINVAL ; + keyp =key_ref_to_ptr (key_ref);if (keyp ==NULL )return -EINVAL ;
@@ -4356,10 +4362,10 @@ static int smack_key_permission(key_ref_t key_ref, ad.a.u.key_struct.key = keyp->serial; ad.a.u.key_struct.key_desc = keyp->description;#endif -if (perm &KEY_NEED_READ ) - request =MAY_READ ; +if (perm & (KEY_NEED_READ |KEY_NEED_SEARCH |KEY_NEED_VIEW )) + request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) - request =MAY_WRITE ; + request |=MAY_WRITE ; rc =smk_access (tkp, keyp->security, request, &ad); rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc);return rc;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 94/313 xtensa: xtfpga.dtsi: fix dtc warnings about SPI
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f37598be4e3896359e87c824be57ddddc280cc3f ]
Rename SPI controller node in the XTFPGA DTS to spi@... This fixes the following build warnings:
arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'
--- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/boot/dts/xtfpga.dtsi +1 -1
@@ -103,7 +103,7 @@ }; }; - spi0: spi-master@0d0a0000 { + spi0: spi@0d0a0000 { compatible = "cdns,xtfpga-spi"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 95/313 usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b7a4fbe2300a8965ea760c7e871507b84aea17f6 ]
Availability of TRB's is calculated using dwc3_calc_trbs_left(), which determines total available TRB's based on the HWO bit set in a TRB.
In the present code, __dwc3_prepare_one_trb() is called with a TRB which needs to be prepared for transfer. This __dwc3_prepare_one_trb() calls dwc3_calc_trbs_left() to determine total available TRBs and set IOC bit if the total available TRBs are zero. Since the present working TRB (which is passed as an argument to __dwc3_prepare_one_trb() ) doesn't yet have the HWO bit set before calling dwc3_calc_trbs_left(), there are chances that dwc3_calc_trbs_left() wrongly calculates this present working TRB as free(since the HWO bit is not yet set) and returns the total available TRBs as greater than zero (including the present working TRB). This could be a problem.
This patch corrects the above mentioned problem in __dwc3_prepare_one_trb() by increementing the dep->trb_enqueue at the last (after preparing the TRB) instead of increementing at the start and setting the IOC bit only if the total available TRBs returned by dwc3_calc_trbs_left() is 1 . Since we are increementing the dep->trb_enqueue at the last, the present working TRB is also considered as available by dwc3_calc_trbs_left() and non zero value is returned . So, according to the modified logic, when the total available TRBs is equal to 1 that means the total available TRBs in the pool are 0.
--- drivers/usb/dwc3/gadget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +3 -3
@@ -912,8 +912,6 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,struct usb_gadget *gadget = &dwc->gadget;enum usb_device_speed speed = gadget->speed; -dwc3_ep_inc_enq (dep); - trb->size =DWC3_TRB_SIZE_LENGTH (length); trb->bpl =lower_32_bits (dma); trb->bph =upper_32_bits (dma);
@@ -992,7 +990,7 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, }if ((!no_interrupt && !chain) || - (dwc3_calc_trbs_left (dep) ==0 )) + (dwc3_calc_trbs_left (dep) ==1 )) trb->ctrl |=DWC3_TRB_CTRL_IOC ;if (chain)
@@ -1003,6 +1001,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, trb->ctrl |=DWC3_TRB_CTRL_HWO ; +dwc3_ep_inc_enq (dep); +trace_dwc3_prepare_trb (dep, trb); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 96/313 usb: dwc2: Disable power down feature on Samsung SoCs
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 35a6054132286a4ab92b536595093b82e6bdfcbc ]
Power down feature of DWC2 module integrated in Samsung SoCs doesn't work properly or needs some additional handling in PHY or SoC glue layer, so disable it for now. Without disabling power down, DWC2 causes random memory trashes and fails enumeration if there is no USB link to host on driver probe.
--- drivers/usb/dwc2/params.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/dwc2/params.c +9 -1
@@ -71,6 +71,13 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg) p->power_down = false; } +static void dwc2_set_s3c6400_params (struct dwc2_hsotg *hsotg) +{ +struct dwc2_core_params *p = &hsotg->params; + + p->power_down =0 ; +} +static void dwc2_set_rk_params (struct dwc2_hsotg *hsotg) {struct dwc2_core_params *p = &hsotg->params;
@@ -151,7 +158,8 @@ const struct of_device_id dwc2_of_match_table[] = { { .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params }, { .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params }, { .compatible = "snps,dwc2" }, - { .compatible = "samsung,s3c6400-hsotg" }, + { .compatible = "samsung,s3c6400-hsotg", + .data = dwc2_set_s3c6400_params }, { .compatible = "amlogic,meson8-usb", .data = dwc2_set_amlogic_params }, { .compatible = "amlogic,meson8b-usb",
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 87/313 ARM: dts: mmp2: fix TWSI2
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ]
Marvell keeps their MMP2 datasheet secret, but there are good clues that TWSI2 is not on 0xd4025000 on that platform, not does it use IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:
arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58
I'm taking a somewhat educated guess that is probably a copy & paste error from PXA168 or PXA910 and that the real controller in fact hides at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.
I'm also copying some properties from TWSI1 that were missing or incorrect.
Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.
--- arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mmp2.dtsi +6 -3
@@ -220,12 +220,15 @@ status = "disabled"; }; - twsi2: i2c@d4025000 { + twsi2: i2c@d4031000 { compatible = "mrvl,mmp-twsi"; - reg = <0xd4025000 0x1000>; - interrupts = <58>; + reg = <0xd4031000 0x1000>; + interrupt-parent = <&intcmux17>; + interrupts = <0>; clocks = <&soc_clocks MMP2_CLK_TWSI1>; resets = <&soc_clocks MMP2_CLK_TWSI1>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 121/313 iommu/arm-smmu: Add support for qcom,smmu-v2 variant
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ]
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
--- drivers/iommu/arm-smmu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/arm-smmu.c +3 -0
@@ -118,6 +118,7 @@ enum arm_smmu_implementation {GENERIC_SMMU ,ARM_MMU500 ,CAVIUM_SMMUV2 , + QCOM_SMMUV2, }; struct arm_smmu_s2cr {
@@ -1912,6 +1913,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);ARM_SMMU_MATCH_DATA (arm_mmu401,ARM_SMMU_V1_64K ,GENERIC_SMMU );ARM_SMMU_MATCH_DATA (arm_mmu500,ARM_SMMU_V2 ,ARM_MMU500 );ARM_SMMU_MATCH_DATA (cavium_smmuv2,ARM_SMMU_V2 ,CAVIUM_SMMUV2 ); +ARM_SMMU_MATCH_DATA (qcom_smmuv2,ARM_SMMU_V2 ,QCOM_SMMUV2 );static const struct of_device_id arm_smmu_of_match[] = { { .compatible ="arm,smmu-v1" , .data = &smmu_generic_v1 },
@@ -1920,6 +1922,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, { }, };MODULE_DEVICE_TABLE (of, arm_smmu_of_match);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 130/313 drm/msm: dpu: Only check flush register against pending flushes
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5f79e03b1f7c1b2cf0019ce6365fe5d52629813d ]
There exists a case where a flush of a plane/dma may have been triggered & started from an async commit. If that plane/dma is subsequently disabled by the next commit, the flush register will continue to hold the flush bit for the disabled plane. Since the bit remains active, pending_kickoff_cnt will never decrement and we'll miss frame_done events.
This patch limits the check of flush_register to include only those bits which have been updated with the latest commit.
Changes in v2:
- None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +1 -1
@@ -331,7 +331,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)if (hw_ctl && hw_ctl->ops.get_flush_register) flush_register = hw_ctl->ops.get_flush_register (hw_ctl); -if (flush_register ==0 ) +if (!(flush_register & hw_ctl->ops.get_pending_flush (hw_ctl))) new_cnt =atomic_add_unless (&phys_enc->pending_kickoff_cnt,-1 ,0 );spin_unlock_irqrestore (phys_enc->enc_spinlock, lock_flags);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 132/313 lightnvm: pblk: add lock protection to list operations
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fde201a466c6ad5efd72cb54fdf2cefa8b6c6ad7 ]
Protect the list_add on the pblk_line_init_bb() error path in case this code is used for some other purpose in the future.
--- drivers/lightnvm/pblk-core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/lightnvm/pblk-core.c +10 -3
@@ -1252,15 +1252,22 @@ int pblk_line_recov_alloc(struct pblk *pblk, struct pblk_line *line) ret =pblk_line_alloc_bitmaps (pblk, line);if (ret) -return ret; + goto fail;if (!pblk_line_init_bb (pblk, line,0 )) { -list_add (&line->list, &l_mg->free_list); -return -EINTR ; + ret = -EINTR ; + goto fail; }pblk_rl_free_lines_dec (&pblk->rl, line, true);return 0 ; + +fail: +spin_lock (&l_mg->free_lock); +list_add (&line->list, &l_mg->free_list); +spin_unlock (&l_mg->free_lock); + +return ret; }void pblk_line_recov_close (struct pblk *pblk,struct pblk_line *line)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 133/313 i2c-axxia: check for error conditions first
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f5c85fe3a60ace555d09898166af372547f97fc ]
It was observed that when using seqentional mode contrary to the documentation, the SS bit (which is supposed to only be set if automatic/sequence command completed normally), is sometimes set together with NA (NAK in address phase) causing transfer to falsely be considered successful.
My assumption is that this does not happen during manual mode since the controller is stopping its work the moment it sets NA/ND bit in status register. This is not the case in Automatic/Sequentional mode where it is still working to send STOP condition and the actual status we get depends on the time when the ISR is run.
This patch changes the order of checking status bits in ISR - error conditions are checked first and only if none of them occurred, the transfer may be considered successful. This is required to introduce using of sequentional mode in next patch.
--- drivers/i2c/busses/i2c-axxia.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-axxia.c +16 -16
@@ -296,22 +296,7 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)i2c_int_disable (idev,MST_STATUS_TFL ); } -if (status &MST_STATUS_SCC ) { -/* Stop completed */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_SNS ) { -/* Transfer done */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) -axxia_i2c_empty_rx_fifo (idev); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_TSS ) { -/* Transfer timeout */ - idev->msg_err = -ETIMEDOUT ; -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (unlikely (status &MST_STATUS_ERR )) { +if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );if (status &MST_STATUS_AL )
@@ -328,6 +313,21 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)readl (idev->base +MST_TX_BYTES_XFRD ), readl(idev->base + MST_TX_XFER));complete (&idev->msg_complete); + }else if (status &MST_STATUS_SCC ) { +/* Stop completed */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_SNS ) { +/* Transfer done */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) +axxia_i2c_empty_rx_fifo (idev); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); } out:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 135/313 mlxsw: spectrum_acl: Limit priority value
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d7263ab35be25505ab57ebecd93cbc5dba8be717 ]
In Spectrum-2, higher priority value wins and priority valid values are in the range of {1,cap_kvd_size-1}. mlxsw_sp_acl_tcam_priority_get converts from lower-bound priorities alike tc flower to Spectrum-2 HW range. Up until now tc flower did not provide priority 0 or reached the maximal value, however multicast routing does provide priority 0.
Therefore, Change mlxsw_sp_acl_tcam_priority_get to verify priority is in the correct range. Make sure priority is never set to zero and never exceeds the maximal allowed value.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +3 -2
@@ -95,8 +95,9 @@ int mlxsw_sp_acl_tcam_priority_get(struct mlxsw_sp *mlxsw_sp,if (!MLXSW_CORE_RES_VALID (mlxsw_sp->core,KVD_SIZE ))return -EIO ; - max_priority =MLXSW_CORE_RES_GET (mlxsw_sp->core,KVD_SIZE ); -if (rulei->priority > max_priority) +/* Priority range is 1..cap_kvd_size-1. */ + max_priority =MLXSW_CORE_RES_GET (mlxsw_sp->core,KVD_SIZE ) -1 ; +if (rulei->priority >= max_priority)return -EINVAL ;/* Unlike in TC, in HW, higher number means higher priority. */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 136/313 udf: Fix BUG on corrupted inode
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d288d95842f1503414b7eebce3773bac3390457e ]
When inode is corrupted so that extent type is invalid, some functions (such as udf_truncate_extents()) will just BUG. Check that extent type is valid when loading the inode to memory.
--- fs/udf/inode.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/udf/inode.c +6 -0
@@ -1357,6 +1357,12 @@ reread: iinfo->i_alloc_type =le16_to_cpu (fe->icbTag.flags) &ICBTAG_FLAG_AD_MASK ; +if (iinfo->i_alloc_type !=ICBTAG_FLAG_AD_SHORT && + iinfo->i_alloc_type !=ICBTAG_FLAG_AD_LONG && + iinfo->i_alloc_type !=ICBTAG_FLAG_AD_IN_ICB ) { + ret = -EIO ; + goto out; + } iinfo->i_unique =0 ; iinfo->i_lenEAttr =0 ; iinfo->i_lenExtents =0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 137/313 switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e4a7dca5de625018b29417ecc39dc5037d9a5a36 ]
In the ioctl_event_ctl() SWITCHTEC_IOCTL_EVENT_IDX_ALL case, we call event_ctl() several times with the same "ctl" struct. Each call clobbers ctl.flags, which leads to the problem that we may not actually enable or disable all events as the user requested.
Preserve the event flag value with a temporary variable.
--- drivers/pci/switch/switchtec.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/switch/switchtec.c +3 -0
@@ -800,6 +800,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, {int ret;int nr_idxs; +unsigned int event_flags;struct switchtec_ioctl_event_ctl ctl;if (copy_from_user (&ctl, uctl,sizeof (ctl)))
@@ -821,7 +822,9 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,else return -EINVAL ; + event_flags = ctl.flags;for (ctl.index =0 ; ctl.index < nr_idxs; ctl.index++) { + ctl.flags = event_flags; ret =event_ctl (stdev, &ctl);if (ret <0 )return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 139/313 ARM: pxa: avoid section mismatch warning
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 88af3209aa0881aa5ffd99664b6080a4be5f24e5 ]
WARNING: vmlinux.o(.text+0x19f90): Section mismatch in reference from the function littleton_init_lcd() to the function .init.text:pxa_set_fb_info() The function littleton_init_lcd() references
the function __init pxa_set_fb_info().
This is often because littleton_init_lcd lacks a __init
annotation or the annotation of pxa_set_fb_info is wrong.
WARNING: vmlinux.o(.text+0xf824): Section mismatch in reference from the function zeus_register_ohci() to the function .init.text:pxa_set_ohci_info() The function zeus_register_ohci() references
the function __init pxa_set_ohci_info().
This is often because zeus_register_ohci lacks a __init
annotation or the annotation of pxa_set_ohci_info is wrong.
WARNING: vmlinux.o(.text+0xf95c): Section mismatch in reference from the function cm_x300_init_u2d() to the function .init.text:pxa3xx_set_u2d_info() The function cm_x300_init_u2d() references
the function __init pxa3xx_set_u2d_info().
This is often because cm_x300_init_u2d lacks a __init
annotation or the annotation of pxa3xx_set_u2d_info is wrong.
--- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-pxa/cm-x300.c +1 -1
@@ -558,7 +558,7 @@ static struct pxa3xx_u2d_platform_data cm_x300_u2d_platform_data = { .exit = cm_x300_u2d_exit, }; -static void cm_x300_init_u2d (void ) +static void __init cm_x300_init_u2d (void ) {pxa3xx_set_u2d_info (&cm_x300_u2d_platform_data); }
arch/arm/mach-pxa/littleton.c +1 -1
@@ -184,7 +184,7 @@ static struct pxafb_mach_info littleton_lcd_info = { .lcd_conn = LCD_COLOR_TFT_16BPP, }; -static void littleton_init_lcd (void ) +static void __init littleton_init_lcd (void ) {pxa_set_fb_info (NULL , &littleton_lcd_info); }
arch/arm/mach-pxa/zeus.c +1 -1
@@ -559,7 +559,7 @@ static struct pxaohci_platform_data zeus_ohci_platform_data = { .flags = ENABLE_PORT_ALL | POWER_SENSE_LOW, }; -static void zeus_register_ohci (void ) +static void __init zeus_register_ohci (void ) {/* Port 2 is shared between host and client interface. */ UP2OCR =UP2OCR_HXOE |UP2OCR_HXS |UP2OCR_DMPDE |UP2OCR_DPPDE ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 122/313 iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ]
After removing an entry from a queue (e.g. reading an event in arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer pointer to free the queue slot back to the SMMU. A memory barrier is required here so that all reads targetting the queue entry have completed before the consumer pointer is updated.
The implementation of queue_inc_cons() relies on a writel() to complete the previous reads, but this is incorrect because writel() is only guaranteed to complete prior writes. This patch replaces the call to writel() with an mb(); writel_relaxed() sequence, which gives us the read->write ordering which we require.
--- drivers/iommu/arm-smmu-v3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +7 -1
@@ -688,7 +688,13 @@ static void queue_inc_cons(struct arm_smmu_queue *q)u32 cons = (Q_WRP (q, q->cons) |Q_IDX (q, q->cons)) +1 ; q->cons =Q_OVF (q, q->cons) |Q_WRP (q, cons) |Q_IDX (q, cons); -writel (q->cons, q->cons_reg); + +/* +* Ensure that all CPU accesses (reads and writes) to the queue +* are complete before we update the cons pointer. +*/ +mb (); +writel_relaxed (q->cons, q->cons_reg); }static int queue_sync_prod (struct arm_smmu_queue *q)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 140/313 ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit add6883619a9e3bf9658eaff1a547354131bbcd9 ]
eukrea-tlv320.c machine driver runs on non-DT platforms and include <asm/mach-types.h> header file in order to be able to use some machine_is_eukrea_xxx() macros.
Building it for ARM64 causes the following build error:
sound/soc/fsl/eukrea-tlv320.c:28:10: fatal error: asm/mach-types.h: No such file or directory
Avoid this error by not allowing to build the SND_SOC_EUKREA_TLV320 driver when ARM64 is selected.
This is needed in preparation for the i.MX8M support.
--- sound/soc/fsl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/Kconfig +1 -1
@@ -221,7 +221,7 @@ config SND_SOC_PHYCORE_AC97 config SND_SOC_EUKREA_TLV320 tristate "Eukrea TLV320" - depends on ARCH_MXC && I2C + depends on ARCH_MXC && !ARM64 && I2C select SND_SOC_TLV320AIC23_I2C select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 141/313 ARM: mmp: fix timer_init calls
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ]
The change to passing the timer frequency as a function argument was a good idea, but caused a build failure for one user that was missed in the update:
arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer':arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration]
Change that as well to fix the build error, and rename the function to put it into a proper namespace and make it clearer what is actually going on.
I saw that the high 6500000 HZ frequency was previously only set with CONFIG_MMP2, but is now also used with MMP (pxa910), so I'm changing that back here. Please make sure that the frequencies are all correct now.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq,unsigned long rate); +extern void mmp_timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ,6500000 ); +mmp_timer_init (IRQ_PXA168_TIMER1 ,3250000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/pxa910.c +1 -1
@@ -116,7 +116,7 @@ void __init pxa910_timer_init(void)__raw_writel (APBC_APBCLK |APBC_RST ,APBC_TIMERS );__raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA910_AP1_TIMER1 ); +mmp_timer_init (IRQ_PXA910_AP1_TIMER1 ,3250000 ); }/* on-chip devices */
arch/arm/mach-mmp/time.c +2 -2
@@ -184,7 +184,7 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq,unsigned long rate) +void __init mmp_timer_init (int irq,unsigned long rate) {timer_config ();
@@ -239,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq, rate); +mmp_timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 142/313 KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 693ac10a88a2219bde553b2e8460dbec97e594e6 ]
The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the availability of in kernel tce acceleration for vfio. However it is currently the case that this is only available on a powernv machine, not for a pseries machine.
Thus make this capability dependent on having the cpu feature CPU_FTR_HVMODE.
[[email protected] - fixed compilation for Book E.]
--- arch/powerpc/kvm/powerpc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/powerpc.c +4 -1
@@ -543,8 +543,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)#ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_SPAPR_TCE :case KVM_CAP_SPAPR_TCE_64 : -/* fallthrough */ + r =1 ; +break ;case KVM_CAP_SPAPR_TCE_VFIO : + r = !!cpu_has_feature (CPU_FTR_HVMODE ); +break ;case KVM_CAP_PPC_RTAS :case KVM_CAP_PPC_FIXUP_HCALL :case KVM_CAP_PPC_ENABLE_HCALL :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 143/313 mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 07d405769afea5718529fc9e341f0b13b3189b6f ]
If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. The resulting operations leave the FSM stuck in READWAIT, a state which persists until the MMC framework resets the controller, by which point the root filesystem is likely to have been unmounted.
A less heavyweight solution is to detect the condition and nudge the FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
--- drivers/mmc/host/bcm2835.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mmc/host/bcm2835.c +9 -0
@@ -772,6 +772,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host)if (!(sdhsts &SDHSTS_CRC7_ERROR ) || (host->cmd->opcode !=MMC_SEND_OP_COND )) { +u32 edm, fsm; +if (sdhsts &SDHSTS_CMD_TIME_OUT ) { host->cmd->error = -ETIMEDOUT ; }else {
@@ -780,6 +782,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host)bcm2835_dumpregs (host); host->cmd->error = -EILSEQ ; } + edm =readl (host->ioaddr +SDEDM ); + fsm = edm &SDEDM_FSM_MASK ; +if (fsm ==SDEDM_FSM_READWAIT || + fsm ==SDEDM_FSM_WRITESTART1 ) +/* Kick the FSM out of its wait */ +writel (edm |SDEDM_FORCE_DATA_MODE , + host->ioaddr +SDEDM );bcm2835_finish_request (host);return ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 144/313 mmc: bcm2835: reset host on timeout
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ]
The bcm2835 mmc host tends to lock up for unknown reason so reset it on timeout. The upper mmc block layer tries retransimitting with single blocks which tends to work out after a long wait.
This is better than giving up and leaving the machine broken for no obvious reason.
--- drivers/mmc/host/bcm2835.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/bcm2835.c +3 -0
@@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc)if (host->dma_chan)dmaengine_terminate_sync (host->dma_chan); + host->dma_chan =NULL ;bcm2835_reset_internal (host); }
@@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work)dev_err (dev,"timeout waiting for hardware interrupt.\n" );bcm2835_dumpregs (host); +bcm2835_reset (host->mmc); +if (host->data) { host->data->error = -ETIMEDOUT ;bcm2835_finish_data (host);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 145/313 mmc: meson-mx-sdio: check devm_kasprintf for failure
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b0d06f1cb0e2079a3c64fb6e27c19d9a55c723a1 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_mx_mmc_register_clks() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/mmc/host/meson-mx-sdio.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/host/meson-mx-sdio.c +6 -0
@@ -596,6 +596,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#fixed_factor" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_fixed_factor_ops; init.flags =0 ; init.parent_names = &clk_fixed_factor_parent;
@@ -612,6 +615,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) clk_div_parent =__clk_get_name (host->fixed_factor_clk); init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#div" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_divider_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = &clk_div_parent;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 146/313 memstick: Prevent memstick host from getting runtime suspended during card detection
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e03e303edf1c63e6dd455ccd568c74e93ef3ba8c ]
We can use MEMSTICK_POWER_{ON,OFF} along with pm_runtime_{get,put} helpers to let memstick host support runtime pm.
The rpm count may go down to zero before the memstick host powers on, so the host can be runtime suspended.
So before doing card detection, increment the rpm count to avoid the host gets runtime suspended. Balance the rpm count after card detection is done.
--- drivers/memstick/core/memstick.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/memstick/core/memstick.c +3 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #define DRIVER_NAME "memstick"
@@ -436,6 +437,7 @@ static void memstick_check(struct work_struct *work)struct memstick_dev *card;dev_dbg (&host->dev,"memstick_check started\n" ); +pm_runtime_get_noresume (host->dev.parent);mutex_lock (&host->lock);if (!host->card) {if (memstick_power_on (host))
@@ -479,6 +481,7 @@ out_power_off: host->set_param (host,MEMSTICK_POWER ,MEMSTICK_POWER_OFF );mutex_unlock (&host->lock); +pm_runtime_put (host->dev.parent);dev_dbg (&host->dev,"memstick_check finished\n" ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 147/313 mmc: sdhci-of-esdhc: Fix timeout checks
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ea6d027312111c6d96309ad1a684b33cb37e6764 ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-of-esdhc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +12 -4
@@ -526,8 +526,12 @@ static void esdhc_clock_enable(struct sdhci_host *host, bool enable)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); val =ESDHC_CLOCK_STABLE ; -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) & val)) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) & val) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));break ;
@@ -591,8 +595,12 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE ) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));return ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 148/313 mmc: sdhci-omap: Fix timeout checks
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9f0ea0bda1d06120b053bb0c283f54afec59293d ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-omap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-omap.c +12 -4
@@ -220,8 +220,12 @@ static void sdhci_omap_conf_bus_power(struct sdhci_omap_host *omap_host,/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
@@ -653,8 +657,12 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 149/313 mmc: sdhci-xenon: Fix timeout checks
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0e6e7c2ff397e1bbebc882ca3132148aaaef1ddd ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-xenon-phy.c | 10 +++++++--- drivers/mmc/host/sdhci-xenon.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-xenon-phy.c +7 -3
@@ -357,9 +357,13 @@ static int xenon_emmc_phy_enable_dll(struct sdhci_host *host)/* Wait max 32 ms */ timeout =ktime_add_ms (ktime_get (),32 ); -while (!(sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & -XENON_DLL_LOCK_STATE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & +XENON_DLL_LOCK_STATE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Wait for DLL Lock time-out\n" );return -ETIMEDOUT ; }
drivers/mmc/host/sdhci-xenon.c +7 -3
@@ -34,9 +34,13 @@ static int xenon_enable_internal_clk(struct sdhci_host *host)sdhci_writel (host, reg,SDHCI_CLOCK_CONTROL );/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!((reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL )) - &SDHCI_CLOCK_INT_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (reg &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Internal clock never stabilised.\n" );return -ETIMEDOUT ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 123/313 sata_rcar: fix deferred probing
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/sata_rcar.c +3 -1
@@ -895,7 +895,9 @@ static int sata_rcar_probe(struct platform_device *pdev)int ret =0 ; irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) +if (irq <0 ) +return irq; +if (!irq)return -EINVAL ; priv =devm_kzalloc (dev,sizeof (struct sata_rcar_priv ),GFP_KERNEL );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 150/313 mmc: jz4740: Get CD/WP GPIOs from descriptors
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0c901c0566fb4edc2631c3786e5085a037be91f8 ]
Modifty the JZ4740 driver to retrieve card detect and write protect GPIO pins from GPIO descriptors instead of hard-coded global numbers. Augment the only board file using this in the process and cut down on passed in platform data.
Preserve the code setting the caps2 flags for CD and WP as active low or high since the slot GPIO code currently ignores the gpiolib polarity inversion semantice and uses the raw accessors to read the GPIO lines, but set the right polarity flags in the descriptor table for jz4740.
--- .../mips/include/asm/mach-jz4740/jz4740_mmc.h | 2 -- arch/mips/jz4740/board-qi_lb60.c | 12 ++++++++--- drivers/mmc/host/jz4740_mmc.c | 20 +++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-)
arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +0 -2
@@ -4,8 +4,6 @@struct jz4740_mmc_platform_data {int gpio_power; -int gpio_card_detect; -int gpio_read_only;unsigned card_detect_active_low:1 ;unsigned read_only_active_low:1 ;unsigned power_active_low:1 ;
arch/mips/jz4740/board-qi_lb60.c +9 -3
@@ -43,7 +43,6 @@#include "clock.h" /* GPIOs */ -#define QI_LB60_GPIO_SD_CD JZ_GPIO_PORTD(0)#define QI_LB60_GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2)#define QI_LB60_GPIO_KEYOUT (x) (JZ_GPIO_PORTC(10) + (x))
@@ -386,12 +385,18 @@ static struct platform_device qi_lb60_gpio_keys = { };static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { - .gpio_card_detect =QI_LB60_GPIO_SD_CD , - .gpio_read_only =-1 , .gpio_power =QI_LB60_GPIO_SD_VCC_EN_N , .power_active_low =1 , }; +static struct gpiod_lookup_table qi_lb60_mmc_gpio_table = { + .dev_id ="jz4740-mmc.0" , + .table = { +GPIO_LOOKUP ("GPIOD" ,0 ,"cd" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +/* beeper */ static struct pwm_lookup qi_lb60_pwm_lookup[] = { PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0,
@@ -500,6 +505,7 @@ static int __init qi_lb60_init_platform_devices(void)gpiod_add_lookup_table (&qi_lb60_audio_gpio_table);gpiod_add_lookup_table (&qi_lb60_nand_gpio_table);gpiod_add_lookup_table (&qi_lb60_spigpio_gpio_table); +gpiod_add_lookup_table (&qi_lb60_mmc_gpio_table);spi_register_board_info (qi_lb60_spi_board_info,ARRAY_SIZE (qi_lb60_spi_board_info));
drivers/mmc/host/jz4740_mmc.c +10 -10
@@ -983,17 +983,17 @@ static int jz4740_mmc_request_gpios(struct mmc_host *mmc,if (!pdata->read_only_active_low) mmc->caps2 |=MMC_CAP2_RO_ACTIVE_HIGH ; -if (gpio_is_valid (pdata->gpio_card_detect)) { - ret =mmc_gpio_request_cd (mmc, pdata->gpio_card_detect,0 ); -if (ret) -return ret; - } +/* +* Get optional card detect and write protect GPIOs, +* only back out on probe deferral. +*/ + ret =mmc_gpiod_request_cd (mmc,"cd" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret; -if (gpio_is_valid (pdata->gpio_read_only)) { - ret =mmc_gpio_request_ro (mmc, pdata->gpio_read_only); -if (ret) -return ret; - } + ret =mmc_gpiod_request_ro (mmc,"wp" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret;return jz4740_mmc_request_gpio (&pdev->dev, pdata->gpio_power,"MMC read only" , true, pdata->power_active_low);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 151/313 usb: renesas_usbhs: add support for RZ/G2E
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1d6e81a288e28d8d0e38e0501a324216f79bba35 ]
HS-USB found in RZ/G2E (a.k.a. r8a774c0) is very similar to the one found in R-Car E3 (a.k.a. r8a77990), as it needs to release the PLL reset by the UGCTRL register like R-Car E3, therefore add r8a774c0 support in a similar fashion to what was done for the r8a77990.
--- drivers/usb/renesas_usbhs/common.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/renesas_usbhs/common.c +4 -0
@@ -457,6 +457,10 @@ static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)* platform functions */ static const struct of_device_id usbhs_of_match[] = { + { + .compatible ="renesas,usbhs-r8a774c0" , + .data = (void *)USBHS_TYPE_RCAR_GEN3_WITH_PLL , + }, { .compatible ="renesas,usbhs-r8a7790" , .data = (void *)USBHS_TYPE_RCAR_GEN2 ,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 125/313 platform/x86: mlx-platform: Fix tachometer registers
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit edd45cba5ed7f53974475ddc9a1453c2c87b3328 ]
Shift by one the registers for tachometers (7 - 12).
This fix is relevant for the same new systems MQMB7, MSN37, MSN34, which are about to be released to the customers.
At the moment, none of them is at customers sites. The customers will not suffer from this change.
This fix is necessary, because register used before for tachometer 7 has been than reserved for the second PWM for newer systems, which are not supported yet in mlx-platform driver. So registers of tachometers 7-12 have been shifted by one.
--- drivers/platform/x86/mlx-platform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/platform/x86/mlx-platform.c +6 -6
@@ -83,12 +83,12 @@#define MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET 0xe7#define MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET 0xe8#define MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET 0xe9 -#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xea -#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xeb -#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xec -#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xed -#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xee -#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xeb +#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xec +#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xed +#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee +#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0#define MLXPLAT_CPLD_LPC_IO_RANGE 0x100#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 126/313 cpuidle: big.LITTLE: fix refcount leak
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9456823c842f346c74265fcd98d008d87a7eb6f5 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. bl_idle_init() doesn't do that, so fix it.
--- drivers/cpuidle/cpuidle-big_little.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-big_little.c +6 -1
@@ -167,6 +167,7 @@ static int __init bl_idle_init(void) {int ret;struct device_node *root =of_find_node_by_path ("/" ); +const struct of_device_id *match_id;if (!root)return -ENODEV ;
@@ -174,7 +175,11 @@ static int __init bl_idle_init(void)/* * Initialize the driver just for a compliant set of machines */ -if (!of_match_node (compatible_machine_match, root)) + match_id =of_match_node (compatible_machine_match, root); + +of_node_put (root); + +if (!match_id)return -ENODEV ;if (!mcpm_is_available ())
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 127/313 OPP: Use opp_table->regulators to verify no regulator case
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 90e3577b5feb42bac1269e16bb3d2bdd8f6df40f ]
The value of opp_table->regulator_count is not very consistent right now and it may end up being 0 while we do have a "opp-microvolt" property in the OPP table. It was kept that way as we used to check if any regulators are set with the OPP core for a device or not using value of regulator_count.
Lets use opp_table->regulators for that purpose as the meaning of regulator_count is going to change in the later patches.
--- drivers/opp/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/opp/core.c +7 -4
@@ -191,12 +191,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)if (IS_ERR (opp_table))return 0 ; - count = opp_table->regulator_count; -/* Regulator may not be required for the device */ -if (!count) +if (!opp_table->regulators) goto put_opp_table; + count = opp_table->regulator_count; + uV =kmalloc_array (count,sizeof (*uV),GFP_KERNEL );if (!uV) goto put_opp_table;
@@ -976,6 +976,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,struct regulator *reg;int i; +if (!opp_table->regulators) +return true; +for (i =0 ; i < opp_table->regulator_count; i++) { reg = opp_table->regulators[i];
@@ -1263,7 +1266,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table)struct dev_pm_set_opp_data *data;int len, count = opp_table->regulator_count; -if (WARN_ON (!count)) +if (WARN_ON (!opp_table->regulators))return -EINVAL ;/* space for set_opp_data */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 128/313 tee: optee: avoid possible double list_del()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b2d102bd0146d9eb1fa630ca0cd19a15ef2f74c8 ]
This bug occurs when:
- a new request arrives, one thread(let's call it A) is pending in optee_supp_req() with req->busy is initial value false.
- tee-supplicant is killed, then optee_supp_release() is called, this function calls list_del(&req->link), and set supp->ctx to NULL. And it also wake up process A.
- process A continues, it firstly checks supp->ctx which is NULL, then checks req->busy which is false, at last run list_del(&req->link). This triggers double list_del() and results kernel panic.
For solve this problem, we rename req->busy to req->in_queue, and associate it with state of whether req is linked to supp->reqs. So we can just only check req->in_queue to make decision calling list_del() or not.
--- drivers/tee/optee/supp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/tee/optee/supp.c +7 -6
@@ -19,7 +19,7 @@struct optee_supp_req {struct list_head link; -bool busy; +bool in_queue;u32 func;u32 ret;size_t num_params;
@@ -54,7 +54,6 @@ void optee_supp_release(struct optee_supp *supp)/* Abort all request retrieved by supplicant */ idr_for_each_entry (&supp->idr, req, id) { - req->busy = false;idr_remove (&supp->idr, id); req->ret =TEEC_ERROR_COMMUNICATION ;complete (&req->c);
@@ -63,6 +62,7 @@ void optee_supp_release(struct optee_supp *supp)/* Abort all queued requests */ list_for_each_entry_safe (req, req_tmp, &supp->reqs, link) {list_del (&req->link); + req->in_queue = false; req->ret =TEEC_ERROR_COMMUNICATION ;complete (&req->c); }
@@ -103,6 +103,7 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,/* Insert the request in the request list */ mutex_lock (&supp->mutex);list_add_tail (&req->link, &supp->reqs); + req->in_queue = true;mutex_unlock (&supp->mutex);/* Tell an eventual waiter there's a new request */
@@ -130,9 +131,10 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params,* will serve all requests in a timely manner and * interrupting then wouldn't make sense. */ - interruptable = !req->busy; -if (!req->busy) +if (req->in_queue) {list_del (&req->link); + req->in_queue = false; + } }mutex_unlock (&supp->mutex);
@@ -176,7 +178,7 @@ static struct optee_supp_req *supp_pop_entry(struct optee_supp *supp,return ERR_PTR (-ENOMEM );list_del (&req->link); - req->busy = true; + req->in_queue = false;return req; }
@@ -318,7 +320,6 @@ static struct optee_supp_req *supp_pop_req(struct optee_supp *supp,if ((num_params - nm) != req->num_params)return ERR_PTR (-EINVAL ); - req->busy = false;idr_remove (&supp->idr, id); supp->req_id =-1 ; *num_meta = nm;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 129/313 drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c1866d44d149a1ea5c303632114fb6aa08cfd263 ]
Fix the dsi clock names in the DSI 10nm PLL driver to match the names in the dispcc driver as those are according to the clock plan of the chipset.
Changes in v2:
- Update the clock diagram with the new clock name
--- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +4 -4
@@ -17,7 +17,7 @@* | | * | | * +---------+ | +----------+ | +----+ -* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0pllbyte +* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0_phy_pll_out_byteclk * +---------+ | +----------+ | +----+ * | | * | | dsi0_pll_by_2_bit_clk
@@ -25,7 +25,7 @@* | | +----+ | |\ dsi0_pclk_mux * | |--| /2 |--o--| \ | * | | +----+ | \ | +---------+ -* | --------------| |--o--| div_7_4 |-- dsi0pll +* | --------------| |--o--| div_7_4 |-- dsi0_phy_pll_out_dsiclk * |------------------------------| / +---------+ * | +-----+ | / * -----------| /4? |--o----------|/
@@ -690,7 +690,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpllbyte" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_byteclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pll_bit_clk" , pll_10nm->id);/* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
@@ -739,7 +739,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpll" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_dsiclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pclk_mux" , pll_10nm->id);/* PIX CLK DIV : DIV_CTRL_7_4*/
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 120/313 iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 84a9a75774961612d0c7dd34a1777e8f98a65abd ]
The GITS_TRANSLATER MMIO doorbell register in the ITS hardware is architected to be 4 bytes in size, yet on hi1620 and earlier, Hisilicon have allocated the adjacent 4 bytes to carry some IMPDEF sideband information which results in an 8-byte MSI payload being delivered when signalling an interrupt:
MSIAddr:
|----4bytes----|----4bytes----| | MSIData | IMPDEF |
This poses no problem for the ITS hardware because the adjacent 4 bytes are reserved in the memory map. However, when delivering MSIs to memory, as we do in the SMMUv3 driver for signalling the completion of a SYNC command, the extended payload will corrupt the 4 bytes adjacent to the "sync_count" member in struct arm_smmu_device. Fortunately, the current layout allocates these bytes to padding, but this is fragile and we should make this explicit.
--- drivers/iommu/arm-smmu-v3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +5 -1
@@ -586,7 +586,11 @@ struct arm_smmu_device {struct arm_smmu_strtab_cfg strtab_cfg; -u32 sync_count; +/* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ +union { +u32 sync_count; +u64 padding; + };/* IOMMU core code handle */ struct iommu_device iommu;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 153/313 btrfs: reada: reorder dev-replace locks before radix tree preload
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ceb21a8db48559fd0809e03c4df9eb37743d9170 ]
The device-replace read lock is going to use rw semaphore in followup commits. The semaphore might sleep which is not possible in the radix tree preload section. The lock nesting is now:
* device replace
* radix tree preload
* readahead spinlock
--- fs/btrfs/reada.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/btrfs/reada.c +7 -5
@@ -376,26 +376,28 @@ static struct reada_extent *reada_find_extent(struct btrfs_fs_info *fs_info, goto error; } +/* Insert extent in reada tree + all per-device trees, all or nothing */ +btrfs_dev_replace_read_lock (&fs_info->dev_replace); ret =radix_tree_preload (GFP_KERNEL ); -if (ret) +if (ret) { +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; + } -/* insert extent in reada_tree + all per-device trees, all or nothing */ -btrfs_dev_replace_read_lock (&fs_info->dev_replace);spin_lock (&fs_info->reada_lock); ret =radix_tree_insert (&fs_info->reada_tree, index, re);if (ret == -EEXIST ) { re_exist =radix_tree_lookup (&fs_info->reada_tree, index); re_exist->refcnt++;spin_unlock (&fs_info->reada_lock); -btrfs_dev_replace_read_unlock (&fs_info->dev_replace);radix_tree_preload_end (); +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; }if (ret) {spin_unlock (&fs_info->reada_lock); -btrfs_dev_replace_read_unlock (&fs_info->dev_replace);radix_tree_preload_end (); +btrfs_dev_replace_read_unlock (&fs_info->dev_replace); goto error; }radix_tree_preload_end ();
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 163/313 bnxt_en: Disable MSIX before re-reserving NQs/CMPL rings.
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 36d65be9a88052cdfc8524eb591baf0e6c878408 ]
When bringing up a device, the code checks to see if the number of MSIX has changed. pci_disable_msix() should be called first before changing the number of reserved NQs/CMPL rings. This ensures that the MSIX vectors associated with the NQs/CMPL rings are still properly mapped when pci_disable_msix() masks the vectors.
This patch will prevent errors when RDMA support is added for the new 57500 chips. When the RDMA driver shuts down, the number of NQs is decreased and we must use the new sequence to prevent MSIX errors.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +11 -8
@@ -6073,23 +6073,26 @@ static void bnxt_clear_int_mode(struct bnxt *bp)int bnxt_reserve_rings (struct bnxt *bp) {int tcs =netdev_get_num_tc (bp->dev); +bool reinit_irq = false;int rc;if (!bnxt_need_reserve_rings (bp))return 0 ; - rc =__bnxt_reserve_rings (bp); -if (rc) { -netdev_err (bp->dev,"ring reservation failure rc: %d\n" , rc); -return rc; - }if (BNXT_NEW_RM (bp) && (bnxt_get_num_msix (bp) != bp->total_irqs)) {bnxt_ulp_irq_stop (bp);bnxt_clear_int_mode (bp); - rc =bnxt_init_int_mode (bp); + reinit_irq = true; + } + rc =__bnxt_reserve_rings (bp); +if (reinit_irq) { +if (!rc) + rc =bnxt_init_int_mode (bp);bnxt_ulp_irq_restart (bp, rc); -if (rc) -return rc; + } +if (rc) { +netdev_err (bp->dev,"ring reservation/IRQ init failure rc: %d\n" , rc); +return rc; }if (tcs && (bp->tx_nr_rings_per_tc * tcs != bp->tx_nr_rings)) {netdev_err (bp->dev,"tx ring reservation failure\n" );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 165/313 tools/power/x86/intel_pstate_tracer: Fix non root execution for post processing a trace file
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 663546903c835fe46308b1b1e53d32d1f2b33da9 ]
This script is supposed to be allowed to run with regular user privileges if a previously captured trace is being post processed.
Commit fbe313884d7d (tools/power/x86/intel_pstate_tracer: Free the trace buffer memory) introduced a bug that breaks that option.
Commit 35459105deb2 (tools/power/x86/intel_pstate_tracer: Add optional setting of trace buffer memory allocation) moved the code but kept the bug.
This patch fixes the issue.
--- tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py +2 -2
@@ -585,9 +585,9 @@ current_max_cpu = 0 read_trace_data(filename) -clear_trace_file() -# Free the memory if interval: + clear_trace_file() + # Free the memory free_trace_buffer() if graph_data_present == False:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 167/313 arm64: KVM: Skip MMIO insn after emulation
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0d640732dbebed0f10f18526de21652931f0b2f2 ]
When we emulate an MMIO instruction, we advance the CPU state within decode_hsr(), before emulating the instruction effects.
Having this logic in decode_hsr() is opaque, and advancing the state before emulation is problematic. It gets in the way of applying consistent single-step logic, and it prevents us from being able to fail an MMIO instruction with a synchronous exception.
Clean this up by only advancing the CPU state *after* the effects of the instruction are emulated.
--- virt/kvm/arm/mmio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
virt/kvm/arm/mmio.c +6 -5
@@ -117,6 +117,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)vcpu_set_reg (vcpu, vcpu->arch.mmio_decode.rt, data); } +/* +* The MMIO instruction is emulated and should not be re-executed +* in the guest. +*/ +kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu)); +return 0 ; }
@@ -144,11 +150,6 @@ static int decode_hsr(struct kvm_vcpu *vcpu, bool *is_write, int *len) vcpu->arch.mmio_decode.sign_extend = sign_extend; vcpu->arch.mmio_decode.rt = rt; -/* -* The MMIO instruction is emulated and should not be re-executed -* in the guest. -*/ -kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu));return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 168/313 usb: musb: dsps: fix otg state machine
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6010abf2c2c0e382d7e8ee44bd11f343aae90cce ]
Due to lack of ID pin interrupt event on AM335x devices, the musb dsps driver uses polling to detect usb device attach for dual-role port.
But in the case if a micro-A cable adapter is attached without a USB device attached to the cable, the musb state machine gets stuck in a_wait_vrise state waiting for the MUSB_CONNECT interrupt which won't happen due to the usb device is not attached. The state is stuck in a_wait_vrise even after the micro-A cable is detached, which could cause VBUS retention if then the dual-role port is attached to a host port.
To fix the problem, make a_wait_vrise as a transient state, then move the state to either a_wait_bcon for host port or a_idle state for dual-role port, if no usb device is attached to the port.
--- drivers/usb/musb/musb_dsps.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/musb/musb_dsps.c +7 -2
@@ -227,8 +227,13 @@ static int dsps_check_status(struct musb *musb, void *unused)switch (musb->xceiv->otg->state) {case OTG_STATE_A_WAIT_VRISE : -dsps_mod_timer_optional (glue); -break ; +if (musb->port_mode ==MUSB_HOST ) { + musb->xceiv->otg->state =OTG_STATE_A_WAIT_BCON ; +dsps_mod_timer_optional (glue); +break ; + } +/* fall through */ +case OTG_STATE_A_WAIT_BCON :/* keep VBUS on for host-only mode */ if (musb->port_mode ==MUSB_HOST ) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 169/313 usb: musb: dsps: fix runtime pm for peripheral mode
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 54578ee883e34d2d1c518d48f1c1e2dd3f387188 ]
Since the runtime PM support was added in musb, dsps relies on the timer calling otg_timer() to activate the usb subsystem. However the driver doesn't enable the timer for peripheral port, then the peripheral port is unable to be enumerated by a host if the other usb port is disabled or in peripheral mode too.
So let's start the timer for peripheral port too.
--- drivers/usb/musb/musb_dsps.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/usb/musb/musb_dsps.c +9 -3
@@ -181,9 +181,11 @@ static void dsps_musb_enable(struct musb *musb)musb_writel (reg_base, wrp->epintr_set, epmask);musb_writel (reg_base, wrp->coreintr_set, coremask); -/* start polling for ID change in dual-role idle mode */ -if (musb->xceiv->otg->state ==OTG_STATE_B_IDLE && - musb->port_mode ==MUSB_OTG ) +/* +* start polling for runtime PM active and idle, +* and for ID change in dual-role idle mode. +*/ +if (musb->xceiv->otg->state ==OTG_STATE_B_IDLE )dsps_mod_timer (glue,-1 ); }
@@ -254,6 +256,10 @@ static int dsps_check_status(struct musb *musb, void *unused) musb->xceiv->otg->state =OTG_STATE_A_IDLE ;MUSB_HST_MODE (musb); } + +if (musb->port_mode ==MUSB_PERIPHERAL ) + skip_session =1 ; +if (!(devctl &MUSB_DEVCTL_SESSION ) && !skip_session)musb_writeb (mregs,MUSB_DEVCTL ,MUSB_DEVCTL_SESSION );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 170/313 perf header: Fix up argument to ctime()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0afcf29bab35d3785204cd9bd51693b231ad7181 ]
Reducing this noise when cross building to the Android NDK:
util/header.c: In function 'perf_header__fprintf_info':
util/header.c:2710:45: warning: pointer targets in passing argument 1 of 'ctime' differ in signedness [-Wpointer-sign]
fprintf(fp, "# captured on : %s", ctime(&st.st_ctime));
^
In file included from util/../perf.h:5:0,
from util/evlist.h:11,
from util/header.c:22:
/opt/android-ndk-r15c/platforms/android-26/arch-arm/usr/include/time.h:81:14: note: expected 'const time_t *' but argument is of type 'long unsigned int *'
extern char* ctime(const time_t*) __LIBC_ABI_PUBLIC__;
^--- tools/perf/util/header.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/header.c +3 -1
@@ -2636,6 +2636,7 @@ int perf_header__fprintf_info(struct perf_session *session, FILE *fp, bool full)struct perf_header *header = &session->header;int fd =perf_data__fd (session->data);struct stat st; +time_t stctime;int ret, bit; hd.fp = fp;
@@ -2645,7 +2646,8 @@ int perf_header__fprintf_info(struct perf_session *session, FILE *fp, bool full)if (ret ==-1 )return -1 ; -fprintf (fp,"# captured on : %s" ,ctime (&st.st_ctime)); + stctime = st.st_ctime; +fprintf (fp,"# captured on : %s" ,ctime (&stctime));fprintf (fp,"# header version : %u\n" , header->version);fprintf (fp,"# data offset : %" PRIu64"\n" , header->data_offset);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 171/313 perf tools: Cast off_t to s64 to avoid warning on bionic libc
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 866053bb644f754d1a93aaa9db9998fecf7a8978 ]
To avoid this warning:
CC /tmp/build/perf/util/s390-cpumsf.o
util/s390-cpumsf.c: In function 's390_cpumsf_samples':
util/s390-cpumsf.c:508:3: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'off_t' [-Wformat=]
pr_err("[%#08" PRIx64 "] Invalid AUX trailer entry TOD clock base\n",
^
Now the various Android cross toolchains used in the perf tools container test builds are all clean and we can remove this:
export EXTRA_MAKE_ARGS="WERROR=0"
--- tools/perf/util/s390-cpumsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/s390-cpumsf.c +1 -1
@@ -499,7 +499,7 @@ static int s390_cpumsf_samples(struct s390_cpumsf_queue *sfq, u64 *ts) aux_ts =get_trailer_time (buf);if (!aux_ts) {pr_err ("[%#08" PRIx64"] Invalid AUX trailer entry TOD clock base\n" , - sfq->buffer->data_offset); + (s64 )sfq->buffer->data_offset); aux_ts = ~0ULL ; goto out; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 172/313 percpu: convert spin_lock_irq to spin_lock_irqsave.
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6ab7d47bcbf0144a8cb81536c2cead4cde18acfe ]
Quoted 1 line
From Michael Cree:
"Bisection lead to commit b38d08f3181c ("percpu: restructure
locking") as being the cause of lockups at initial boot on the kernel built for generic Alpha.
On a suggestion by Tejun Heo that:
So, the only thing I can think of is that it's calling spin_unlock_irq() while irq handling isn't set up yet. Can you please try the followings?
1. Convert all spin_[un]lock_irq() to spin_lock_irqsave/unlock_irqrestore()."
--- mm/percpu-km.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/percpu-km.c +3 -2
@@ -50,6 +50,7 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp)const int nr_pages = pcpu_group_sizes[0 ] >>PAGE_SHIFT ;struct pcpu_chunk *chunk;struct page *pages; +unsigned long flags;int i; chunk =pcpu_alloc_chunk (gfp);
@@ -68,9 +69,9 @@ static struct pcpu_chunk *pcpu_create_chunk(gfp_t gfp) chunk->data = pages; chunk->base_addr =page_address (pages) - pcpu_group_offsets[0 ]; -spin_lock_irq (&pcpu_lock); +spin_lock_irqsave (&pcpu_lock, flags);pcpu_chunk_populated (chunk,0 , nr_pages, false); -spin_unlock_irq (&pcpu_lock); +spin_unlock_irqrestore (&pcpu_lock, flags);pcpu_stats_chunk_alloc ();trace_percpu_create_chunk (chunk->base_addr);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 173/313 net: hns3: fix incomplete uninitialization of IRQ in the hns3_nic_uninit_vector_data()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ae6017a71115ebc4e5c1a3f0f451319ab3f5c447 ]
In the hns3_nic_uninit_vector_data(), the procedure of uninitializing the tqp_vector's IRQ has not set affinity_notify to NULL and changes its init flag. This patch fixes it. And for simplificaton, local variable tqp_vector is used instead of priv->tqp_vector[i].
--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +6 -6
@@ -2760,12 +2760,12 @@ static int hns3_nic_uninit_vector_data(struct hns3_nic_priv *priv)hns3_free_vector_ring_chain (tqp_vector, &vector_ring_chain); -if (priv->tqp_vector[i].irq_init_flag ==HNS3_VECTOR_INITED ) { - (void )irq_set_affinity_hint ( - priv->tqp_vector[i].vector_irq, -NULL ); -free_irq (priv->tqp_vector[i].vector_irq, - &priv->tqp_vector[i]); +if (tqp_vector->irq_init_flag ==HNS3_VECTOR_INITED ) { +irq_set_affinity_notifier (tqp_vector->vector_irq, +NULL ); +irq_set_affinity_hint (tqp_vector->vector_irq,NULL ); +free_irq (tqp_vector->vector_irq, tqp_vector); + tqp_vector->irq_init_flag =HNS3_VECTOR_NOT_INITED ; } priv->ring_data[i].ring->irq_init_flag =HNS3_VECTOR_NOT_INITED ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 174/313 drm/amd/display: Add retry to read ddc_clock pin
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bd4905a9583c760da31ded7256dca6f71483c3dc ]
[WHY]
On customer board, there is one pluse (1v , < 1ms) on DDC_CLK pin when plug / unplug DP cable. Driver will read it and config DP to HDMI/DVI dongle.
[HOW]
If there is a real dongle, DDC_CLK should be always pull high. Try to read again to recovery this special case. Retry times = 3. Need additional 3ms to detect DP passive dongle(3 failures)
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +17 -6
@@ -324,7 +324,7 @@ bool dc_link_is_dp_sink_present(struct dc_link *link) {enum gpio_result gpio_result;uint32_t clock_pin =0 ; - +uint8_t retry =0 ;struct ddc *ddc; enum connector_id connector_id =
@@ -353,11 +353,22 @@ bool dc_link_is_dp_sink_present(struct dc_link *link)return present; } -/* Read GPIO: DP sink is present if both clock and data pins are zero */ -/* [anaumov] in DAL2, there was no check for GPIO failure */ - - gpio_result =dal_gpio_get_value (ddc->pin_clock, &clock_pin); -ASSERT (gpio_result ==GPIO_RESULT_OK ); +/* +* Read GPIO: DP sink is present if both clock and data pins are zero +* +* [W/A] plug-unplug DP cable, sometimes customer board has +* one short pulse on clk_pin(1V, < 1ms). DP will be config to HDMI/DVI +* then monitor can't br light up. Add retry 3 times +* But in real passive dongle, it need additional 3ms to detect +*/ +do { + gpio_result =dal_gpio_get_value (ddc->pin_clock, &clock_pin); +ASSERT (gpio_result ==GPIO_RESULT_OK ); +if (clock_pin) +udelay (1000 ); +else +break ; + }while (retry++ <3 ); present = (gpio_result ==GPIO_RESULT_OK ) && !clock_pin;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 175/313 Bluetooth: hci_bcm: Handle deferred probing for the clock supply
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 28ac03b9ac3f784c2f048a910c8d0a7a87483b66 ]
On some systems that actually have the bluetooth controller wired up with an extra clock signal, it's possible the bluetooth controller probes before the clock provider. clk_get would return a defer probe error, which was not handled by this driver.
Handle this properly, so that these systems can work reliably.
--- drivers/bluetooth/hci_bcm.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/bluetooth/hci_bcm.c +4 -0
@@ -907,6 +907,10 @@ static int bcm_get_resources(struct bcm_device *dev) dev->clk =devm_clk_get (dev->dev,NULL ); +/* Handle deferred probing */ +if (dev->clk ==ERR_PTR (-EPROBE_DEFER )) +return PTR_ERR (dev->clk); + dev->device_wakeup =devm_gpiod_get_optional (dev->dev,"device-wakeup" ,GPIOD_OUT_LOW );if (IS_ERR (dev->device_wakeup))
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 176/313 drm/amd/display: fix YCbCr420 blank color
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 12750d1647f118496f1da727146f255f5e44d500 ]
[Why]
YCbCr420 packing format uses two chanels for luma, and 1 channel for both chroma component. Our previous implementation did not account for this and results in every other pixel having very high luma value, showing greyish color instead of black.
YCbCr444 = <Y1, Cb1, Cr1>; <Y2, Cb2, Cr2> .....
YCbCr420 = <Y1, Y2, Cb1>; <Y3, Y4, Cr1> .....
[How]
Program the second channel with the black color value for luma as well.
--- .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 11 ++++++++++- .../gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +10 -1
@@ -1268,10 +1268,19 @@ static void program_scaler(const struct dc *dc, pipe_ctx->plane_res.scl_data.lb_params.depth, &pipe_ctx->stream->bit_depth_params); -if (pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color) +if (pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color) { +/* +* The way 420 is packed, 2 channels carry Y component, 1 channel +* alternate between Cb and Cr, so both channels need the pixel +* value for Y +*/ +if (pipe_ctx->stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + color.color_r_cr = color.color_g_y; + pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color ( pipe_ctx->stream_res.tg, &color); + } pipe_ctx->plane_res.xfm->funcs->transform_set_scaler (pipe_ctx->plane_res.xfm, &pipe_ctx->plane_res.scl_data);
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +9 -0
@@ -2121,6 +2121,15 @@ static void dcn10_blank_pixel_data( color_space = stream->output_color_space;color_space_to_black_color (dc, color_space, &black_color); +/* +* The way 420 is packed, 2 channels carry Y component, 1 channel +* alternate between Cb and Cr, so both channels need the pixel +* value for Y +*/ +if (stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + black_color.color_r_cr = black_color.color_g_y; + +if (stream_res->tg->funcs->set_blank_color) stream_res->tg->funcs->set_blank_color( stream_res->tg,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 177/313 powerpc/uaccess: fix warning/error with access_ok()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 05a4ab823983d9136a460b7b5e0d49ee709a6f86 ]
With the following piece of code, the following compilation warning is encountered:
if (_IOC_DIR(ioc) != _IOC_NONE) {
int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;
if (!access_ok(verify, ioarg, _IOC_SIZE(ioc))) {drivers/platform/test/dev.c: In function 'my_ioctl':drivers/platform/test/dev.c:219:7: warning: unused variable 'verify' [-Wunused-variable]
int verify = _IOC_DIR(ioc) & _IOC_READ ? VERIFY_WRITE : VERIFY_READ;
This patch fixes it by referencing 'type' in the macro allthough doing nothing with it.
--- arch/powerpc/include/asm/uaccess.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/include/asm/uaccess.h +1 -1
@@ -63,7 +63,7 @@ static inline int __access_ok(unsigned long addr, unsigned long size,#endif #define access_ok (type, addr, size) \ - (__chk_user_ptr(addr), \ + (__chk_user_ptr(addr), (void)(type), \ __access_ok((__force unsigned long)(addr), (size), get_fs()))/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 178/313 mac80211: fix radiotap vendor presence bitmap handling
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit efc38dd7d5fa5c8cdd0c917c5d00947aa0539443 ]
Due to the alignment handling, it actually matters where in the code we add the 4 bytes for the presence bitmap to the length; the first field is the timestamp with 8 byte alignment so we need to add the space for the extra vendor namespace presence bitmap *before* we do any alignment for the fields.
Move the presence bitmap length accounting to the right place to fix the alignment for the data properly.
--- net/mac80211/rx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/mac80211/rx.c +3 -2
@@ -142,6 +142,9 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local,/* allocate extra bitmaps */ if (status->chains) len +=4 *hweight8 (status->chains); +/* vendor presence bitmap */ +if (status->flag &RX_FLAG_RADIOTAP_VENDOR_DATA ) + len +=4 ;if (ieee80211_have_rx_timestamp (status)) { len =ALIGN (len,8 );
@@ -197,8 +200,6 @@ ieee80211_rx_radiotap_hdrlen(struct ieee80211_local *local,if (status->flag &RX_FLAG_RADIOTAP_VENDOR_DATA ) {struct ieee80211_vendor_radiotap *rtap = (void *)skb->data; -/* vendor presence bitmap */ - len +=4 ;/* alignment for fixed 6-byte vendor data header */ len =ALIGN (len,2 );/* vendor data header */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 179/313 xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fa89a4593b927b3f59c3b69379f31d3b22272e4e ]
gcc warn this:
net/ipv6/xfrm6_tunnel.c:143 __xfrm6_tunnel_alloc_spi() warn:
always true condition '(spi <= 4294967295) => (0-u32max <= u32max)'
'spi' is u32, which always not greater than XFRM6_TUNNEL_SPI_MAX because of wrap around. So the second forloop will never reach.
--- net/ipv6/xfrm6_tunnel.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv6/xfrm6_tunnel.c +3 -0
@@ -144,6 +144,9 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) index =__xfrm6_tunnel_spi_check (net, spi);if (index >=0 ) goto alloc_spi; + +if (spi ==XFRM6_TUNNEL_SPI_MAX ) +break ; }for (spi =XFRM6_TUNNEL_SPI_MIN ; spi < xfrm6_tn->spi; spi++) { index =__xfrm6_tunnel_spi_check (net, spi);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 180/313 mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit be2d6f421f680e01d58f7cd452646e0d8586d49b ]
When a LAG device or a VLAN device on top of it is enslaved to a bridge, the driver propagates the CHANGEUPPER event to the LAG's slaves.
This causes each physical port to increase the reference count of the internal representation of the bridge port by calling mlxsw_sp_port_bridge_join().
However, when a port is removed from a LAG, the corresponding leave() function is not called and the reference count is not decremented. This leads to ugly hacks such as mlxsw_sp_bridge_port_should_destroy() that try to understand if the bridge port should be destroyed even when its reference count is not 0.
Instead, make sure that when a port is unlinked from a LAG it would see the same events as if the LAG (or its uppers) were unlinked from a bridge.
The above is achieved by walking the LAG's uppers when a port is unlinked and calling mlxsw_sp_port_bridge_leave() for each upper that is enslaved to a bridge.
--- .../net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++++++++++++++ .../mellanox/mlxsw/spectrum_switchdev.c | 27 +------------------ 2 files changed, 24 insertions(+), 26 deletions(-)
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +23 -0
@@ -4235,6 +4235,25 @@ void mlxsw_sp_port_dev_put(struct mlxsw_sp_port *mlxsw_sp_port)dev_put (mlxsw_sp_port->dev); } +static void +mlxsw_sp_port_lag_uppers_cleanup (struct mlxsw_sp_port *mlxsw_sp_port, +struct net_device *lag_dev) +{ +struct net_device *br_dev =netdev_master_upper_dev_get (lag_dev); +struct net_device *upper_dev; +struct list_head *iter; + +if (netif_is_bridge_port (lag_dev)) +mlxsw_sp_port_bridge_leave (mlxsw_sp_port, lag_dev, br_dev); + +netdev_for_each_upper_dev_rcu (lag_dev, upper_dev, iter) { +if (!netif_is_bridge_port (upper_dev)) +continue ; + br_dev =netdev_master_upper_dev_get (upper_dev); +mlxsw_sp_port_bridge_leave (mlxsw_sp_port, upper_dev, br_dev); + } +} +static int mlxsw_sp_lag_create (struct mlxsw_sp *mlxsw_sp,u16 lag_id) {char sldr_pl[MLXSW_REG_SLDR_LEN ];
@@ -4427,6 +4446,10 @@ static void mlxsw_sp_port_lag_leave(struct mlxsw_sp_port *mlxsw_sp_port,/* Any VLANs configured on the port are no longer valid */ mlxsw_sp_port_vlan_flush (mlxsw_sp_port); +/* Make the LAG and its directly linked uppers leave bridges they +* are memeber in +*/ +mlxsw_sp_port_lag_uppers_cleanup (mlxsw_sp_port, lag_dev);if (lag->ref_count ==1 )mlxsw_sp_lag_destroy (mlxsw_sp, lag_id);
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +1 -26
@@ -282,30 +282,6 @@ mlxsw_sp_bridge_port_destroy(struct mlxsw_sp_bridge_port *bridge_port)kfree (bridge_port); } -static bool -mlxsw_sp_bridge_port_should_destroy (const struct mlxsw_sp_bridge_port * - bridge_port) -{ -struct net_device *dev = bridge_port->dev; -struct mlxsw_sp *mlxsw_sp; - -if (is_vlan_dev (dev)) - mlxsw_sp =mlxsw_sp_lower_get (vlan_dev_real_dev (dev)); -else - mlxsw_sp =mlxsw_sp_lower_get (dev); - -/* In case ports were pulled from out of a bridged LAG, then -* it's possible the reference count isn't zero, yet the bridge -* port should be destroyed, as it's no longer an upper of ours. -*/ -if (!mlxsw_sp &&list_empty (&bridge_port->vlans_list)) -return true; -else if (bridge_port->ref_count ==0 ) -return true; -else -return false; -} -static struct mlxsw_sp_bridge_port *mlxsw_sp_bridge_port_get (struct mlxsw_sp_bridge *bridge,struct net_device *brport_dev)
@@ -343,8 +319,7 @@ static void mlxsw_sp_bridge_port_put(struct mlxsw_sp_bridge *bridge, {struct mlxsw_sp_bridge_device *bridge_device; - bridge_port->ref_count--; -if (!mlxsw_sp_bridge_port_should_destroy (bridge_port)) +if (--bridge_port->ref_count !=0 )return ; bridge_device = bridge_port->bridge_device;mlxsw_sp_bridge_port_destroy (bridge_port);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 181/313 scsi: smartpqi: correct host serial num for ssa
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b2346b5030cf9458f30a84028d9fe904b8c942a7 ]
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -653,6 +653,7 @@ struct bmic_host_wellness_driver_version {u8 driver_version_tag[2 ];__le16 driver_version_length;char driver_version[32 ]; +u8 dont_write_tag[2 ];u8 end_tag[2 ]; };
@@ -682,6 +683,8 @@ static int pqi_write_driver_version_to_host_wellness(strncpy (buffer->driver_version,"Linux " DRIVER_VERSION ,sizeof (buffer->driver_version) -1 ); buffer->driver_version[sizeof (buffer->driver_version) -1 ] ='\0' ; + buffer->dont_write_tag[0 ] ='D' ; + buffer->dont_write_tag[1 ] ='W' ; buffer->end_tag[0 ] ='Z' ; buffer->end_tag[1 ] ='Z' ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 182/313 scsi: smartpqi: correct volume status
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7ff44499bafbd376115f0bb6b578d980f56ee13b ]
- fix race condition when a unit is deleted after an RLL, and before we have gotten the LV_STATUS page of the unit.
- In this case we will get a standard inquiry, rather than the desired page. This will result in a unit presented which no longer exists.
- If we ask for LV_STATUS, insure we get LV_STATUS
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -1184,6 +1184,9 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info,if (rc) goto out; +if (vpd->page_code !=CISS_VPD_LV_STATUS ) + goto out; + page_length = offsetof(struct ciss_vpd_logical_volume_status , volume_status) + vpd->page_length;if (page_length <sizeof (*vpd))
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 183/313 scsi: smartpqi: increase fw status register read timeout
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 65111785acccb836ec75263b03b0e33f21e74f47 ]
Problem:
- during the driver initialization, driver will poll fw for KERNEL_UP in a 30 seconds timeout.
- if the firmware is not ready after 30 seconds,
driver will not be loaded.
Fix:
- change timeout from 30 seconds to 3 minutes.
--- drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_sis.c +1 -1
@@ -59,7 +59,7 @@#define SIS_CTRL_KERNEL_UP 0x80#define SIS_CTRL_KERNEL_PANIC 0x100 -#define SIS_CTRL_READY_TIMEOUT_SECS 30 +#define SIS_CTRL_READY_TIMEOUT_SECS 180#define SIS_CTRL_READY_RESUME_TIMEOUT_SECS 90#define SIS_CTRL_READY_POLL_INTERVAL_MSECS 10
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 184/313 cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f68ef64cd7feb1220232bd8f501d8aad340a099 ]
The function cw1200_bss_info_changed() and cw1200_hw_scan() can be concurrently executed.
The two functions both access a possible shared variable "frame.skb".
This shared variable is freed by dev_kfree_skb() in cw1200_upload_beacon(), which is called by cw1200_bss_info_changed(). The free operation is protected by a mutex lock "priv->conf_mutex" in cw1200_bss_info_changed().
In cw1200_hw_scan(), this shared variable is accessed without the protection of the mutex lock "priv->conf_mutex".
Thus, concurrency use-after-free bugs may occur.
To fix these bugs, the original calls to mutex_lock(&priv->conf_mutex) and mutex_unlock(&priv->conf_mutex) are moved to the places, which can protect the accesses to the shared variable.
--- drivers/net/wireless/st/cw1200/scan.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/wireless/st/cw1200/scan.c +6 -7
@@ -78,6 +78,10 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,if (req->n_ssids >WSM_SCAN_MAX_NUM_OF_SSIDS )return -EINVAL ; +/* will be unlocked in cw1200_scan_work() */ +down (&priv->scan.lock); +mutex_lock (&priv->conf_mutex); + frame.skb =ieee80211_probereq_get (hw, priv->vif->addr,NULL ,0 , req->ie_len);if (!frame.skb)
@@ -86,19 +90,15 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,if (req->ie_len)skb_put_data (frame.skb, req->ie, req->ie_len); -/* will be unlocked in cw1200_scan_work() */ -down (&priv->scan.lock); -mutex_lock (&priv->conf_mutex); - ret =wsm_set_template_frame (priv, &frame);if (!ret) {/* Host want to be the probe responder. */ ret =wsm_set_probe_responder (priv, true); }if (ret) { +dev_kfree_skb (frame.skb);mutex_unlock (&priv->conf_mutex);up (&priv->scan.lock); -dev_kfree_skb (frame.skb);return ret; }
@@ -120,10 +120,9 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, ++priv->scan.n_ssids; } -mutex_unlock (&priv->conf_mutex); -if (frame.skb)dev_kfree_skb (frame.skb); +mutex_unlock (&priv->conf_mutex);queue_work (priv->workqueue, &priv->scan.work);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 156/313 tty: serial: samsung: Properly set flags in autoCTS mode
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ]
Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support") has changed the way the autoCTS mode is handled.
According to that change, serial drivers which enable H/W autoCTS mode must set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling TX. This patch adds proper handling of UPSTAT_AUTOCTS flag.
--- drivers/tty/serial/samsung.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/samsung.c +3 -0
@@ -1365,11 +1365,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,wr_regl (port,S3C2410_ULCON , ulcon);wr_regl (port,S3C2410_UBRDIV , quot); + port->status &= ~UPSTAT_AUTOCTS ; + umcon =rd_regl (port,S3C2410_UMCON );if (termios->c_cflag &CRTSCTS ) { umcon |=S3C2410_UMCOM_AFC ;/* Disable RTS when RX FIFO contains 63 bytes */ umcon &= ~S3C2412_UMCON_AFC_8 ; + port->status =UPSTAT_AUTOCTS ; }else { umcon &= ~S3C2410_UMCOM_AFC ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 157/313 perf test: Fix perf_event_attr test failure
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 741dad88dde296999da30332157ca47f0543747d ]
Fix inconsistent use of tabs and spaces error:
# perf test 16 -v
16: Setup struct perf_event_attr :
--- start ---
test child forked, pid 20224
File "/usr/libexec/perf-core/tests/attr.py", line 119
log.warning("expected %s=%s, got %s" % (t, self[t], other[t]))
^
TabError: inconsistent use of tabs and spaces in indentation
test child finished with -1
---- end ----
Setup struct perf_event_attr: FAILED!--- tools/perf/tests/attr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/attr.py +1 -1
@@ -116,7 +116,7 @@ class Event(dict): if not self.has_key(t) or not other.has_key(t): continue if not data_equal(self[t], other[t]): - log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) + log.warning("expected %s=%s, got %s" % (t, self[t], other[t])) # Test file description needs to have following sections: # [config]
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 158/313 perf dso: Fix unchecked usage of strncpy()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fca5085c15255bbde203b7322c15f07ebb12f63e ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
In function 'decompress_kmodule',
inlined from 'dso__decompress_kmodule_fd' at util/dso.c:305:9:
util/dso.c:298:3: error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
strncpy(pathname, tmpbuf, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CC /tmp/build/perf/util/values.o
CC /tmp/build/perf/util/debug.occ1: all warnings being treated as errors
--- tools/perf/util/dso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dso.c +1 -1
@@ -295,7 +295,7 @@ static int decompress_kmodule(struct dso *dso, const char *name,unlink (tmpbuf);if (pathname && (fd >=0 )) -strncpy (pathname, tmpbuf, len); +strlcpy (pathname, tmpbuf, len);return fd; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 159/313 perf header: Fix unchecked usage of strncpy()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7572588085a13d5db02bf159542189f52fdb507e ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/header.c: In function 'perf_event__synthesize_event_update_unit':
util/header.c:3586:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
strncpy(ev->data, evsel->unit, size);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/header.c:3579:16: note: length computed here
size_t size = strlen(evsel->unit);
^~~~~~~~~~~~~~~~~~~--- tools/perf/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/header.c +1 -1
@@ -3521,7 +3521,7 @@ perf_event__synthesize_event_update_unit(struct perf_tool *tool,if (ev ==NULL )return -ENOMEM ; -strncpy (ev->data, evsel->unit, size); +strlcpy (ev->data, evsel->unit, size +1 ); err =process (tool, (union perf_event *)ev,NULL ,NULL );free (ev);return err;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 160/313 btrfs: use tagged writepage to mitigate livelock of snapshot
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3cd24c698004d2f7668e0eb9fc1f096f533c791b ]
Snapshot is expected to be fast. But if there are writers steadily creating dirty pages in our subvolume, the snapshot may take a very long time to complete. To fix the problem, we use tagged writepage for snapshot flusher as we do in the generic write_cache_pages(), so we can omit pages dirtied after the snapshot command.
This does not change the semantics regarding which data get to the snapshot, if there are pages being dirtied during the snapshotting operation. There's a sync called before snapshot is taken in old/new case, any IO in flight just after that may be in the snapshot but this depends on other system effects that might still sync the IO.
We do a simple snapshot speed test on a Intel D-1531 box:
fio --ioengine=libaio --iodepth=32 --bs=4k --rw=write --size=64G --direct=0 --thread=1 --numjobs=1 --time_based --runtime=120 --filename=/mnt/sub/testfile --name=job1 --group_reporting & sleep 5; time btrfs sub snap -r /mnt/sub /mnt/snap; killall fio
original: 1m58sec patched: 6.54sec
This is the best case for this patch since for a sequential write case, we omit nearly all pages dirtied after the snapshot command.
For a multi writers, random write test:
fio --ioengine=libaio --iodepth=32 --bs=4k --rw=randwrite --size=64G --direct=0 --thread=1 --numjobs=4 --time_based --runtime=120 --filename=/mnt/sub/testfile --name=job1 --group_reporting & sleep 5; time btrfs sub snap -r /mnt/sub /mnt/snap; killall fio
original: 15.83sec patched: 10.35sec
The improvement is smaller compared to the sequential write case, since we omit only half of the pages dirtied after snapshot command.
--- fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/ctree.h | 2 +- fs/btrfs/extent_io.c | 17 +++++++++++++++-- fs/btrfs/inode.c | 11 +++++++---- fs/btrfs/ioctl.c | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-)
fs/btrfs/btrfs_inode.h +1 -0
@@ -29,6 +29,7 @@ enum {BTRFS_INODE_IN_DELALLOC_LIST ,BTRFS_INODE_READDIO_NEED_LOCK ,BTRFS_INODE_HAS_PROPS , + BTRFS_INODE_SNAPSHOT_FLUSH, };/* in memory btrfs inode */
fs/btrfs/ctree.h +1 -1
@@ -3155,7 +3155,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, struct inode *inode, u64 new_size, u32 min_type); -int btrfs_start_delalloc_inodes (struct btrfs_root *root); +int btrfs_start_delalloc_snapshot (struct btrfs_root *root);int btrfs_start_delalloc_roots (struct btrfs_fs_info *fs_info,int nr); int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end, unsigned int extra_bits,
fs/btrfs/extent_io.c +15 -2
@@ -3928,12 +3928,25 @@ static int extent_write_cache_pages(struct address_space *mapping, range_whole =1 ; scanned =1 ; } -if (wbc->sync_mode ==WB_SYNC_ALL ) + +/* +* We do the tagged writepage as long as the snapshot flush bit is set +* and we are the first one who do the filemap_flush() on this inode. +* +* The nr_to_write == LONG_MAX is needed to make sure other flushers do +* not race in and drop the bit. +*/ +if (range_whole && wbc->nr_to_write ==LONG_MAX && +test_and_clear_bit (BTRFS_INODE_SNAPSHOT_FLUSH , + &BTRFS_I (inode)->runtime_flags)) + wbc->tagged_writepages =1 ; + +if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages) tag =PAGECACHE_TAG_TOWRITE ;else tag =PAGECACHE_TAG_DIRTY ; retry: -if (wbc->sync_mode ==WB_SYNC_ALL ) +if (wbc->sync_mode ==WB_SYNC_ALL || wbc->tagged_writepages)tag_pages_for_writeback (mapping, index, end); done_index = index; while (!done && !nr_to_write_done && (index <= end) &&
fs/btrfs/inode.c +7 -4
@@ -10005,7 +10005,7 @@ static struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode* some fairly slow code that needs optimization. This walks the list * of all the inodes with pending delalloc and forces them to disk. */ -static int start_delalloc_inodes (struct btrfs_root *root,int nr) +static int start_delalloc_inodes (struct btrfs_root *root,int nr,bool snapshot) {struct btrfs_inode *binode;struct inode *inode;
@@ -10033,6 +10033,9 @@ static int start_delalloc_inodes(struct btrfs_root *root, int nr) }spin_unlock (&root->delalloc_lock); +if (snapshot) +set_bit (BTRFS_INODE_SNAPSHOT_FLUSH , + &binode->runtime_flags); work =btrfs_alloc_delalloc_work (inode);if (!work) {iput (inode);
@@ -10066,7 +10069,7 @@ out:return ret; } -int btrfs_start_delalloc_inodes (struct btrfs_root *root) +int btrfs_start_delalloc_snapshot (struct btrfs_root *root) {struct btrfs_fs_info *fs_info = root->fs_info;int ret;
@@ -10074,7 +10077,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root)if (test_bit (BTRFS_FS_STATE_ERROR , &fs_info->fs_state))return -EROFS ; - ret =start_delalloc_inodes (root,-1 ); + ret =start_delalloc_inodes (root,-1 , true);if (ret >0 ) ret =0 ;return ret;
@@ -10103,7 +10106,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr) &fs_info->delalloc_roots);spin_unlock (&fs_info->delalloc_root_lock); - ret =start_delalloc_inodes (root, nr); + ret =start_delalloc_inodes (root, nr, false);btrfs_put_fs_root (root);if (ret <0 ) goto out;
fs/btrfs/ioctl.c +1 -1
@@ -778,7 +778,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir,wait_event (root->subv_writers->wait,percpu_counter_sum (&root->subv_writers->counter) ==0 ); - ret =btrfs_start_delalloc_inodes (root); + ret =btrfs_start_delalloc_snapshot (root);if (ret) goto dec_and_free;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 161/313 perf probe: Fix unchecked usage of strncpy()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bef0b8970f27da5ca223e522a174d03e2587761d ]
The strncpy() function may leave the destination string buffer unterminated, better use strlcpy() that we have a __weak fallback implementation for systems without it.
In this case the 'target' buffer is coming from a list of build-ids that are expected to have a len of at most (SBUILD_ID_SIZE - 1) chars, so probably we're safe, but since we're using strncpy() here, use strlcpy() instead to provide the intended safety checking without the using the problematic strncpy() function.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/probe-file.c: In function 'probe_cache__open.isra.5':
util/probe-file.c:427:3: error: 'strncpy' specified bound 41 equals destination size [-Werror=stringop-truncation]
strncpy(sbuildid, target, SBUILD_ID_SIZE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
--- tools/perf/util/probe-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-file.c +1 -1
@@ -424,7 +424,7 @@ static int probe_cache__open(struct probe_cache *pcache, const char *target,if (target &&build_id_cache__cached (target)) {/* This is a cached buildid */ -strncpy (sbuildid, target,SBUILD_ID_SIZE ); +strlcpy (sbuildid, target,SBUILD_ID_SIZE ); dir_name =build_id_cache__linkname (sbuildid,NULL ,0 ); goto found; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 152/313 btrfs: harden agaist duplicate fsid on scanned devices
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a9261d4125c97ce8624e9941b75dee1b43ad5df9 ]
It's not that impossible to imagine that a device OR a btrfs image is copied just by using the dd or the cp command. Which in case both the copies of the btrfs will have the same fsid. If on the system with automount enabled, the copied FS gets scanned.
We have a known bug in btrfs, that we let the device path be changed after the device has been mounted. So using this loop hole the new copied device would appears as if its mounted immediately after it's been copied.
For example:
Initially.. /dev/mmcblk0p4 is mounted as /
$ lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT mmcblk0 179:0 0 29.2G 0 disk |-mmcblk0p4 179:4 0 4G 0 part / |-mmcblk0p2 179:2 0 500M 0 part /boot |-mmcblk0p3 179:3 0 256M 0 part [SWAP] `-mmcblk0p1 179:1 0 256M 0 part /boot/efi
$ btrfs fi show
Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba
Total devices 1 FS bytes used 1.40GiB
devid 1 size 4.00GiB used 3.00GiB path /dev/mmcblk0p4Copy mmcblk0 to sda
$ dd if=/dev/mmcblk0 of=/dev/sda
And immediately after the copy completes the change in the device superblock is notified which the automount scans using btrfs device scan and the new device sda becomes the mounted root device.
$ lsblk NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT sda 8:0 1 14.9G 0 disk |-sda4 8:4 1 4G 0 part / |-sda2 8:2 1 500M 0 part |-sda3 8:3 1 256M 0 part `-sda1 8:1 1 256M 0 part mmcblk0 179:0 0 29.2G 0 disk |-mmcblk0p4 179:4 0 4G 0 part |-mmcblk0p2 179:2 0 500M 0 part /boot |-mmcblk0p3 179:3 0 256M 0 part [SWAP] `-mmcblk0p1 179:1 0 256M 0 part /boot/efi
$ btrfs fi show /
Label: none uuid: 07892354-ddaa-4443-90ea-f76a06accaba
Total devices 1 FS bytes used 1.40GiB
devid 1 size 4.00GiB used 3.00GiB path /dev/sda4The bug is quite nasty that you can't either unmount /dev/sda4 or /dev/mmcblk0p4. And the problem does not get solved until you take sda out of the system on to another system to change its fsid using the 'btrfstune -u' command.
--- fs/btrfs/volumes.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
fs/btrfs/volumes.c +29 -0
@@ -850,6 +850,35 @@ static noinline struct btrfs_device *device_list_add(const char *path,return ERR_PTR (-EEXIST ); } +/* +* We are going to replace the device path for a given devid, +* make sure it's the same device if the device is mounted +*/ +if (device->bdev) { +struct block_device *path_bdev; + + path_bdev =lookup_bdev (path); +if (IS_ERR (path_bdev)) { +mutex_unlock (&fs_devices->device_list_mutex); +return ERR_CAST (path_bdev); + } + +if (device->bdev != path_bdev) { +bdput (path_bdev); +mutex_unlock (&fs_devices->device_list_mutex); +btrfs_warn_in_rcu (device->fs_info, +"duplicate device fsid:devid for %pU:%llu old:%s new:%s" , + disk_super->fsid, devid, +rcu_str_deref (device->name), path); +return ERR_PTR (-EEXIST ); + } +bdput (path_bdev); +btrfs_info_in_rcu (device->fs_info, +"device fsid %pU devid %llu moved old:%s new:%s" , + disk_super->fsid, devid, +rcu_str_deref (device->name), path); + } + name =rcu_string_strdup (path,GFP_NOFS );if (!name) {mutex_unlock (&fs_devices->device_list_mutex);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 187/313 iwlwifi: mvm: fix setting HE ppe FW config
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 189b8d441b0f7825f0b4278851c52afaa0515ed2 ]
The FW expects to get the ppe value for each NSS-BW pair in the same format as in the he phy capabilities IE, which means that a value of 0 implies ppe should be used for BPSK (mcs 0). If there are no PPE thresholds in the IE, or if for some NSS-RU pair there's no threshold set for it (this could happen because it's a variable-sized field), it means no PPE should not be used for that pair, so the value sent to FW should be 7 which corresponds to "none".
--- drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/fw/api/mac.h +1 -1
@@ -442,7 +442,7 @@ struct iwl_he_backoff_conf {* Support for Nss x BW (or RU) matrix: * (0=SISO, 1=MIMO2) x (0-20MHz, 1-40MHz, 2-80MHz, 3-160MHz) * Each entry contains 2 QAM thresholds for 8us and 16us: -* 0=BPSK, 1=QPSK, 2=16QAM, 3=64QAM, 4=256QAM, 5=1024QAM, 6/7=RES +* 0=BPSK, 1=QPSK, 2=16QAM, 3=64QAM, 4=256QAM, 5=1024QAM, 6=RES, 7=NONE * i.e. QAM_th1 < QAM_th2 such if TX uses QAM_tx: * QAM_tx < QAM_th1 --> PPE=0us * QAM_th1 <= QAM_tx < QAM_th2 --> PPE=8us
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +7 -1
@@ -1997,7 +1997,13 @@ static void iwl_mvm_cfg_he_sta(struct iwl_mvm *mvm,if (sta->he_cap.he_cap_elem.mac_cap_info[4 ] &IEEE80211_HE_MAC_CAP4_BQR ) sta_ctxt_cmd.htc_flags |=cpu_to_le32 (IWL_HE_HTC_BQR_SUPP ); -/* If PPE Thresholds exist, parse them into a FW-familiar format */ +/* +* Initialize the PPE thresholds to "None" (7), as described in Table +* 9-262ac of 80211.ax/D3.0. +*/ +memset (&sta_ctxt_cmd.pkt_ext,7 ,sizeof (sta_ctxt_cmd.pkt_ext)); + +/* If PPE Thresholds exist, parse them into a FW-familiar format. */ if (sta->he_cap.he_cap_elem.phy_cap_info[6 ] &IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT ) { u8 nss = (sta->he_cap.ppe_thres[0] &
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 196/313 md: fix raid10 hang issue caused by barrier
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e820d55cb99dd93ac2dc949cf486bb187e5cd70d ]
When both regular IO and resync IO happen at the same time, and if we also need to split regular. Then we can see tasks hang due to barrier.
1. resync thread
[ 1463.757205] INFO: task md1_resync:5215 blocked for more than 480 seconds. [ 1463.757207] Not tainted 4.19.5-1-default #1 [ 1463.757209] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1463.757212] md1_resync D 0 5215 2 0x80000000 [ 1463.757216] Call Trace: [ 1463.757223] ? __schedule+0x29a/0x880 [ 1463.757231] ? raise_barrier+0x8d/0x140 [raid10] [ 1463.757236] schedule+0x78/0x110 [ 1463.757243] raise_barrier+0x8d/0x140 [raid10] [ 1463.757248] ? wait_woken+0x80/0x80 [ 1463.757257] raid10_sync_request+0x1f6/0x1e30 [raid10] [ 1463.757265] ? _raw_spin_unlock_irq+0x22/0x40 [ 1463.757284] ? is_mddev_idle+0x125/0x137 [md_mod] [ 1463.757302] md_do_sync.cold.78+0x404/0x969 [md_mod] [ 1463.757311] ? wait_woken+0x80/0x80 [ 1463.757336] ? md_rdev_init+0xb0/0xb0 [md_mod] [ 1463.757351] md_thread+0xe9/0x140 [md_mod] [ 1463.757358] ? _raw_spin_unlock_irqrestore+0x2e/0x60 [ 1463.757364] ? __kthread_parkme+0x4c/0x70 [ 1463.757369] kthread+0x112/0x130 [ 1463.757374] ? kthread_create_worker_on_cpu+0x40/0x40 [ 1463.757380] ret_from_fork+0x3a/0x50
2. regular IO
[ 1463.760679] INFO: task kworker/0:8:5367 blocked for more than 480 seconds. [ 1463.760683] Not tainted 4.19.5-1-default #1 [ 1463.760684] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1463.760687] kworker/0:8 D 0 5367 2 0x80000000 [ 1463.760718] Workqueue: md submit_flushes [md_mod] [ 1463.760721] Call Trace: [ 1463.760731] ? __schedule+0x29a/0x880 [ 1463.760741] ? wait_barrier+0xdd/0x170 [raid10] [ 1463.760746] schedule+0x78/0x110 [ 1463.760753] wait_barrier+0xdd/0x170 [raid10] [ 1463.760761] ? wait_woken+0x80/0x80 [ 1463.760768] raid10_write_request+0xf2/0x900 [raid10] [ 1463.760774] ? wait_woken+0x80/0x80 [ 1463.760778] ? mempool_alloc+0x55/0x160 [ 1463.760795] ? md_write_start+0xa9/0x270 [md_mod] [ 1463.760801] ? try_to_wake_up+0x44/0x470 [ 1463.760810] raid10_make_request+0xc1/0x120 [raid10] [ 1463.760816] ? wait_woken+0x80/0x80 [ 1463.760831] md_handle_request+0x121/0x190 [md_mod] [ 1463.760851] md_make_request+0x78/0x190 [md_mod] [ 1463.760860] generic_make_request+0x1c6/0x470 [ 1463.760870] raid10_write_request+0x77a/0x900 [raid10] [ 1463.760875] ? wait_woken+0x80/0x80 [ 1463.760879] ? mempool_alloc+0x55/0x160 [ 1463.760895] ? md_write_start+0xa9/0x270 [md_mod] [ 1463.760904] raid10_make_request+0xc1/0x120 [raid10] [ 1463.760910] ? wait_woken+0x80/0x80 [ 1463.760926] md_handle_request+0x121/0x190 [md_mod] [ 1463.760931] ? _raw_spin_unlock_irq+0x22/0x40 [ 1463.760936] ? finish_task_switch+0x74/0x260 [ 1463.760954] submit_flushes+0x21/0x40 [md_mod]
So resync io is waiting for regular write io to complete to decrease nr_pending (conf->barrier++ is called before waiting). The regular write io splits another bio after call wait_barrier which call nr_pending++, then the splitted bio would continue with raid10_write_request -> wait_barrier, so the splitted bio has to wait for barrier to be zero, then deadlock happens as follows.
resync io regular io
raise_barrier
wait_barrier generic_make_request wait_barrier
To resolve the issue, we need to call allow_barrier to decrease nr_pending before generic_make_request since regular IO is not issued to underlying devices, and wait_barrier is called again to ensure no internal IO happening.
--- drivers/md/raid10.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/md/raid10.c +4 -0
@@ -1208,7 +1208,9 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,struct bio *split =bio_split (bio, max_sectors, gfp, &conf->bio_split);bio_chain (split, bio); +allow_barrier (conf);generic_make_request (bio); +wait_barrier (conf); bio = split; r10_bio->master_bio = bio; r10_bio->sectors = max_sectors;
@@ -1513,7 +1515,9 @@ retry_write:struct bio *split =bio_split (bio, r10_bio->sectors,GFP_NOIO , &conf->bio_split);bio_chain (split, bio); +allow_barrier (conf);generic_make_request (bio); +wait_barrier (conf); bio = split; r10_bio->master_bio = bio; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 199/313 ice: Do not enable NAPI on q_vectors that have no rings
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit eec903769b4ea476591ffff73bb7359f14f38c51 ]
If ice driver has q_vectors w/ active NAPI that has no rings, then this will result in a divide by zero error. To correct it I am updating the driver code so that we only support NAPI on q_vectors that have 1 or more rings allocated to them.
See commit 13a8cd191a2b ("i40e: Do not enable NAPI on q_vectors that have no rings") for detail.
--- drivers/net/ethernet/intel/ice/ice_main.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +12 -4
@@ -4333,8 +4333,12 @@ static void ice_napi_enable_all(struct ice_vsi *vsi)if (!vsi->netdev)return ; -for (q_idx =0 ; q_idx < vsi->num_q_vectors; q_idx++) -napi_enable (&vsi->q_vectors[q_idx]->napi); +for (q_idx =0 ; q_idx < vsi->num_q_vectors; q_idx++) { +struct ice_q_vector *q_vector = vsi->q_vectors[q_idx]; + +if (q_vector->rx.ring || q_vector->tx.ring) +napi_enable (&q_vector->napi); + } }/**
@@ -4817,8 +4821,12 @@ static void ice_napi_disable_all(struct ice_vsi *vsi)if (!vsi->netdev)return ; -for (q_idx =0 ; q_idx < vsi->num_q_vectors; q_idx++) -napi_disable (&vsi->q_vectors[q_idx]->napi); +for (q_idx =0 ; q_idx < vsi->num_q_vectors; q_idx++) { +struct ice_q_vector *q_vector = vsi->q_vectors[q_idx]; + +if (q_vector->rx.ring || q_vector->tx.ring) +napi_disable (&q_vector->napi); + } }/**
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 200/313 igb: Fix an issue that PME is not enabled during runtime suspend
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1fb3a7a75e2efcc83ef21f2434069cddd6fae6f5 ]
I210 ethernet card doesn't wakeup when a cable gets plugged. It's because its PME is not set.
Since commit 42eca2302146 ("PCI: Don't touch card regs after runtime suspend D3"), if the PCI state is saved, pci_pm_runtime_suspend() stops calling pci_finish_runtime_suspend(), which enables the PCI PME.
To fix the issue, let's not to save PCI states when it's runtime suspend, to let the PCI subsystem enables PME.
--- drivers/net/ethernet/intel/igb/igb_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +5 -3
@@ -8770,9 +8770,11 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake,rtnl_unlock ();#ifdef CONFIG_PM - retval =pci_save_state (pdev); -if (retval) -return retval; +if (!runtime) { + retval =pci_save_state (pdev); +if (retval) +return retval; + }#endif status =rd32 (E1000_STATUS );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 202/313 fbdev: fbcon: Fix unregister crash when more than one framebuffer
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2122b40580dd9d0620398739c773d07a7b7939d0 ]
When unregistering fbdev using unregister_framebuffer(), any bound console will unbind automatically. This is working fine if this is the only framebuffer, resulting in a switch to the dummy console. However if there is a fb0 and I unregister fb1 having a bound console, I eventually get a crash. The fastest way for me to trigger the crash is to do a reboot, resulting in this splat:
[ 76.478825] WARNING: CPU: 0 PID: 527 at linux/kernel/workqueue.c:1442 __queue_work+0x2d4/0x41c [ 76.478849] Modules linked in: raspberrypi_hwmon gpio_backlight backlight bcm2835_rng rng_core [last unloaded: tinydrm] [ 76.478916] CPU: 0 PID: 527 Comm: systemd-udevd Not tainted 4.20.0-rc4+ #4 [ 76.478933] Hardware name: BCM2835 [ 76.478949] Backtrace: [ 76.478995] [<c010d388>] (dump_backtrace) from [<c010d670>] (show_stack+0x20/0x24) [ 76.479022] r6:00000000 r5:c0bc73be r4:00000000 r3:6fb5bf81 [ 76.479060] [<c010d650>] (show_stack) from [<c08e82f4>] (dump_stack+0x20/0x28) [ 76.479102] [<c08e82d4>] (dump_stack) from [<c0120070>] (__warn+0xec/0x12c) [ 76.479134] [<c011ff84>] (__warn) from [<c01201e4>] (warn_slowpath_null+0x4c/0x58) [ 76.479165] r9:c0eb6944 r8:00000001 r7:c0e927f8 r6:c0bc73be r5:000005a2 r4:c0139e84 [ 76.479197] [<c0120198>] (warn_slowpath_null) from [<c0139e84>] (__queue_work+0x2d4/0x41c) [ 76.479222] r6:d7666a00 r5:c0e918ee r4:dbc4e700 [ 76.479251] [<c0139bb0>] (__queue_work) from [<c013a02c>] (queue_work_on+0x60/0x88) [ 76.479281] r10:c0496bf8 r9:00000100 r8:c0e92ae0 r7:00000001 r6:d9403700 r5:d7666a00 [ 76.479298] r4:20000113 [ 76.479348] [<c0139fcc>] (queue_work_on) from [<c0496c28>] (cursor_timer_handler+0x30/0x54) [ 76.479374] r7:d8a8fabc r6:c0e08088 r5:d8afdc5c r4:d8a8fabc [ 76.479413] [<c0496bf8>] (cursor_timer_handler) from [<c0178744>] (call_timer_fn+0x100/0x230) [ 76.479435] r4:c0e9192f r3:d758a340 [ 76.479465] [<c0178644>] (call_timer_fn) from [<c0178980>] (expire_timers+0x10c/0x12c) [ 76.479495] r10:40000000 r9:c0e9192f r8:c0e92ae0 r7:d8afdccc r6:c0e19280 r5:c0496bf8 [ 76.479513] r4:d8a8fabc [ 76.479541] [<c0178874>] (expire_timers) from [<c0179630>] (run_timer_softirq+0xa8/0x184) [ 76.479570] r9:00000001 r8:c0e19280 r7:00000000 r6:c0e08088 r5:c0e1a3e0 r4:c0e19280 [ 76.479603] [<c0179588>] (run_timer_softirq) from [<c0102404>] (__do_softirq+0x1ac/0x3fc) [ 76.479632] r10:c0e91680 r9:d8afc020 r8:0000000a r7:00000100 r6:00000001 r5:00000002 [ 76.479650] r4:c0eb65ec [ 76.479686] [<c0102258>] (__do_softirq) from [<c0124d10>] (irq_exit+0xe8/0x168) [ 76.479716] r10:d8d1a9b0 r9:d8afc000 r8:00000001 r7:d949c000 r6:00000000 r5:c0e8b3f0 [ 76.479734] r4:00000000 [ 76.479764] [<c0124c28>] (irq_exit) from [<c016b72c>] (__handle_domain_irq+0x94/0xb0) [ 76.479793] [<c016b698>] (__handle_domain_irq) from [<c01021dc>] (bcm2835_handle_irq+0x3c/0x48) [ 76.479823] r8:d8afdebc r7:d8afddfc r6:ffffffff r5:c0e089f8 r4:d8afddc8 r3:d8afddc8 [ 76.479851] [<c01021a0>] (bcm2835_handle_irq) from [<c01019f0>] (__irq_svc+0x70/0x98)
The problem is in the console rebinding in fbcon_fb_unbind(). It uses the virtual console index as the new framebuffer index to bind the console(s) to. The correct way is to use the con2fb_map lookup table to find the framebuffer index.
--- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +1 -1
@@ -3066,7 +3066,7 @@ static int fbcon_fb_unbind(int idx)for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map[i] != idx && con2fb_map[i] !=-1 ) { - new_idx = i; + new_idx = con2fb_map[i];break ; } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 201/313 ACPI/APEI: Clear GHES block_status before panic()
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 98cff8b23ed1c763a029ee81ea300df0d153d07d ]
In __ghes_panic() clear the block status in the APEI generic error status block for that generic hardware error source before calling panic() to prevent a second panic() in the crash kernel for exactly the same fatal error.
Otherwise ghes_probe(), running in the crash kernel, would see an unhandled error in the APEI generic error status block and panic again, thereby precluding any crash dump.
--- drivers/acpi/apei/ghes.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/acpi/apei/ghes.c +2 -0
@@ -691,6 +691,8 @@ static void __ghes_panic(struct ghes *ghes) {__ghes_print_estatus (KERN_EMERG , ghes->generic, ghes->estatus); +ghes_clear_estatus (ghes); +/* reboot to log the error! */ if (!panic_timeout) panic_timeout = ghes_panic_timeout;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 204/313 pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 42f9b48cc5402be11d2364275eb18c257d2a79e8 ]
The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) only belong to the pin controller in the AO domain. With the current definition these pins cannot be referred to in .dts files as group (which is possible on GXBB and GXL for example).
Add a separate "gpio_aobus" function to fix the mapping between the pin controller and the GPIO pins in the AO domain. This is similar to how the GXBB and GXL drivers implement this functionality.
--- drivers/pinctrl/meson/pinctrl-meson8.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/meson/pinctrl-meson8.c +3 -0
@@ -807,7 +807,9 @@ static const char * const gpio_groups[] = {"BOOT_5" ,"BOOT_6" ,"BOOT_7" ,"BOOT_8" ,"BOOT_9" ,"BOOT_10" ,"BOOT_11" ,"BOOT_12" ,"BOOT_13" ,"BOOT_14" , "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18", +}; +static const char *const gpio_aobus_groups[] = {"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" ,"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
@@ -1030,6 +1032,7 @@ static struct meson_pmx_func meson8_cbus_functions[] = { };static struct meson_pmx_func meson8_aobus_functions[] = { +FUNCTION (gpio_aobus),FUNCTION (uart_ao),FUNCTION (remote),FUNCTION (i2c_slave_ao),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 188/313 powerpc/powernv/ioda: Allocate indirect TCE levels of cached userspace addresses on demand
In reply to Greg Kroah-Hartman4.19-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bdbf649efe21173cae63b4b71db84176420f9039 ]
The powernv platform maintains 2 TCE tables for VFIO - a hardware TCE table and a table with userspace addresses; the latter is used for marking pages dirty when corresponging TCEs are unmapped from the hardware table.
a68bd1267b72 ("powerpc/powernv/ioda: Allocate indirect TCE levels on demand") enabled on-demand allocation of the hardware table, however it missed the other table so it has still been fully allocated at the boot time. This fixes the issue by allocating a single level, just like we do for the hardware table.
--- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/powernv/pci-ioda-tce.c +1 -1
@@ -299,7 +299,7 @@ long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset,if (alloc_userspace_copy) { offset =0 ; uas =pnv_pci_ioda2_table_do_alloc_pages (nid, level_shift, - levels, tce_table_size, &offset, + tmplevels, tce_table_size, &offset, &total_allocated_uas);if (!uas) goto free_tces_exit;
Signature · 1 line
2.19.1