4.9.44-stable review
Subsystems (6)
Greg Kroah-Hartman
maintainercover 4.9.44-stable review
This is the start of the stable review cycle for the 4.9.44 release. There are 41 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 Thu Aug 17 01:17:56 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.44-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.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.9.44-rc1
Maciej W. Rozycki <[email protected]>
MIPS: DEC: Fix an int-handler.S CPU_DADDI_WORKAROUNDS regression
Neil Armstrong <[email protected]>
pinctrl: meson-gxbb: Add missing GPIODV_18 pin entry
Thomas Gleixner <[email protected]>
pinctrl: samsung: Remove bogus irq_[un]mask from resource management
Masahiro Yamada <[email protected]>
pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD20
Masahiro Yamada <[email protected]>
pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD11
Andy Shevchenko <[email protected]>
pinctrl: intel: merrifield: Correct UART pin lists
Icenowy Zheng <[email protected]>
pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
Christoph Hellwig <[email protected]>
pnfs/blocklayout: require 64-bit sector_t
Stefan-Gabriel Mirea <[email protected]>
iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
Sandeep Singh <[email protected]>
usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
Kai-Heng Feng <[email protected]>
usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
Bin Liu <[email protected]>
usb: core: unlink urbs from the tail of the endpoint's urb_list
Alan Stern <[email protected]>
USB: Check for dropped connection before switching to full speed
Yoshihiro Shimoda <[email protected]>
usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3
Yoshihiro Shimoda <[email protected]>
usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling
Alan Swanson <[email protected]>
uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
Ian Abbott <[email protected]>
staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING
Akinobu Mita <[email protected]>
iio: light: tsl2563: use correct event code
Hans de Goede <[email protected]>
iio: accel: bmc150: Always restore device to normal mode after suspend-resume
Arnd Bergmann <[email protected]>
staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
Rafael J. Wysocki <[email protected]>
USB: hcd: Mark secondary HCD as dead if the primary one died
Bin Liu <[email protected]>
usb: musb: fix tx fifo flush handling again
Greg Kroah-Hartman <[email protected]>
USB: serial: pl2303: add new ATEN device id
Stefan Triller <[email protected]>
USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
Hector Martin <[email protected]>
USB: serial: option: add D-Link DWM-222 device ID
Maarten Lankhorst <[email protected]>
drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
Wladimir J. van der Laan <[email protected]>
drm/etnaviv: Fix off-by-one error in reloc checking
Weston Andros Adamson <[email protected]>
nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
Haibo Chen <[email protected]>
mmc: mmc: correct the logic for setting HS400ES signal voltage
Miquel Raynal <[email protected]>
nand: fix wrong default oob layout for small pages using soft ecc
Mateusz Jurczyk <[email protected]>
fuse: initialize the flock flag in fuse_file on allocation
Nicholas Bellinger <[email protected]>
target: Fix node_acl demo-mode + uncached dynamic shutdown regression
Nicholas Bellinger <[email protected]>
iscsi-target: Fix iscsi_np reset hung task during parallel delete
Varun Prakash <[email protected]>
iscsi-target: fix memory leak in iscsit_setup_text_cmd()
Boris Brezillon <[email protected]>
mtd: nand: Fix timing setup for NANDs that do not support SET FEATURES
Max Filippov <[email protected]>
xtensa: don't limit csum_partial export by CONFIG_NET
Max Filippov <[email protected]>
xtensa: mm/cache: add missing EXPORT_SYMBOLs
Max Filippov <[email protected]>
xtensa: fix cache aliasing handling code for WT cache
Mel Gorman <[email protected]>
futex: Remove unnecessary warning from get_futex_key
Cong Wang <[email protected]>
mm: fix list corruptions on shmem shrinklist
Jonathan Toppins <[email protected]>
mm: ratelimit PFNs busy info message
-------------
Diffstat:
Makefile | 4 +- arch/mips/dec/int-handler.S | 34 +- arch/xtensa/kernel/xtensa_ksyms.c | 2 - arch/xtensa/mm/cache.c | 16 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- drivers/gpu/drm/i915/intel_color.c | 1 + drivers/iio/accel/bmc150-accel-core.c | 9 +- drivers/iio/adc/vf610_adc.c | 2 +- drivers/iio/light/tsl2563.c | 2 +- drivers/mmc/core/mmc.c | 2 +- drivers/mtd/nand/nand_base.c | 12 +- drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 + drivers/pinctrl/samsung/pinctrl-exynos.c | 4 - drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 364 +++++++++++---------- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 383 ++++++++++++----------- drivers/staging/comedi/comedi_fops.c | 3 + drivers/staging/iio/resolver/ad2s1210.c | 2 +- drivers/target/iscsi/iscsi_target.c | 2 + drivers/target/iscsi/iscsi_target_login.c | 7 +- drivers/target/target_core_tpg.c | 4 +- drivers/target/target_core_transport.c | 4 +- drivers/usb/core/hcd.c | 4 +- drivers/usb/core/hub.c | 10 +- drivers/usb/core/quirks.c | 4 + drivers/usb/gadget/udc/renesas_usb3.c | 21 +- drivers/usb/host/pci-quirks.c | 17 +- drivers/usb/musb/musb_host.c | 1 + drivers/usb/renesas_usbhs/rcar3.c | 9 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 2 + drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + drivers/usb/storage/unusual_uas.h | 4 +- fs/fuse/file.c | 2 +- fs/nfs/Kconfig | 1 + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 1 + include/target/iscsi/iscsi_target_core.h | 1 + kernel/futex.c | 5 +- mm/page_alloc.c | 2 +- mm/shmem.c | 12 +- 42 files changed, 513 insertions(+), 455 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/41 mm: ratelimit PFNs busy info message
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Toppins <[email protected]>
commit 75dddef32514f7aa58930bde6a1263253bc3d4ba upstream.
The RDMA subsystem can generate several thousand of these messages per second eventually leading to a kernel crash. Ratelimit these messages to prevent this crash.
Doug said:
"I've been carrying a version of this for several kernel versions. I
don't remember when they started, but we have one (and only one) class of machines: Dell PE R730xd, that generate these errors. When it happens, without a rate limit, we get rcu timeouts and kernel oopses. With the rate limit, we just get a lot of annoying kernel messages but the machine continues on, recovers, and eventually the memory operations all succeed"
And:
"> Well... why are all these EBUSY's occurring? It sounds inefficient
Quoted 2 lines
(at least) but if it is expected, normal and unavoidable then perhaps we should just remove that message altogether?
I don't have an answer to that question. To be honest, I haven't looked real hard. We never had this at all, then it started out of the blue, but only on our Dell 730xd machines (and it hits all of them), but no other classes or brands of machines. And we have our 730xd machines loaded up with different brands and models of cards (for instance one dedicated to mlx4 hardware, one for qib, one for mlx5, an ocrdma/cxgb4 combo, etc), so the fact that it hit all of the machines meant it wasn't tied to any particular brand/model of RDMA hardware. To me, it always smelled of a hardware oddity specific to maybe the CPUs or mainboard chipsets in these machines, so given that I'm not an mm expert anyway, I never chased it down.
A few other relevant details: it showed up somewhere around 4.8/4.9 or thereabouts. It never happened before, but the prinkt has been there since the 3.18 days, so possibly the test to trigger this message was changed, or something else in the allocator changed such that the situation started happening on these machines?
And, like I said, it is specific to our 730xd machines (but they are all identical, so that could mean it's something like their specific ram configuration is causing the allocator to hit this on these machine but not on other machines in the cluster, I don't want to say it's necessarily the model of chipset or CPU, there are other bits of identicalness between these machines)"
--- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_alloc.c +1 -1
@@ -7335,7 +7335,7 @@ int alloc_contig_range(unsigned long sta/* Make sure the range is really isolated. */ if (test_pages_isolated (outer_start, end, false)) { -pr_info ("%s: [%lx, %lx) PFNs busy\n" , +pr_info_ratelimited ("%s: [%lx, %lx) PFNs busy\n" , __func__, outer_start, end); ret = -EBUSY ; goto done;
Greg Kroah-Hartman
maintainerPATCH 2/41 mm: fix list corruptions on shmem shrinklist
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
commit d041353dc98a6339182cd6f628b4c8f111278cb3 upstream.
We saw many list corruption warnings on shmem shrinklist:
WARNING: CPU: 18 PID: 177 at lib/list_debug.c:59 __list_del_entry+0x9e/0xc0
list_del corruption. prev->next should be ffff9ae5694b82d8, but was ffff9ae5699ba960
Modules linked in: intel_rapl sb_edac edac_core x86_pkg_temp_thermal coretemp iTCO_wdt iTCO_vendor_support crct10dif_pclmul crc32_pclmul ghash_clmulni_intel raid0 dcdbas shpchp wmi hed i2c_i801 ioatdma lpc_ich i2c_smbus acpi_cpufreq tcp_diag inet_diag sch_fq_codel ipmi_si ipmi_devintf ipmi_msghandler igb ptp crc32c_intel pps_core i2c_algo_bit i2c_core dca ipv6 crc_ccitt
CPU: 18 PID: 177 Comm: kswapd1 Not tainted 4.9.34-t3.el7.twitter.x86_64 #1
Hardware name: Dell Inc. PowerEdge C6220/0W6W6G, BIOS 2.2.3 11/07/2013
Call Trace:
dump_stack+0x4d/0x66
__warn+0xcb/0xf0
warn_slowpath_fmt+0x4f/0x60
__list_del_entry+0x9e/0xc0
shmem_unused_huge_shrink+0xfa/0x2e0
shmem_unused_huge_scan+0x20/0x30
super_cache_scan+0x193/0x1a0
shrink_slab.part.41+0x1e3/0x3f0
shrink_slab+0x29/0x30
shrink_node+0xf9/0x2f0
kswapd+0x2d8/0x6c0
kthread+0xd7/0xf0
ret_from_fork+0x22/0x30
WARNING: CPU: 23 PID: 639 at lib/list_debug.c:33 __list_add+0x89/0xb0
list_add corruption. prev->next should be next (ffff9ae5699ba960), but was ffff9ae5694b82d8. (prev=ffff9ae5694b82d8).
Modules linked in: intel_rapl sb_edac edac_core x86_pkg_temp_thermal coretemp iTCO_wdt iTCO_vendor_support crct10dif_pclmul crc32_pclmul ghash_clmulni_intel raid0 dcdbas shpchp wmi hed i2c_i801 ioatdma lpc_ich i2c_smbus acpi_cpufreq tcp_diag inet_diag sch_fq_codel ipmi_si ipmi_devintf ipmi_msghandler igb ptp crc32c_intel pps_core i2c_algo_bit i2c_core dca ipv6 crc_ccitt
CPU: 23 PID: 639 Comm: systemd-udevd Tainted: G W 4.9.34-t3.el7.twitter.x86_64 #1
Hardware name: Dell Inc. PowerEdge C6220/0W6W6G, BIOS 2.2.3 11/07/2013
Call Trace:
dump_stack+0x4d/0x66
__warn+0xcb/0xf0
warn_slowpath_fmt+0x4f/0x60
__list_add+0x89/0xb0
shmem_setattr+0x204/0x230
notify_change+0x2ef/0x440
do_truncate+0x5d/0x90
path_openat+0x331/0x1190
do_filp_open+0x7e/0xe0
do_sys_open+0x123/0x200
SyS_open+0x1e/0x20
do_syscall_64+0x61/0x170
entry_SYSCALL64_slow_path+0x25/0x25The problem is that shmem_unused_huge_shrink() moves entries from the global sbinfo->shrinklist to its local lists and then releases the spinlock. However, a parallel shmem_setattr() could access one of these entries directly and add it back to the global shrinklist if it is removed, with the spinlock held.
The logic itself looks solid since an entry could be either in a local list or the global list, otherwise it is removed from one of them by list_del_init(). So probably the race condition is that, one CPU is in the middle of INIT_LIST_HEAD() but the other CPU calls list_empty() which returns true too early then the following list_add_tail() sees a corrupted entry.
list_empty_careful() is designed to fix this situation.
--- mm/shmem.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
mm/shmem.c +10 -2
@@ -1007,7 +1007,11 @@ static int shmem_setattr(struct dentry **/ if (IS_ENABLED (CONFIG_TRANSPARENT_HUGE_PAGECACHE )) {spin_lock (&sbinfo->shrinklist_lock); -if (list_empty (&info->shrinklist)) { +/* +* _careful to defend against unlocked access to +* ->shrink_list in shmem_unused_huge_shrink() +*/ +if (list_empty_careful (&info->shrinklist)) {list_add_tail (&info->shrinklist, &sbinfo->shrinklist); sbinfo->shrinklist_len++;
@@ -1774,7 +1778,11 @@ alloc_nohuge: page = shmem_alloc_and_ac* to shrink under memory pressure. */ spin_lock (&sbinfo->shrinklist_lock); -if (list_empty (&info->shrinklist)) { +/* +* _careful to defend against unlocked access to +* ->shrink_list in shmem_unused_huge_shrink() +*/ +if (list_empty_careful (&info->shrinklist)) {list_add_tail (&info->shrinklist, &sbinfo->shrinklist); sbinfo->shrinklist_len++;
Greg Kroah-Hartman
maintainerPATCH 3/41 futex: Remove unnecessary warning from get_futex_key
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <[email protected]>
commit 48fb6f4db940e92cfb16cd878cddd59ea6120d06 upstream.
Commit 65d8fc777f6d ("futex: Remove requirement for lock_page() in get_futex_key()") removed an unnecessary lock_page() with the side-effect that page->mapping needed to be treated very carefully.
Two defensive warnings were added in case any assumption was missed and the first warning assumed a correct application would not alter a mapping backing a futex key. Since merging, it has not triggered for any unexpected case but Mark Rutland reported the following bug triggering due to the first warning.
kernel BUG at kernel/futex.c:679!
Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 3695 Comm: syz-executor1 Not tainted 4.13.0-rc3-00020-g307fec773ba3 #3 Hardware name: linux,dummy-virt (DT) task: ffff80001e271780 task.stack: ffff000010908000 PC is at get_futex_key+0x6a4/0xcf0 kernel/futex.c:679 LR is at get_futex_key+0x6a4/0xcf0 kernel/futex.c:679 pc : [<ffff00000821ac14>] lr : [<ffff00000821ac14>] pstate: 80000145
The fact that it's a bug instead of a warning was due to an unrelated arm64 problem, but the warning itself triggered because the underlying mapping changed.
This is an application issue but from a kernel perspective it's a recoverable situation and the warning is unnecessary so this patch removes the warning. The warning may potentially be triggered with the following test program from Mark although it may be necessary to adjust NR_FUTEX_THREADS to be a value smaller than the number of CPUs in the system.
#include <linux/futex.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/syscall.h>
#include <sys/time.h>
#include <unistd.h>
#define NR_FUTEX_THREADS 16
pthread_t threads[NR_FUTEX_THREADS];
void *mem;
#define MEM_PROT (PROT_READ | PROT_WRITE)
#define MEM_SIZE 65536
static int futex_wrapper(int *uaddr, int op, int val,
const struct timespec *timeout,
int *uaddr2, int val3)
{
syscall(SYS_futex, uaddr, op, val, timeout, uaddr2, val3);
}
void *poll_futex(void *unused)
{
for (;;) {
futex_wrapper(mem, FUTEX_CMP_REQUEUE_PI, 1, NULL, mem + 4, 1);
}
}
int main(int argc, char *argv[])
{
int i;
mem = mmap(NULL, MEM_SIZE, MEM_PROT,
MAP_SHARED | MAP_ANONYMOUS, -1, 0);
printf("Mapping @ %p\n", mem);
printf("Creating futex threads...\n");
for (i = 0; i < NR_FUTEX_THREADS; i++)
pthread_create(&threads[i], NULL, poll_futex, NULL);
printf("Flipping mapping...\n");
for (;;) {
mmap(mem, MEM_SIZE, MEM_PROT,
MAP_FIXED | MAP_SHARED | MAP_ANONYMOUS, -1, 0);
}
return 0;
}--- kernel/futex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/futex.c +3 -2
@@ -668,13 +668,14 @@ again:* this reference was taken by ihold under the page lock * pinning the inode in place so i_lock was unnecessary. The * only way for this check to fail is if the inode was -* truncated in parallel so warn for now if this happens. +* truncated in parallel which is almost certainly an +* application bug. In such a case, just retry. * * We are not calling into get_futex_key_refs() in file-backed * cases, therefore a successful atomic_inc return below will * guarantee that get_futex_key() will still imply smp_mb(); (B). */ -if (WARN_ON_ONCE (!atomic_inc_not_zero (&inode->i_count))) { +if (!atomic_inc_not_zero (&inode->i_count)) {rcu_read_unlock ();put_page (page);
Greg Kroah-Hartman
maintainerPATCH 4/41 xtensa: fix cache aliasing handling code for WT cache
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit 6d0f581d1768d3eaba15776e7dd1fdfec10cfe36 upstream.
Currently building kernel for xtensa core with aliasing WT cache fails with the following messages:
mm/memory.c:2152: undefined reference to flush_dcache_page' mm/memory.c:2332: undefined reference to local_flush_cache_page' mm/memory.c:1919: undefined reference to local_flush_cache_range' mm/memory.c:4179: undefined reference to copy_to_user_page' mm/memory.c:4183: undefined reference to `copy_from_user_page'
This happens because implementation of these functions is only compiled when data cache is WB, which looks wrong: even when data cache doesn't need flushing it still needs invalidation. The functions like __flush_[invalidate_]dcache_* are correctly defined for both WB and WT caches (and even if they weren't that'd still be ok, just slower).
Fix this by providing the same implementation of the above functions for both WB and WT cache.
--- arch/xtensa/mm/cache.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/xtensa/mm/cache.c +3 -7
@@ -120,10 +120,6 @@ void copy_user_highpage(struct page *dstpreempt_enable (); } -#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ - -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK -/* * Any time the kernel writes to a user page cache page, or it is about to * read from a page cache page this routine is called.
@@ -208,7 +204,7 @@ void local_flush_cache_page(struct vm_ar __invalidate_icache_page_alias(virt, phys); } -#endif +#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ void update_mmu_cache (struct vm_area_struct * vma,unsigned long addr,pte_t *ptep)
@@ -225,7 +221,7 @@ update_mmu_cache(struct vm_area_struct *flush_tlb_page (vma, addr); -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK +#if (DCACHE_WAY_SIZE >PAGE_SIZE )if (!PageReserved (page) &&test_bit (PG_arch_1, &page->flags)) {unsigned long phys =page_to_phys (page);
@@ -256,7 +252,7 @@ update_mmu_cache(struct vm_area_struct ** flush_dcache_page() on the page. */ -#if (DCACHE_WAY_SIZE >PAGE_SIZE ) &&XCHAL_DCACHE_IS_WRITEBACK +#if (DCACHE_WAY_SIZE >PAGE_SIZE ) void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, const void *src,
Greg Kroah-Hartman
maintainerPATCH 5/41 xtensa: mm/cache: add missing EXPORT_SYMBOLs
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit bc652eb6a0d5cffaea7dc8e8ad488aab2a1bf1ed upstream.
Functions clear_user_highpage, copy_user_highpage, flush_dcache_page, local_flush_cache_range and local_flush_cache_page may be used from modules. Export them.
arch/xtensa/mm/cache.c +5 -1
@@ -103,6 +103,7 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)clear_page_alias (kvaddr, paddr);preempt_enable (); } +EXPORT_SYMBOL (clear_user_highpage);void copy_user_highpage (struct page *dst,struct page *src,unsigned long vaddr,struct vm_area_struct *vma)
@@ -119,6 +120,7 @@ void copy_user_highpage(struct page *dst, struct page *src,copy_page_alias (dst_vaddr, src_vaddr, dst_paddr, src_paddr);preempt_enable (); } +EXPORT_SYMBOL (copy_user_highpage);/* * Any time the kernel writes to a user page cache page, or it is about to
@@ -172,7 +174,7 @@ void flush_dcache_page(struct page *page)/* There shouldn't be an entry in the cache for this page anymore. */ } - +EXPORT_SYMBOL (flush_dcache_page);/* * For now, flush the whole cache. FIXME??
@@ -184,6 +186,7 @@ void local_flush_cache_range(struct vm_area_struct *vma,__flush_invalidate_dcache_all ();__invalidate_icache_all (); } +EXPORT_SYMBOL (local_flush_cache_range);/* * Remove any entry in the cache for this page.
@@ -203,6 +206,7 @@ void local_flush_cache_page(struct vm_area_struct *vma, unsigned long address,__flush_invalidate_dcache_page_alias (virt, phys); __invalidate_icache_page_alias(virt, phys); } +EXPORT_SYMBOL (local_flush_cache_page);#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */
Greg Kroah-Hartman
maintainerPATCH 6/41 xtensa: dont limit csum_partial export by CONFIG_NET
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Max Filippov <[email protected]>
commit 7f81e55c737a8fa82c71f290945d729a4902f8d2 upstream.
csum_partial and csum_partial_copy_generic are defined unconditionally and are available even when CONFIG_NET is disabled. They are used not only by the network drivers, but also by scsi and media. Don't limit these functions export by CONFIG_NET.
arch/xtensa/kernel/xtensa_ksyms.c +0 -2
@@ -94,13 +94,11 @@ unsigned long __sync_fetch_and_or_4(unsigned long *p, unsigned long v) }EXPORT_SYMBOL (__sync_fetch_and_or_4); -#ifdef CONFIG_NET /* * Networking support */ EXPORT_SYMBOL (csum_partial);EXPORT_SYMBOL (csum_partial_copy_generic); -#endif /* CONFIG_NET */ /* * Architecture-specific symbols
Greg Kroah-Hartman
maintainerPATCH 7/41 mtd: nand: Fix timing setup for NANDs that do not support SET FEATURES
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
commit a11bf5ed951f8900d244d09eb03a888b59c7fc82 upstream.
Some ONFI NANDs do not support the SET/GET FEATURES commands, which, according to the spec, is perfectly valid.
On these NANDs we can't set a specific timing mode using the "timing mode" feature, and we should assume the NAND does not require any setup to enter a specific timing mode.
--- drivers/mtd/nand/nand_base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/nand/nand_base.c +3 -1
@@ -1081,7 +1081,9 @@ static int nand_setup_data_interface(str* Ensure the timing mode has been changed on the chip side * before changing timings on the controller side. */ -if (chip->onfi_version) { +if (chip->onfi_version && + (le16_to_cpu (chip->onfi_params.opt_cmd) & +ONFI_OPT_CMD_SET_GET_FEATURES )) {u8 tmode_param[ONFI_SUBFEATURE_PARAM_LEN ] = { chip->onfi_timing_mode_default, };
Greg Kroah-Hartman
maintainerPATCH 8/41 iscsi-target: fix memory leak in iscsit_setup_text_cmd()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Varun Prakash <[email protected]>
commit ea8dc5b4cd2195ee582cae28afa4164c6dea1738 upstream.
On receiving text request iscsi-target allocates buffer for payload in iscsit_handle_text_cmd() and assigns buffer pointer to cmd->text_in_ptr, this buffer is currently freed in iscsit_release_cmd(), if iscsi-target sets 'C' bit in text response then it will receive another text request from the initiator with ttt != 0xffffffff in this case iscsi-target will find cmd using itt and call iscsit_setup_text_cmd() which will set cmd->text_in_ptr to NULL without freeing previously allocated buffer.
This patch fixes this issue by calling kfree(cmd->text_in_ptr) in iscsit_setup_text_cmd() before assigning NULL to it.
For the first text request cmd->text_in_ptr is NULL as cmd is memset to 0 in iscsit_allocate_cmd().
--- drivers/target/iscsi/iscsi_target.c | 1 + 1 file changed, 1 insertion(+)
drivers/target/iscsi/iscsi_target.c +1 -0
@@ -2177,6 +2177,7 @@ iscsit_setup_text_cmd(struct iscsi_conn cmd->cmd_sn =be32_to_cpu (hdr->cmdsn); cmd->exp_stat_sn =be32_to_cpu (hdr->exp_statsn); cmd->data_direction =DMA_NONE ; +kfree (cmd->text_in_ptr); cmd->text_in_ptr =NULL ;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 9/41 iscsi-target: Fix iscsi_np reset hung task during parallel delete
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 978d13d60c34818a41fc35962602bdfa5c03f214 upstream.
This patch fixes a bug associated with iscsit_reset_np_thread() that can occur during parallel configfs rmdir of a single iscsi_np used across multiple iscsi-target instances, that would result in hung task(s) similar to below where configfs rmdir process context was blocked indefinately waiting for iscsi_np->np_restart_comp to finish:
[ 6726.112076] INFO: task dcp_proxy_node_:15550 blocked for more than 120 seconds. [ 6726.119440] Tainted: G W O 4.1.26-3321 #2 [ 6726.125045] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 6726.132927] dcp_proxy_node_ D ffff8803f202bc88 0 15550 1 0x00000000 [ 6726.140058] ffff8803f202bc88 ffff88085c64d960 ffff88083b3b1ad0 ffff88087fffeb08 [ 6726.147593] ffff8803f202c000 7fffffffffffffff ffff88083f459c28 ffff88083b3b1ad0 [ 6726.155132] ffff88035373c100 ffff8803f202bca8 ffffffff8168ced2 ffff8803f202bcb8 [ 6726.162667] Call Trace: [ 6726.165150] [<ffffffff8168ced2>] schedule+0x32/0x80 [ 6726.170156] [<ffffffff8168f5b4>] schedule_timeout+0x214/0x290 [ 6726.176030] [<ffffffff810caef2>] ? __send_signal+0x52/0x4a0 [ 6726.181728] [<ffffffff8168d7d6>] wait_for_completion+0x96/0x100 [ 6726.187774] [<ffffffff810e7c80>] ? wake_up_state+0x10/0x10 [ 6726.193395] [<ffffffffa035d6e2>] iscsit_reset_np_thread+0x62/0xe0 [iscsi_target_mod] [ 6726.201278] [<ffffffffa0355d86>] iscsit_tpg_disable_portal_group+0x96/0x190 [iscsi_target_mod] [ 6726.210033] [<ffffffffa0363f7f>] lio_target_tpg_store_enable+0x4f/0xc0 [iscsi_target_mod] [ 6726.218351] [<ffffffff81260c5a>] configfs_write_file+0xaa/0x110 [ 6726.224392] [<ffffffff811ea364>] vfs_write+0xa4/0x1b0 [ 6726.229576] [<ffffffff811eb111>] SyS_write+0x41/0xb0 [ 6726.234659] [<ffffffff8169042e>] system_call_fastpath+0x12/0x71
It would happen because each iscsit_reset_np_thread() sets state to ISCSI_NP_THREAD_RESET, sends SIGINT, and then blocks waiting for completion on iscsi_np->np_restart_comp.
However, if iscsi_np was active processing a login request and more than a single iscsit_reset_np_thread() caller to the same iscsi_np was blocked on iscsi_np->np_restart_comp, iscsi_np kthread process context in __iscsi_target_login_thread() would flush pending signals and only perform a single completion of np->np_restart_comp before going back to sleep within transport specific iscsit_transport->iscsi_accept_np code.
To address this bug, add a iscsi_np->np_reset_count and update __iscsi_target_login_thread() to keep completing np->np_restart_comp until ->np_reset_count has reached zero.
--- drivers/target/iscsi/iscsi_target.c | 1 + drivers/target/iscsi/iscsi_target_login.c | 7 +++++-- include/target/iscsi/iscsi_target_core.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/target/iscsi/iscsi_target.c +1 -0
@@ -418,6 +418,7 @@ int iscsit_reset_np_thread(return 0 ; } np->np_thread_state =ISCSI_NP_THREAD_RESET ; +atomic_inc (&np->np_reset_count);if (np->np_thread) {spin_unlock_bh (&np->np_thread_lock);
drivers/target/iscsi/iscsi_target_login.c +5 -2
@@ -1233,9 +1233,11 @@ static int __iscsi_target_login_thread(sflush_signals (current);spin_lock_bh (&np->np_thread_lock); -if (np->np_thread_state ==ISCSI_NP_THREAD_RESET ) { +if (atomic_dec_if_positive (&np->np_reset_count) >=0 ) { np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ; +spin_unlock_bh (&np->np_thread_lock);complete (&np->np_restart_comp); +return 1 ; }else if (np->np_thread_state ==ISCSI_NP_THREAD_SHUTDOWN ) {spin_unlock_bh (&np->np_thread_lock); goto exit;
@@ -1268,7 +1270,8 @@ static int __iscsi_target_login_thread(s goto exit; }else if (rc <0 ) {spin_lock_bh (&np->np_thread_lock); -if (np->np_thread_state ==ISCSI_NP_THREAD_RESET ) { +if (atomic_dec_if_positive (&np->np_reset_count) >=0 ) { + np->np_thread_state =ISCSI_NP_THREAD_ACTIVE ;spin_unlock_bh (&np->np_thread_lock);complete (&np->np_restart_comp);iscsit_put_transport (conn->conn_transport);
include/target/iscsi/iscsi_target_core.h +1 -0
@@ -785,6 +785,7 @@ struct iscsi_np {int np_sock_type;enum np_thread_state_table np_thread_state;bool enabled; +atomic_t np_reset_count;enum iscsi_timer_flags_table np_login_timer_flags;u32 np_exports;enum np_flags_table np_flags;
Greg Kroah-Hartman
maintainerPATCH 10/41 target: Fix node_acl demo-mode + uncached dynamic shutdown regression
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 6f48655facfd7f7ccfe6d252ac0fe319ab02e4dd upstream.
This patch fixes a generate_node_acls = 1 + cache_dynamic_acls = 0 regression, that was introduced by
commit 01d4d673558985d9a118e1e05026633c3e2ade9b
Author: Nicholas Bellinger <[email protected]>
Date: Wed Dec 7 12:55:54 2016 -0800
which originally had the proper list_del_init() usage, but was dropped during list review as it was thought unnecessary by HCH.
However, list_del_init() usage is required during the special generate_node_acls = 1 + cache_dynamic_acls = 0 case when transport_free_session() does a list_del(&se_nacl->acl_list), followed by target_complete_nacl() doing the same thing.
This was manifesting as a general protection fault as reported by Justin:
kernel: general protection fault: 0000 [#1] SMP kernel: Modules linked in: kernel: CPU: 0 PID: 11047 Comm: iscsi_ttx Not tainted 4.13.0-rc2.x86_64.1+ #20 kernel: Hardware name: Intel Corporation S5500BC/S5500BC, BIOS S5500.86B.01.00.0064.050520141428 05/05/2014 kernel: task: ffff88026939e800 task.stack: ffffc90007884000 kernel: RIP: 0010:target_put_nacl+0x49/0xb0 kernel: RSP: 0018:ffffc90007887d70 EFLAGS: 00010246 kernel: RAX: dead000000000200 RBX: ffff8802556ca000 RCX: 0000000000000000 kernel: RDX: dead000000000100 RSI: 0000000000000246 RDI: ffff8802556ce028 kernel: RBP: ffffc90007887d88 R08: 0000000000000001 R09: 0000000000000000 kernel: R10: ffffc90007887df8 R11: ffffea0009986900 R12: ffff8802556ce020 kernel: R13: ffff8802556ce028 R14: ffff8802556ce028 R15: ffffffff88d85540 kernel: FS: 0000000000000000(0000) GS:ffff88027fc00000(0000) knlGS:0000000000000000 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 kernel: CR2: 00007fffe36f5f94 CR3: 0000000009209000 CR4: 00000000003406f0 kernel: DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 kernel: DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 kernel: Call Trace: kernel: transport_free_session+0x67/0x140 kernel: transport_deregister_session+0x7a/0xc0 kernel: iscsit_close_session+0x92/0x210 kernel: iscsit_close_connection+0x5f9/0x840 kernel: iscsit_take_action_for_connection_exit+0xfe/0x110 kernel: iscsi_target_tx_thread+0x140/0x1e0 kernel: ? wait_woken+0x90/0x90 kernel: kthread+0x124/0x160 kernel: ? iscsit_thread_get_cpumask+0x90/0x90 kernel: ? kthread_create_on_node+0x40/0x40 kernel: ret_from_fork+0x22/0x30 kernel: Code: 00 48 89 fb 4c 8b a7 48 01 00 00 74 68 4d 8d 6c 24 08 4c
89 ef e8 e8 28 43 00 48 8b 93 20 04 00 00 48 8b 83 28 04 00 00 4c 89 ef <48> 89 42 08 48 89 10 48 b8 00 01 00 00 00 00 ad de 48 89 83 20
kernel: RIP: target_put_nacl+0x49/0xb0 RSP: ffffc90007887d70
kernel: ---[ end trace f12821adbfd46fed ]---
To address this, go ahead and use proper list_del_list() for all cases of se_nacl->acl_list deletion.
--- drivers/target/target_core_tpg.c | 4 ++-- drivers/target/target_core_transport.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/target/target_core_tpg.c +2 -2
@@ -364,7 +364,7 @@ void core_tpg_del_initiator_node_acl(strmutex_lock (&tpg->acl_node_mutex);if (acl->dynamic_node_acl) acl->dynamic_node_acl =0 ; -list_del (&acl->acl_list); +list_del_init (&acl->acl_list);mutex_unlock (&tpg->acl_node_mutex);target_shutdown_sessions (acl);
@@ -540,7 +540,7 @@ int core_tpg_deregister(struct se_portal* in transport_deregister_session(). */ list_for_each_entry_safe (nacl, nacl_tmp, &node_list, acl_list) { -list_del (&nacl->acl_list); +list_del_init (&nacl->acl_list);core_tpg_wait_for_nacl_pr_ref (nacl);core_free_device_list_for_node (nacl, se_tpg);
drivers/target/target_core_transport.c +2 -2
@@ -465,7 +465,7 @@ static void target_complete_nacl(struct }mutex_lock (&se_tpg->acl_node_mutex); -list_del (&nacl->acl_list); +list_del_init (&nacl->acl_list);mutex_unlock (&se_tpg->acl_node_mutex);core_tpg_wait_for_nacl_pr_ref (nacl);
@@ -537,7 +537,7 @@ void transport_free_session(struct se_sespin_unlock_irqrestore (&se_nacl->nacl_sess_lock, flags);if (se_nacl->dynamic_stop) -list_del (&se_nacl->acl_list); +list_del_init (&se_nacl->acl_list); }mutex_unlock (&se_tpg->acl_node_mutex);
Greg Kroah-Hartman
maintainerPATCH 11/41 fuse: initialize the flock flag in fuse_file on allocation
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Jurczyk <[email protected]>
commit 68227c03cba84a24faf8a7277d2b1a03c8959c2c upstream.
Before the patch, the flock flag could remain uninitialized for the lifespan of the fuse_file allocation. Unless set to true in fuse_file_flock(), it would remain in an indeterminate state until read in an if statement in fuse_release_common(). This could consequently lead to taking an unexpected branch in the code.
The bug was discovered by a runtime instrumentation designed to detect use of uninitialized memory in the kernel.
--- fs/fuse/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/fuse/file.c +1 -1
@@ -46,7 +46,7 @@ struct fuse_file *fuse_file_alloc(struct {struct fuse_file *ff; - ff =kmalloc (sizeof (struct fuse_file ),GFP_KERNEL ); + ff =kzalloc (sizeof (struct fuse_file ),GFP_KERNEL );if (unlikely (!ff))return NULL ;
Greg Kroah-Hartman
maintainerPATCH 12/41 nand: fix wrong default oob layout for small pages using soft ecc
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miquel Raynal <[email protected]>
commit f7f8c1756e9a5f1258a7cc6b663f8451b724900f upstream.
When using soft ecc, if no ooblayout is given, the core automatically uses one of the nand_ooblayout_{sp,lp}*() functions to determine the layout inside the out of band data.
Until kernel version 4.6, struct nand_ecclayout was used for that purpose. During the migration from 4.6 to 4.7, an error shown up in the small page layout, in the case oob section is only 8 bytes long.
The layout was using three bytes (0, 1, 2) for ecc, two bytes (3, 4) as free bytes, one byte (5) for bad block marker and finally two bytes (6, 7) as free bytes, as shown there:
[linux-4.6] drivers/mtd/nand/nand_base.c:52
static struct nand_ecclayout nand_oob_8 = {
.eccbytes = 3,
.eccpos = {0, 1, 2},
.oobfree = {
{.offset = 3,
.length = 2},
{.offset = 6,
.length = 2} }
};This fixes the current implementation which is incoherent. It references bit 3 at the same time as an ecc byte and a free byte.
Furthermore, it is clear with the previous implementation that there is only one ecc section with 8 bytes oob sections. We shall return -ERANGE in the nand_ooblayout_ecc_sp() function when asked for the second section.
--- drivers/mtd/nand/nand_base.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/mtd/nand/nand_base.c +7 -1
@@ -64,8 +64,14 @@ static int nand_ooblayout_ecc_sp(structif (!section) { oobregion->offset =0 ; - oobregion->length =4 ; +if (mtd->oobsize ==16 ) + oobregion->length =4 ; +else + oobregion->length =3 ; }else { +if (mtd->oobsize ==8 ) +return -ERANGE ; + oobregion->offset =6 ; oobregion->length = ecc->total -4 ; }
Greg Kroah-Hartman
maintainerPATCH 13/41 mmc: mmc: correct the logic for setting HS400ES signal voltage
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haibo Chen <[email protected]>
commit 92ddd95919466de5d34f3cb43635da9a7f9ab814 upstream.
Change the default err value to -EINVAL, make sure the card only has type EXT_CSD_CARD_TYPE_HS400_1_8V also do the signal voltage setting when select hs400es mode.
--- drivers/mmc/core/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/mmc.c +1 -1
@@ -1258,7 +1258,7 @@ out_err:static int mmc_select_hs400es (struct mmc_card *card) {struct mmc_host *host = card->host; -int err =0 ; +int err = -EINVAL ;u8 val;if (!(host->caps &MMC_CAP_8_BIT_DATA )) {
Greg Kroah-Hartman
maintainerPATCH 14/41 nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weston Andros Adamson <[email protected]>
commit 1feb26162bee7b2f110facfec71b5c7bdbc7d14d upstream.
The client was freeing the nfs4_ff_layout_ds, but not the contained nfs4_ff_ds_version array.
--- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/flexfilelayout/flexfilelayoutdev.c +1 -0
@@ -30,6 +30,7 @@ void nfs4_ff_layout_free_deviceid(struct {nfs4_print_deviceid (&mirror_ds->id_node.deviceid);nfs4_pnfs_ds_put (mirror_ds->ds); +kfree (mirror_ds->ds_versions);kfree_rcu (mirror_ds, id_node.rcu); }
Greg Kroah-Hartman
maintainerPATCH 15/41 drm/etnaviv: Fix off-by-one error in reloc checking
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wladimir J. van der Laan <[email protected]>
commit d6f756e09f01ea7a0efbbcef269a1e384a35d824 upstream.
A relocation pointing to the last four bytes of a buffer can legitimately happen in the case of small vertex buffers.
--- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +2 -2
@@ -264,8 +264,8 @@ static int submit_reloc(struct etnaviv_gif (ret)return ret; -if (r->reloc_offset >= bo->obj->base.size -sizeof (*ptr)) { -DRM_ERROR ("relocation %u outside object" , i); +if (r->reloc_offset > bo->obj->base.size -sizeof (*ptr)) { +DRM_ERROR ("relocation %u outside object\n" , i);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 16/41 drm/i915: Fix out-of-bounds array access in bdw_load_gamma_lut
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
commit 5279fc7724ae3a82c9cfe5b09c1fb07ff0e41056 upstream.
bdw_load_gamma_lut is writing beyond the array to the maximum value. The intend of the function is to clamp values > 1 to 1, so write the intended color to the max register.
This fixes the following KASAN warning:
[ 197.020857] [IGT] kms_pipe_color: executing [ 197.063434] [IGT] kms_pipe_color: starting subtest ctm-0-25-pipe0 [ 197.078989] ================================================================== [ 197.079127] BUG: KASAN: slab-out-of-bounds in bdw_load_gamma_lut.isra.2+0x3b9/0x570 [i915] [ 197.079188] Read of size 2 at addr ffff8800d38db150 by task kms_pipe_color/1839 [ 197.079208] CPU: 2 PID: 1839 Comm: kms_pipe_color Tainted: G U 4.13.0-rc1-patser+ #5211 [ 197.079215] Hardware name: NUC5i7RYB, BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015 [ 197.079220] Call Trace: [ 197.079230] dump_stack+0x68/0x9e [ 197.079239] print_address_description+0x6f/0x250 [ 197.079251] kasan_report+0x216/0x370 [ 197.079374] ? bdw_load_gamma_lut.isra.2+0x3b9/0x570 [i915] [ 197.079451] ? gen8_write16+0x4e0/0x4e0 [i915] [ 197.079460] __asan_report_load2_noabort+0x14/0x20 [ 197.079535] bdw_load_gamma_lut.isra.2+0x3b9/0x570 [i915] [ 197.079612] broadwell_load_luts+0x1df/0x550 [i915] [ 197.079690] intel_color_load_luts+0x7b/0x80 [i915] [ 197.079764] intel_begin_crtc_commit+0x138/0x760 [i915] [ 197.079783] drm_atomic_helper_commit_planes_on_crtc+0x1a3/0x820 [drm_kms_helper] [ 197.079859] ? intel_pre_plane_update+0x571/0x580 [i915] [ 197.079937] intel_update_crtc+0x238/0x330 [i915] [ 197.080016] intel_update_crtcs+0x10f/0x210 [i915] [ 197.080092] intel_atomic_commit_tail+0x1552/0x3340 [i915] [ 197.080101] ? _raw_spin_unlock+0x3c/0x40 [ 197.080110] ? __queue_work+0xb40/0xbf0 [ 197.080188] ? skl_update_crtcs+0xc00/0xc00 [i915] [ 197.080195] ? trace_hardirqs_on+0xd/0x10 [ 197.080269] ? intel_atomic_commit_ready+0x128/0x13c [i915] [ 197.080329] ? __i915_sw_fence_complete+0x5b8/0x6d0 [i915] [ 197.080336] ? debug_object_activate+0x39e/0x580 [ 197.080397] ? i915_sw_fence_await+0x30/0x30 [i915] [ 197.080409] ? __might_sleep+0x15b/0x180 [ 197.080483] intel_atomic_commit+0x944/0xa70 [i915] [ 197.080490] ? refcount_dec_and_test+0x11/0x20 [ 197.080567] ? intel_atomic_commit_tail+0x3340/0x3340 [i915] [ 197.080597] ? drm_atomic_crtc_set_property+0x303/0x580 [drm] [ 197.080674] ? intel_atomic_commit_tail+0x3340/0x3340 [i915] [ 197.080704] drm_atomic_commit+0xd7/0xe0 [drm] [ 197.080722] drm_atomic_helper_crtc_set_property+0xec/0x130 [drm_kms_helper] [ 197.080749] drm_mode_crtc_set_obj_prop+0x7d/0xb0 [drm] [ 197.080775] drm_mode_obj_set_property_ioctl+0x50b/0x5d0 [drm] [ 197.080783] ? __might_fault+0x104/0x180 [ 197.080809] ? drm_mode_obj_find_prop_id+0x160/0x160 [drm] [ 197.080838] ? drm_mode_obj_find_prop_id+0x160/0x160 [drm] [ 197.080861] drm_ioctl_kernel+0x154/0x1a0 [drm] [ 197.080885] drm_ioctl+0x624/0x8f0 [drm] [ 197.080910] ? drm_mode_obj_find_prop_id+0x160/0x160 [drm] [ 197.080934] ? drm_getunique+0x210/0x210 [drm] [ 197.080943] ? __handle_mm_fault+0x1bd0/0x1ce0 [ 197.080949] ? lock_downgrade+0x610/0x610 [ 197.080957] ? __lru_cache_add+0x15a/0x180 [ 197.080967] do_vfs_ioctl+0xd92/0xe40 [ 197.080975] ? ioctl_preallocate+0x1b0/0x1b0 [ 197.080982] ? selinux_capable+0x20/0x20 [ 197.080991] ? __do_page_fault+0x7b7/0x9a0 [ 197.080997] ? lock_downgrade+0x5bb/0x610 [ 197.081007] ? security_file_ioctl+0x57/0x90 [ 197.081016] SyS_ioctl+0x4e/0x80 [ 197.081024] entry_SYSCALL_64_fastpath+0x18/0xad [ 197.081030] RIP: 0033:0x7f61f287a987 [ 197.081035] RSP: 002b:00007fff7d44d188 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 197.081043] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f61f287a987 [ 197.081048] RDX: 00007fff7d44d1c0 RSI: 00000000c01864ba RDI: 0000000000000003 [ 197.081053] RBP: 00007f61f2b3eb00 R08: 0000000000000059 R09: 0000000000000000 [ 197.081058] R10: 0000002ea5c4a290 R11: 0000000000000246 R12: 00007f61f2b3eb58 [ 197.081063] R13: 0000000000001010 R14: 00007f61f2b3eb58 R15: 0000000000002702
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101659
--- drivers/gpu/drm/i915/intel_color.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/i915/intel_color.c +1 -0
@@ -394,6 +394,7 @@ static void broadwell_load_luts(struct d }/* Program the max register to clamp values > 1.0. */ + i = lut_size -1 ;I915_WRITE (PREC_PAL_GC_MAX (pipe,0 ),drm_color_lut_extract (lut[i].red,16 )); I915_WRITE(PREC_PAL_GC_MAX(pipe, 1),
Greg Kroah-Hartman
maintainerPATCH 17/41 USB: serial: option: add D-Link DWM-222 device ID
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hector Martin <[email protected]>
commit fd1b8668af59a11bb754a6c9b0051c6c5ce73b74 upstream.
Add device id for D-Link DWM-222.
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -2025,6 +2025,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */
Greg Kroah-Hartman
maintainerPATCH 18/41 USB: serial: cp210x: add support for Qivicon USB ZigBee dongle
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Triller <[email protected]>
commit 9585e340db9f6cc1c0928d82c3a23cc4460f0a3f upstream.
The German Telekom offers a ZigBee USB Stick under the brand name Qivicon for their SmartHome Home Base in its 1. Generation. The productId is not known by the according kernel module, this patch adds support for it.
--- drivers/usb/serial/cp210x.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/serial/cp210x.c +1 -0
@@ -136,6 +136,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */ { USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */ { USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */ + { USB_DEVICE(0x10C4, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
Greg Kroah-Hartman
maintainerPATCH 19/41 USB: serial: pl2303: add new ATEN device id
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 3b6bcd3d093c698d32e93d4da57679b8fbc5e01e upstream.
This adds a new ATEN device id for a new pl2303-based device.
--- drivers/usb/serial/pl2303.c | 1 + drivers/usb/serial/pl2303.h | 1 + 2 files changed, 2 insertions(+)
drivers/usb/serial/pl2303.c +1 -0
@@ -49,6 +49,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, + { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_UC485) }, { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID2) }, { USB_DEVICE(ATEN_VENDOR_ID2, ATEN_PRODUCT_ID) }, { USB_DEVICE(ELCOM_VENDOR_ID, ELCOM_PRODUCT_ID) },
drivers/usb/serial/pl2303.h +1 -0
@@ -27,6 +27,7 @@#define ATEN_VENDOR_ID 0x0557#define ATEN_VENDOR_ID2 0x0547#define ATEN_PRODUCT_ID 0x2008 +#define ATEN_PRODUCT_UC485 0x2021#define ATEN_PRODUCT_ID2 0x2118#define IODATA_VENDOR_ID 0x04bb
Greg Kroah-Hartman
maintainerPATCH 20/41 usb: musb: fix tx fifo flush handling again
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bin Liu <[email protected]>
commit 45d73860530a14c608f410b91c6c341777bfa85d upstream.
commit 68fe05e2a451 ("usb: musb: fix tx fifo flush handling") drops the 1ms delay trying to solve the long disconnect time issue when application queued many tx urbs. However, the 1ms delay is needed for some use cases, for example, without the delay, reconnecting AR9271 WIFI dongle no longer works if the connection is dropped from the AP.
So let's add back the 1ms delay in musb_h_tx_flush_fifo(), and solve the long disconnect time problem with a separate patch for usb_hcd_flush_endpoint().
--- drivers/usb/musb/musb_host.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/musb/musb_host.c +1 -0
@@ -139,6 +139,7 @@ static void musb_h_tx_flush_fifo(struct"Could not flush host TX%d fifo: csr: %04x\n" , ep->epnum, csr)) return; +mdelay (1 ); } }
Greg Kroah-Hartman
maintainerPATCH 21/41 USB: hcd: Mark secondary HCD as dead if the primary one died
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit cd5a6a4fdaba150089af2afc220eae0fef74878a upstream.
Make usb_hc_died() clear the HCD_FLAG_RH_RUNNING flag for the shared HCD and set HCD_FLAG_DEAD for it, in analogy with what is done for the primary one.
Among other thigs, this prevents check_root_hub_suspended() from returning -EBUSY for dead HCDs which helps to work around system suspend issues in some situations.
This actually fixes occasional suspend failures on one of my test machines.
--- drivers/usb/core/hcd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/hcd.c +2 -0
@@ -2474,6 +2474,8 @@ void usb_hc_died (struct usb_hcd *hcd) }if (usb_hcd_is_primary_hcd (hcd) && hcd->shared_hcd) { hcd = hcd->shared_hcd; +clear_bit (HCD_FLAG_RH_RUNNING , &hcd->flags); +set_bit (HCD_FLAG_DEAD , &hcd->flags);if (hcd->rh_registered) {clear_bit (HCD_FLAG_POLL_RH , &hcd->flags);
Greg Kroah-Hartman
maintainerPATCH 22/41 staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 105967ad68d2eb1a041bc041f9cf96af2a653b65 upstream.
gcc-7 points out an older regression:
drivers/staging/iio/resolver/ad2s1210.c: In function 'ad2s1210_read_raw':drivers/staging/iio/resolver/ad2s1210.c:515:42: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
The original code had 'unsigned short' here, but incorrectly got converted to 'bool'. This reverts the regression and uses a normal type instead.
--- drivers/staging/iio/resolver/ad2s1210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s1210.c +1 -1
@@ -472,7 +472,7 @@ static int ad2s1210_read_raw(struct iio_ long m) {struct ad2s1210_state *st =iio_priv (indio_dev); -bool negative; +u16 negative;int ret =0 ;u16 pos;s16 vel;
Greg Kroah-Hartman
maintainerPATCH 23/41 iio: accel: bmc150: Always restore device to normal mode after suspend-resume
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
commit e59e18989c68a8d7941005f81ad6abc4ca682de0 upstream.
After probe we would put the device in normal mode, after a runtime suspend-resume we would put it back in normal mode. But for a regular suspend-resume we would only put it back in normal mode if triggers or events have been requested. This is not consistent and breaks reading raw values after a suspend-resume.
This commit changes the regular resume path to also unconditionally put the device back in normal mode, fixing reading of raw values not working after a regular suspend-resume cycle.
--- drivers/iio/accel/bmc150-accel-core.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/iio/accel/bmc150-accel-core.c +1 -8
@@ -193,7 +193,6 @@ struct bmc150_accel_data {struct regmap *regmap;int irq;struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS ]; -atomic_t active_intr;struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS ];struct mutex mutex;u8 fifo_mode, watermark;
@@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(st goto out_fix_power_state; } -if (state) -atomic_inc (&data->active_intr); -else -atomic_dec (&data->active_intr); -return 0 ; out_fix_power_state:
@@ -1709,8 +1703,7 @@ static int bmc150_accel_resume(struct destruct bmc150_accel_data *data =iio_priv (indio_dev);mutex_lock (&data->mutex); -if (atomic_read (&data->active_intr)) -bmc150_accel_set_mode (data,BMC150_ACCEL_SLEEP_MODE_NORMAL ,0 ); +bmc150_accel_set_mode (data,BMC150_ACCEL_SLEEP_MODE_NORMAL ,0 );bmc150_accel_fifo_set_mode (data);mutex_unlock (&data->mutex);
Greg Kroah-Hartman
maintainerPATCH 24/41 iio: light: tsl2563: use correct event code
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akinobu Mita <[email protected]>
commit a3507e48d3f99a93a3056a34a5365f310434570f upstream.
The TSL2563 driver provides three iio channels, two of which are raw ADC channels (channel 0 and channel 1) in the device and the remaining one is calculated by the two. The ADC channel 0 only supports programmable interrupt with threshold settings and this driver supports the event but the generated event code does not contain the corresponding iio channel type.
This is going to change userspace ABI. Hopefully fixing this to be what it should always have been won't break any userspace code.
--- drivers/iio/light/tsl2563.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/light/tsl2563.c +1 -1
@@ -626,7 +626,7 @@ static irqreturn_t tsl2563_event_handlerstruct tsl2563_chip *chip =iio_priv (dev_info); iio_push_event(dev_info, - IIO_UNMOD_EVENT_CODE(IIO_LIGHT, + IIO_UNMOD_EVENT_CODE(IIO_INTENSITY, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_EITHER),
Greg Kroah-Hartman
maintainerPATCH 25/41 staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit cef988642cdac44e910a27cb6e8166c96f86a0df upstream.
Comedi's read and write file operation handlers (comedi_read() and comedi_write()) currently call copy_to_user() or copy_from_user() whilst in the TASK_INTERRUPTIBLE state, which falls foul of the might_fault() checks when enabled. Fix it by setting the current task state back to TASK_RUNNING a bit earlier before calling these functions.
--- drivers/staging/comedi/comedi_fops.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/comedi/comedi_fops.c +3 -0
@@ -2385,6 +2385,7 @@ static ssize_t comedi_write(struct filecontinue ; } +set_current_state (TASK_RUNNING ); wp = async->buf_write_ptr; n1 =min (n, async->prealloc_bufsz - wp); n2 = n - n1;
@@ -2517,6 +2518,8 @@ static ssize_t comedi_read(struct file * }continue ; } + +set_current_state (TASK_RUNNING ); rp = async->buf_read_ptr; n1 =min (n, async->prealloc_bufsz - rp); n2 = n - n1;
Greg Kroah-Hartman
maintainerPATCH 26/41 uas: Add US_FL_IGNORE_RESIDUE for Initio Corporation INIC-3069
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Swanson <[email protected]>
commit 89f23d51defcb94a5026d4b5da13faf4e1150a6f upstream.
Similar to commit d595259fbb7a ("usb-storage: Add ignore-residue quirk for Initio INIC-3619") for INIC-3169 in unusual_devs.h but INIC-3069 already present in unusual_uas.h. Both in same controller IC family.
Issue is that MakeMKV fails during key exchange with installed bluray drive with following error:
002004:0000 Error 'Scsi error - ILLEGAL REQUEST:COPY PROTECTION KEY EXCHANGE FAILURE - KEY NOT ESTABLISHED' occurred while issuing SCSI command AD010..080002400 to device 'SG:dev_11:0'
--- drivers/usb/storage/unusual_uas.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/unusual_uas.h +2 -2
@@ -124,9 +124,9 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x99/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV (0x13fd ,0x3940 ,0x0000 ,0x9999 ,"Initio Corporation" , -"" , +"INIC-3069" ,USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , -US_FL_NO_ATA_1X ), +US_FL_NO_ATA_1X |US_FL_IGNORE_RESIDUE ),/* Reported-by: Tom Arild Naess <[email protected]> */ UNUSUAL_DEV(0x152d, 0x0539, 0x0000, 0x9999,
Greg Kroah-Hartman
maintainerPATCH 27/41 usb: gadget: udc: renesas_usb3: Fix usb_gadget_giveback_request() calling
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
commit aca5b9ebd096039657417c321a9252c696b359c2 upstream.
According to the gadget.h, a "complete" function will always be called with interrupts disabled. However, sometimes usb3_request_done() function is called with interrupts enabled. So, this function should be held by spin_lock_irqsave() to disable interruption. Also, this driver has to call spin_unlock() to avoid spinlock recursion by this driver before calling usb_gadget_giveback_request().
--- drivers/usb/gadget/udc/renesas_usb3.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/usb/gadget/udc/renesas_usb3.c +16 -5
@@ -685,21 +685,32 @@ static struct renesas_usb3_request *usb3return usb3_req; } -static void usb3_request_done (struct renesas_usb3_ep *usb3_ep, -struct renesas_usb3_request *usb3_req,int status) +static void __usb3_request_done (struct renesas_usb3_ep *usb3_ep, +struct renesas_usb3_request *usb3_req, +int status) {struct renesas_usb3 *usb3 =usb3_ep_to_usb3 (usb3_ep); -unsigned long flags;dev_dbg (usb3_to_dev (usb3),"giveback: ep%2d, %u, %u, %d\n" , usb3_ep->num, usb3_req->req.length, usb3_req->req.actual, status); usb3_req->req.status = status; -spin_lock_irqsave (&usb3->lock, flags); usb3_ep->started = false;list_del_init (&usb3_req->queue); -spin_unlock_irqrestore (&usb3->lock, flags); +spin_unlock (&usb3->lock);usb_gadget_giveback_request (&usb3_ep->ep, &usb3_req->req); +spin_lock (&usb3->lock); +} + +static void usb3_request_done (struct renesas_usb3_ep *usb3_ep, +struct renesas_usb3_request *usb3_req,int status) +{ +struct renesas_usb3 *usb3 =usb3_ep_to_usb3 (usb3_ep); +unsigned long flags; + +spin_lock_irqsave (&usb3->lock, flags); +__usb3_request_done (usb3_ep, usb3_req, status); +spin_unlock_irqrestore (&usb3->lock, flags); }static void usb3_irq_epc_pipe0_status_end (struct renesas_usb3 *usb3)
Greg Kroah-Hartman
maintainerPATCH 28/41 usb: renesas_usbhs: Fix UGCTRL2 value for R-Car Gen3
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <[email protected]>
commit 2acecd58969897795cf015c9057ebd349a3fda8a upstream.
The latest HW manual (Rev.0.55) shows us this UGCTRL2.VBUSSEL bit. If the bit sets to 1, the VBUS drive is controlled by phy related registers (called "UCOM Registers" on the manual). Since R-Car Gen3 environment will control VBUS by phy-rcar-gen3-usb2 driver, the UGCTRL2.VBUSSEL bit should be set to 1. So, this patch fixes the register's value. Otherwise, even if the ID pin indicates to peripheral, the R-Car will output USBn_PWEN to 1 when a host driver is running.
--- drivers/usb/renesas_usbhs/rcar3.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/renesas_usbhs/rcar3.c +7 -2
@@ -20,9 +20,13 @@/* Low Power Status register (LPSTS) */ #define LPSTS_SUSPM 0x4000 -/* USB General control register 2 (UGCTRL2), bit[31:6] should be 0 */ +/* +* USB General control register 2 (UGCTRL2) +* Remarks: bit[31:11] and bit[9:6] should be 0 +*/ #define UGCTRL2_RESERVED_3 0x00000001/* bit[3:0] should be B'0001 */ #define UGCTRL2_USB0SEL_OTG 0x00000030 +#define UGCTRL2_VBUSSEL 0x00000400static void usbhs_write32 (struct usbhs_priv *priv,u32 reg,u32 data) {
@@ -34,7 +38,8 @@ static int usbhs_rcar3_power_ctrl(struct {struct usbhs_priv *priv =usbhs_pdev_to_priv (pdev); -usbhs_write32 (priv,UGCTRL2 ,UGCTRL2_RESERVED_3 |UGCTRL2_USB0SEL_OTG ); +usbhs_write32 (priv,UGCTRL2 ,UGCTRL2_RESERVED_3 |UGCTRL2_USB0SEL_OTG | +UGCTRL2_VBUSSEL );if (enable) {usbhs_bset (priv,LPSTS ,LPSTS_SUSPM ,LPSTS_SUSPM );
Greg Kroah-Hartman
maintainerPATCH 29/41 USB: Check for dropped connection before switching to full speed
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 94c43b9897abf4ea366ed4dba027494e080c7050 upstream.
Some buggy USB disk adapters disconnect and reconnect multiple times during the enumeration procedure. This may lead to a device connecting at full speed instead of high speed, because when the USB stack sees that a device isn't able to enumerate at high speed, it tries to hand the connection over to a full-speed companion controller.
The logic for doing this is careful to check that the device is still connected. But this check is inadequate if the device disconnects and reconnects before the check is done. The symptom is that a device works, but much more slowly than it is capable of operating.
The situation was made worse recently by commit 22547c4cc4fe ("usb:
hub: Wait for connection to be reestablished after port reset"), which increases the delay following a reset before a disconnect is recognized, thus giving the device more time to reconnect.
This patch makes the check more robust. If the device was disconnected at any time during enumeration, we will now skip the full-speed handover.
--- drivers/usb/core/hub.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/core/hub.c +6 -4
@@ -4728,7 +4728,8 @@ hub_power_remaining(struct usb_hub *hub)static void hub_port_connect (struct usb_hub *hub,int port1,u16 portstatus,u16 portchange) { -int status, i; +int status = -ENODEV ; +int i;unsigned unit_load;struct usb_device *hdev = hub->hdev;struct usb_hcd *hcd =bus_to_hcd (hdev->bus);
@@ -4932,9 +4933,10 @@ loop: done:hub_port_disable (hub, port1,1 ); -if (hcd->driver->relinquish_port && !hub->hdev->parent) - hcd->driver->relinquish_port (hcd, port1); - +if (hcd->driver->relinquish_port && !hub->hdev->parent) { +if (status != -ENOTCONN && status != -ENODEV ) + hcd->driver->relinquish_port (hcd, port1); + } }/* Handle physical or logical connection change events.
Greg Kroah-Hartman
maintainerPATCH 30/41 usb: core: unlink urbs from the tail of the endpoints urb_list
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bin Liu <[email protected]>
commit 2eac13624364db5b5e1666ae0bb3a4d36bc56b6e upstream.
While unlink an urb, if the urb has been programmed in the controller, the controller driver might do some hw related actions to tear down the urb.
Currently usb_hcd_flush_endpoint() passes each urb from the head of the endpoint's urb_list to the controller driver, which could make the controller driver think each urb has been programmed and take the unnecessary actions for each urb.
This patch changes the behavior in usb_hcd_flush_endpoint() to pass the urbs from the tail of the list, to avoid any unnecessary actions in an controller driver.
--- drivers/usb/core/hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hcd.c +1 -1
@@ -1877,7 +1877,7 @@ void usb_hcd_flush_endpoint(struct usb_d/* No more submits can occur */ spin_lock_irq (&hcd_urb_list_lock); rescan: - list_for_each_entry (urb, &ep->urb_list, urb_list) { +list_for_each_entry_reverse (urb, &ep->urb_list, urb_list) {int is_in;if (urb->unlinked)
Greg Kroah-Hartman
maintainerPATCH 31/41 usb: quirks: Add no-lpm quirk for Moshi USB to Ethernet Adapter
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai-Heng Feng <[email protected]>
commit 7496cfe5431f21da5d27a8388c326397e3f0a5db upstream.
Moshi USB to Ethernet Adapter internally uses a Genesys Logic hub to connect to Realtek r8153.
The Realtek r8153 ethernet does not work on the internal hub, no-lpm quirk can make it work.
Since another r8153 dongle at my hand does not have the issue, so add the quirk to the Genesys Logic hub instead.
--- drivers/usb/core/quirks.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/quirks.c +3 -0
@@ -150,6 +150,9 @@ static const struct usb_device_id usb_qu/* appletouch */ { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Genesys Logic hub, internally used by Moshi USB to Ethernet Adapter */ + { USB_DEVICE(0x05e3, 0x0616), .driver_info = USB_QUIRK_NO_LPM }, + /* Avision AV600U */ { USB_DEVICE(0x0638, 0x0a13), .driver_info = USB_QUIRK_STRING_FETCH_255 },
Greg Kroah-Hartman
maintainerPATCH 32/41 usb:xhci:Add quirk for Certain failing HP keyboard on reset after resume
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandeep Singh <[email protected]>
commit e788787ef4f9c24aafefc480a8da5f92b914e5e6 upstream.
Certain HP keyboards would keep inputting a character automatically which is the wake-up key after S3 resume
On some AMD platforms USB host fails to respond (by holding resume-K) to USB device (an HP keyboard) resume request within 1ms (TURSM) and ensures that resume is signaled for at least 20 ms (TDRSMDN), which is defined in USB 2.0 spec. The result is that the keyboard is out of function.
In SNPS USB design, the host responds to the resume request only after system gets back to S0 and the host gets to functional after the internal HW restore operation that is more than 1 second after the initial resume request from the USB device.
As a workaround for specific keyboard ID(HP Keyboards), applying port reset after resume when the keyboard is plugged in.
--- drivers/usb/core/quirks.c | 1 + drivers/usb/host/pci-quirks.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-)
drivers/usb/core/quirks.c +1 -0
@@ -252,6 +252,7 @@ static const struct usb_device_id usb_am { USB_DEVICE(0x093a, 0x2500), .driver_info = USB_QUIRK_RESET_RESUME }, { USB_DEVICE(0x093a, 0x2510), .driver_info = USB_QUIRK_RESET_RESUME }, { USB_DEVICE(0x093a, 0x2521), .driver_info = USB_QUIRK_RESET_RESUME }, + { USB_DEVICE(0x03f0, 0x2b4a), .driver_info = USB_QUIRK_RESET_RESUME }, /* Logitech Optical Mouse M90/M100 */ { USB_DEVICE(0x046d, 0xc05a), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/host/pci-quirks.c +12 -5
@@ -98,6 +98,7 @@ enum amd_chipset_gen {AMD_CHIPSET_HUDSON2 ,AMD_CHIPSET_BOLTON ,AMD_CHIPSET_YANGTZE , +AMD_CHIPSET_TAISHAN , AMD_CHIPSET_UNKNOWN, };
@@ -141,6 +142,11 @@ static int amd_chipset_sb_type_init(stru pinfo->sb_type.gen =AMD_CHIPSET_SB700 ; else if (rev >= 0x40 && rev <= 0x4f) pinfo->sb_type.gen =AMD_CHIPSET_SB800 ; + } + pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD , +0x145c ,NULL ); +if (pinfo->smbus_dev) { + pinfo->sb_type.gen =AMD_CHIPSET_TAISHAN ; }else { pinfo->smbus_dev =pci_get_device (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_HUDSON2_SMBUS ,NULL );
@@ -260,11 +266,12 @@ int usb_hcd_amd_remote_wakeup_quirk(stru {/* Make sure amd chipset type has already been initialized */ usb_amd_find_chipset_info (); -if (amd_chipset.sb_type.gen !=AMD_CHIPSET_YANGTZE ) -return 0 ; - -dev_dbg (&pdev->dev,"QUIRK: Enable AMD remote wakeup fix\n" ); -return 1 ; +if (amd_chipset.sb_type.gen ==AMD_CHIPSET_YANGTZE || + amd_chipset.sb_type.gen ==AMD_CHIPSET_TAISHAN ) { +dev_dbg (&pdev->dev,"QUIRK: Enable AMD remote wakeup fix\n" ); +return 1 ; + } +return 0 ; }EXPORT_SYMBOL_GPL (usb_hcd_amd_remote_wakeup_quirk);
Greg Kroah-Hartman
maintainerPATCH 33/41 iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan-Gabriel Mirea <[email protected]>
commit d466d3c1217406b14b834335b5b4b33c0d45bd09 upstream.
In order to select the alternate voltage reference pair (VALTH/VALTL), the right value for the REFSEL field in the ADCx_CFG register is "01", leading to 0x800 as register mask. See section 8.2.6.4 in the reference manual[1].
[1] http://www.nxp.com/docs/en/reference-manual/VFXXXRM.pdf
--- drivers/iio/adc/vf610_adc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/vf610_adc.c +1 -1
@@ -77,7 +77,7 @@#define VF610_ADC_ADSTS_MASK 0x300#define VF610_ADC_ADLPC_EN 0x80#define VF610_ADC_ADHSC_EN 0x400 -#define VF610_ADC_REFSEL_VALT 0x100 +#define VF610_ADC_REFSEL_VALT 0x800#define VF610_ADC_REFSEL_VBG 0x1000#define VF610_ADC_ADTRG_HARD 0x2000#define VF610_ADC_AVGS_8 0x4000
Greg Kroah-Hartman
maintainerPATCH 34/41 pnfs/blocklayout: require 64-bit sector_t
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
commit 8a9d6e964d318533ba3d2901ce153ba317c99a89 upstream.
The blocklayout code does not compile cleanly for a 32-bit sector_t, and also has no reliable checks for devices sizes, which makes it unsafe to use with a kernel that doesn't support large block devices.
--- fs/nfs/Kconfig | 1 + 1 file changed, 1 insertion(+)
fs/nfs/Kconfig +1 -0
@@ -121,6 +121,7 @@ config PNFS_FILE_LAYOUT config PNFS_BLOCK tristate depends on NFS_V4_1 && BLK_DEV_DM + depends on 64BIT || LBDAF default NFS_V4 config PNFS_OBJLAYOUT
Greg Kroah-Hartman
maintainerPATCH 35/41 pinctrl: sunxi: add a missing function of A10/A20 pinctrl driver
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Icenowy Zheng <[email protected]>
commit d81ece747d8727bb8b1cfc9a20dbe62f09a4e35a upstream.
The PH16 pin has a function with mux id 0x5, which is the DET pin of the "sim" (smart card reader) IP block.
This function is missing in old versions of A10/A20 SoCs' datasheets and user manuals, so it's also missing in the old drivers. The newest A10 Datasheet V1.70 and A20 Datasheet V1.41 contain this pin function, and it's discovered during implementing R40 pinctrl driver.
Add it to the driver. As we now merged A20 pinctrl driver to the A10 one, we need to only fix the A10 driver now.
driver to a driver of its own")
--- drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c +1 -0
@@ -811,6 +811,7 @@ static const struct sunxi_desc_pin sun4i SUNXI_FUNCTION(0x2, "lcd1"), /* D16 */ SUNXI_FUNCTION(0x3, "pata"), /* ATAD12 */ SUNXI_FUNCTION(0x4, "keypad"), /* IN6 */ + SUNXI_FUNCTION(0x5, "sim"), /* DET */ SUNXI_FUNCTION_IRQ(0x6, 16), /* EINT16 */ SUNXI_FUNCTION(0x7, "csi1")), /* D16 */ SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 17),
Greg Kroah-Hartman
maintainerPATCH 36/41 pinctrl: intel: merrifield: Correct UART pin lists
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Shevchenko <[email protected]>
commit 5d996132d921c391af5f267123eca1a6a3148ecd upstream.
UART pin lists consist GPIO numbers which is simply wrong. Replace it by pin numbers.
--- drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/intel/pinctrl-merrifield.c +3 -3
@@ -343,9 +343,9 @@ static const struct pinctrl_pin_desc mrfstatic const unsigned int mrfld_sdio_pins[] = {50 ,51 ,52 ,53 ,54 ,55 ,56 };static const unsigned int mrfld_spi5_pins[] = {90 ,91 ,92 ,93 ,94 ,95 ,96 }; -static const unsigned int mrfld_uart0_pins[] = {124 ,125 ,126 ,127 }; -static const unsigned int mrfld_uart1_pins[] = {128 ,129 ,130 ,131 }; -static const unsigned int mrfld_uart2_pins[] = {132 ,133 ,134 ,135 }; +static const unsigned int mrfld_uart0_pins[] = {115 ,116 ,117 ,118 }; +static const unsigned int mrfld_uart1_pins[] = {119 ,120 ,121 ,122 }; +static const unsigned int mrfld_uart2_pins[] = {123 ,124 ,125 ,126 };static const unsigned int mrfld_pwm0_pins[] = {144 };static const unsigned int mrfld_pwm1_pins[] = {145 };static const unsigned int mrfld_pwm2_pins[] = {132 };
Greg Kroah-Hartman
maintainerPATCH 37/41 pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD11
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit 9592bc256d50481dfcdba93890e576a728fb373c upstream.
The pingroups dump of debugfs hits WARN_ON() in pinctrl_groups_show(). Filling non-existing ports with '-1' turned out a bad idea.
--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 364 ++++++++++++----------- 1 file changed, 192 insertions(+), 172 deletions(-)
drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c +192 -172
@@ -508,57 +508,71 @@ static const unsigned usb1_pins[] = {48,static const int usb1_muxvals[] = {0 ,0 };static const unsigned usb2_pins[] = {50 ,51 };static const int usb2_muxvals[] = {0 ,0 }; -static const unsigned port_range_pins[] = { +static const unsigned port_range0_pins[] = {159 ,160 ,161 ,162 ,163 ,164 ,165 ,166 ,/* PORT0x */ 0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,/* PORT1x */ 8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,/* PORT2x */ -16 ,17 ,18 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT3x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT4x */ --1 ,-1 ,-1 ,46 ,47 ,48 ,49 ,50 ,/* PORT5x */ -51 ,-1 ,-1 ,54 ,55 ,56 ,57 ,58 ,/* PORT6x */ +16 ,17 ,18 ,/* PORT30-32 */ +}; +static const int port_range0_muxvals[] = { +15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT0x */ +15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT1x */ +15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT2x */ +15 ,15 ,15 ,/* PORT30-32 */ +}; +static const unsigned port_range1_pins[] = { +46 ,47 ,48 ,49 ,50 ,/* PORT53-57 */ +51 ,/* PORT60 */ +}; +static const int port_range1_muxvals[] = { +15 ,15 ,15 ,15 ,15 ,/* PORT53-57 */ +15 ,/* PORT60 */ +}; +static const unsigned port_range2_pins[] = { +54 ,55 ,56 ,57 ,58 ,/* PORT63-67 */ 59 ,60 ,69 ,70 ,71 ,72 ,73 ,74 ,/* PORT7x */ 75 ,76 ,77 ,78 ,79 ,80 ,81 ,82 ,/* PORT8x */ 83 ,84 ,85 ,86 ,87 ,88 ,89 ,90 ,/* PORT9x */ 91 ,92 ,93 ,94 ,95 ,96 ,97 ,98 ,/* PORT10x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT11x */ -99 ,100 ,101 ,102 ,103 ,104 ,105 ,106 ,/* PORT12x */ -107 ,108 ,109 ,110 ,111 ,112 ,113 ,114 ,/* PORT13x */ -115 ,116 ,117 ,118 ,119 ,120 ,121 ,122 ,/* PORT14x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT15x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT16x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT17x */ -61 ,62 ,63 ,64 ,65 ,66 ,67 ,68 ,/* PORT18x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT19x */ -123 ,124 ,125 ,126 ,127 ,128 ,129 ,130 ,/* PORT20x */ -131 ,132 ,133 ,134 ,135 ,136 ,137 ,138 ,/* PORT21x */ -139 ,140 ,141 ,142 ,-1 ,-1 ,-1 ,-1 ,/* PORT22x */ -147 ,148 ,149 ,150 ,151 ,152 ,153 ,154 ,/* PORT23x */ -155 ,156 ,157 ,143 ,144 ,145 ,146 ,158 ,/* PORT24x */ }; -static const int port_range_muxvals[] = { -15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT0x */ -15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT1x */ -15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT2x */ -15 ,15 ,15 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT3x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT4x */ --1 ,-1 ,-1 ,15 ,15 ,15 ,15 ,15 ,/* PORT5x */ -15 ,-1 ,-1 ,15 ,15 ,15 ,15 ,15 ,/* PORT6x */ +static const int port_range2_muxvals[] = { +15 ,15 ,15 ,15 ,15 ,/* PORT63-67 */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT7x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT8x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT9x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT10x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT11x */ +}; +static const unsigned port_range3_pins[] = { +99 ,100 ,101 ,102 ,103 ,104 ,105 ,106 ,/* PORT12x */ +107 ,108 ,109 ,110 ,111 ,112 ,113 ,114 ,/* PORT13x */ +115 ,116 ,117 ,118 ,119 ,120 ,121 ,122 ,/* PORT14x */ +}; +static const int port_range3_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT12x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT13x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT14x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT15x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT16x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT17x */ +}; +static const unsigned port_range4_pins[] = { +61 ,62 ,63 ,64 ,65 ,66 ,67 ,68 ,/* PORT18x */ +}; +static const int port_range4_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT18x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT19x */ +}; +static const unsigned port_range5_pins[] = { +123 ,124 ,125 ,126 ,127 ,128 ,129 ,130 ,/* PORT20x */ +131 ,132 ,133 ,134 ,135 ,136 ,137 ,138 ,/* PORT21x */ +139 ,140 ,141 ,142 ,/* PORT220-223 */ +}; +static const int port_range5_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT20x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT21x */ -15 ,15 ,15 ,15 ,-1 ,-1 ,-1 ,-1 ,/* PORT22x */ +15 ,15 ,15 ,15 ,/* PORT220-223 */ +}; +static const unsigned port_range6_pins[] = { +147 ,148 ,149 ,150 ,151 ,152 ,153 ,154 ,/* PORT23x */ +155 ,156 ,157 ,143 ,144 ,145 ,146 ,158 ,/* PORT24x */ +}; +static const int port_range6_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT23x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT24x */ };
@@ -607,147 +621,153 @@ static const struct uniphier_pinctrl_groUNIPHIER_PINCTRL_GROUP (usb0),UNIPHIER_PINCTRL_GROUP (usb1),UNIPHIER_PINCTRL_GROUP (usb2), -UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range0), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range1), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range2), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range3), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range4), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range5), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range6),UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_IRQ (xirq),UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_IRQ (xirq_alternatives), -UNIPHIER_PINCTRL_GROUP_SINGLE (port00, port_range,0 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port01, port_range,1 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port02, port_range,2 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port03, port_range,3 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port04, port_range,4 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port05, port_range,5 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port06, port_range,6 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port07, port_range,7 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port10, port_range,8 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port11, port_range,9 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port12, port_range,10 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port13, port_range,11 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port14, port_range,12 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port15, port_range,13 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port16, port_range,14 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port17, port_range,15 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port20, port_range,16 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port21, port_range,17 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port22, port_range,18 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port23, port_range,19 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port24, port_range,20 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port25, port_range,21 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port26, port_range,22 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port27, port_range,23 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port30, port_range,24 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port31, port_range,25 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port32, port_range,26 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port53, port_range,43 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port54, port_range,44 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port55, port_range,45 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port56, port_range,46 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port57, port_range,47 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port60, port_range,48 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port63, port_range,51 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port64, port_range,52 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port65, port_range,53 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port66, port_range,54 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port67, port_range,55 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port70, port_range,56 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port71, port_range,57 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port72, port_range,58 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port73, port_range,59 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port74, port_range,60 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port75, port_range,61 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port76, port_range,62 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port77, port_range,63 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port80, port_range,64 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port81, port_range,65 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port82, port_range,66 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port83, port_range,67 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port84, port_range,68 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port85, port_range,69 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port86, port_range,70 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port87, port_range,71 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port90, port_range,72 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port91, port_range,73 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port92, port_range,74 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port93, port_range,75 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port94, port_range,76 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port95, port_range,77 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port96, port_range,78 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port97, port_range,79 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port100, port_range,80 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port101, port_range,81 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port102, port_range,82 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port103, port_range,83 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port104, port_range,84 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port105, port_range,85 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port106, port_range,86 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port107, port_range,87 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port120, port_range,96 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port121, port_range,97 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port122, port_range,98 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port123, port_range,99 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port124, port_range,100 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port125, port_range,101 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port126, port_range,102 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port127, port_range,103 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port130, port_range,104 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port131, port_range,105 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port132, port_range,106 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port133, port_range,107 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port134, port_range,108 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port135, port_range,109 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port136, port_range,110 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port137, port_range,111 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port140, port_range,112 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port141, port_range,113 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port142, port_range,114 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port143, port_range,115 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port144, port_range,116 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port145, port_range,117 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port146, port_range,118 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port147, port_range,119 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port180, port_range,144 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port181, port_range,145 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port182, port_range,146 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port183, port_range,147 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port184, port_range,148 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port185, port_range,149 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port186, port_range,150 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port187, port_range,151 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port200, port_range,160 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port201, port_range,161 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port202, port_range,162 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port203, port_range,163 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port204, port_range,164 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port205, port_range,165 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port206, port_range,166 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port207, port_range,167 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port210, port_range,168 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port211, port_range,169 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port212, port_range,170 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port213, port_range,171 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port214, port_range,172 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port215, port_range,173 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port216, port_range,174 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port217, port_range,175 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port220, port_range,176 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port221, port_range,177 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port222, port_range,178 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port223, port_range,179 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port230, port_range,184 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port231, port_range,185 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port232, port_range,186 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port233, port_range,187 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port234, port_range,188 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port235, port_range,189 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port236, port_range,190 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port237, port_range,191 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port240, port_range,192 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port241, port_range,193 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port242, port_range,194 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port243, port_range,195 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port244, port_range,196 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port245, port_range,197 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port246, port_range,198 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port247, port_range,199 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port00, port_range0,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port01, port_range0,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port02, port_range0,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port03, port_range0,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port04, port_range0,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port05, port_range0,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port06, port_range0,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port07, port_range0,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port10, port_range0,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port11, port_range0,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port12, port_range0,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port13, port_range0,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port14, port_range0,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port15, port_range0,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port16, port_range0,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port17, port_range0,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port20, port_range0,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port21, port_range0,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port22, port_range0,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port23, port_range0,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port24, port_range0,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port25, port_range0,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port26, port_range0,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port27, port_range0,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port30, port_range0,24 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port31, port_range0,25 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port32, port_range0,26 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port53, port_range1,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port54, port_range1,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port55, port_range1,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port56, port_range1,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port57, port_range1,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port60, port_range1,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port63, port_range2,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port64, port_range2,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port65, port_range2,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port66, port_range2,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port67, port_range2,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port70, port_range2,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port71, port_range2,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port72, port_range2,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port73, port_range2,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port74, port_range2,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port75, port_range2,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port76, port_range2,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port77, port_range2,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port80, port_range2,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port81, port_range2,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port82, port_range2,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port83, port_range2,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port84, port_range2,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port85, port_range2,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port86, port_range2,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port87, port_range2,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port90, port_range2,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port91, port_range2,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port92, port_range2,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port93, port_range2,24 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port94, port_range2,25 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port95, port_range2,26 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port96, port_range2,27 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port97, port_range2,28 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port100, port_range2,29 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port101, port_range2,30 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port102, port_range2,31 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port103, port_range2,32 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port104, port_range2,33 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port105, port_range2,34 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port106, port_range2,35 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port107, port_range2,36 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port120, port_range3,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port121, port_range3,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port122, port_range3,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port123, port_range3,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port124, port_range3,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port125, port_range3,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port126, port_range3,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port127, port_range3,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port130, port_range3,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port131, port_range3,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port132, port_range3,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port133, port_range3,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port134, port_range3,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port135, port_range3,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port136, port_range3,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port137, port_range3,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port140, port_range3,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port141, port_range3,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port142, port_range3,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port143, port_range3,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port144, port_range3,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port145, port_range3,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port146, port_range3,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port147, port_range3,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port180, port_range4,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port181, port_range4,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port182, port_range4,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port183, port_range4,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port184, port_range4,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port185, port_range4,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port186, port_range4,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port187, port_range4,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port200, port_range5,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port201, port_range5,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port202, port_range5,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port203, port_range5,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port204, port_range5,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port205, port_range5,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port206, port_range5,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port207, port_range5,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port210, port_range5,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port211, port_range5,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port212, port_range5,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port213, port_range5,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port214, port_range5,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port215, port_range5,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port216, port_range5,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port217, port_range5,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port220, port_range5,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port221, port_range5,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port222, port_range5,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port223, port_range5,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port230, port_range6,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port231, port_range6,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port232, port_range6,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port233, port_range6,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port234, port_range6,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port235, port_range6,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port236, port_range6,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port237, port_range6,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port240, port_range6,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port241, port_range6,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port242, port_range6,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port243, port_range6,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port244, port_range6,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port245, port_range6,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port246, port_range6,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port247, port_range6,15 ),UNIPHIER_PINCTRL_GROUP_SINGLE (xirq0, xirq,0 ),UNIPHIER_PINCTRL_GROUP_SINGLE (xirq1, xirq,1 ), UNIPHIER_PINCTRL_GROUP_SINGLE(xirq2, xirq, 2),
Greg Kroah-Hartman
maintainerPATCH 38/41 pinctrl: uniphier: fix WARN_ON() of pingroups dump on LD20
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masahiro Yamada <[email protected]>
commit 1bd303dc04c3f744474e77c153575087b657f7e1 upstream.
The pingroups dump of debugfs hits WARN_ON() in pinctrl_groups_show(). Filling non-existing ports with '-1' turned out a bad idea.
--- drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 383 +++++++++++------------ 1 file changed, 194 insertions(+), 189 deletions(-)
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +194 -189
@@ -597,7 +597,7 @@ static const unsigned usb2_pins[] = {50,static const int usb2_muxvals[] = {0 ,0 };static const unsigned usb3_pins[] = {52 ,53 };static const int usb3_muxvals[] = {0 ,0 }; -static const unsigned port_range_pins[] = { +static const unsigned port_range0_pins[] = {168 ,169 ,170 ,171 ,172 ,173 ,174 ,175 ,/* PORT0x */ 0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,/* PORT1x */ 8 ,9 ,10 ,11 ,12 ,13 ,14 ,15 ,/* PORT2x */
@@ -609,23 +609,8 @@ static const unsigned port_range_pins[]75 ,76 ,77 ,78 ,79 ,80 ,81 ,82 ,/* PORT8x */ 83 ,84 ,85 ,86 ,87 ,88 ,89 ,90 ,/* PORT9x */ 91, 92, 93, 94, 95, 96, 97, 98, /* PORT10x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT11x */ -99 ,100 ,101 ,102 ,103 ,104 ,105 ,106 ,/* PORT12x */ -107 ,108 ,109 ,110 ,111 ,112 ,113 ,114 ,/* PORT13x */ -115 ,116 ,117 ,118 ,119 ,120 ,121 ,122 ,/* PORT14x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT15x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT16x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT17x */ -61 ,62 ,63 ,64 ,65 ,66 ,67 ,68 ,/* PORT18x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT19x */ -123 ,124 ,125 ,126 ,127 ,128 ,129 ,130 ,/* PORT20x */ -131 ,132 ,133 ,134 ,135 ,136 ,137 ,138 ,/* PORT21x */ -139 ,140 ,141 ,142 ,143 ,144 ,145 ,146 ,/* PORT22x */ -147 ,148 ,149 ,150 ,151 ,152 ,153 ,154 ,/* PORT23x */ -155 ,156 ,157 ,158 ,159 ,160 ,161 ,162 ,/* PORT24x */ - 163, 164, 165, 166, 167, /* PORT25x */ }; -static const int port_range_muxvals[] = { +static const int port_range0_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT0x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT1x */ 15, 15, 15, 15, 15, 15, 15, 15, /* PORT2x */
@@ -637,21 +622,38 @@ static const int port_range_muxvals[] =15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT8x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT9x */ 15, 15, 15, 15, 15, 15, 15, 15, /* PORT10x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT11x */ +}; +static const unsigned port_range1_pins[] = { +99 ,100 ,101 ,102 ,103 ,104 ,105 ,106 ,/* PORT12x */ +107 ,108 ,109 ,110 ,111 ,112 ,113 ,114 ,/* PORT13x */ +115 ,116 ,117 ,118 ,119 ,120 ,121 ,122 ,/* PORT14x */ +}; +static const int port_range1_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT12x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT13x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT14x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT15x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT16x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT17x */ +}; +static const unsigned port_range2_pins[] = { +61 ,62 ,63 ,64 ,65 ,66 ,67 ,68 ,/* PORT18x */ +}; +static const int port_range2_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT18x */ --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,/* PORT19x */ +}; +static const unsigned port_range3_pins[] = { +123 ,124 ,125 ,126 ,127 ,128 ,129 ,130 ,/* PORT20x */ +131 ,132 ,133 ,134 ,135 ,136 ,137 ,138 ,/* PORT21x */ +139 ,140 ,141 ,142 ,143 ,144 ,145 ,146 ,/* PORT22x */ +147 ,148 ,149 ,150 ,151 ,152 ,153 ,154 ,/* PORT23x */ +155 ,156 ,157 ,158 ,159 ,160 ,161 ,162 ,/* PORT24x */ +163 ,164 ,165 ,166 ,167 ,/* PORT250-254 */ +}; +static const int port_range3_muxvals[] = {15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT20x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT21x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT22x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT23x */ 15 ,15 ,15 ,15 ,15 ,15 ,15 ,15 ,/* PORT24x */ - 15, 15, 15, 15, 15, /* PORT25x */ +15 ,15 ,15 ,15 ,15 ,/* PORT250-254 */ };static const unsigned xirq_pins[] = { 149, 150, 151, 152, 153, 154, 155, 156, /* XIRQ0-7 */
@@ -695,174 +697,177 @@ static const struct uniphier_pinctrl_groUNIPHIER_PINCTRL_GROUP (usb1),UNIPHIER_PINCTRL_GROUP (usb2),UNIPHIER_PINCTRL_GROUP (usb3), -UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range0), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range1), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range2), +UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_PORT (port_range3),UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_IRQ (xirq),UNIPHIER_PINCTRL_GROUP_GPIO_RANGE_IRQ (xirq_alternatives), -UNIPHIER_PINCTRL_GROUP_SINGLE (port00, port_range,0 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port01, port_range,1 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port02, port_range,2 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port03, port_range,3 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port04, port_range,4 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port05, port_range,5 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port06, port_range,6 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port07, port_range,7 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port10, port_range,8 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port11, port_range,9 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port12, port_range,10 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port13, port_range,11 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port14, port_range,12 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port15, port_range,13 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port16, port_range,14 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port17, port_range,15 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port20, port_range,16 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port21, port_range,17 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port22, port_range,18 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port23, port_range,19 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port24, port_range,20 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port25, port_range,21 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port26, port_range,22 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port27, port_range,23 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port30, port_range,24 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port31, port_range,25 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port32, port_range,26 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port33, port_range,27 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port34, port_range,28 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port35, port_range,29 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port36, port_range,30 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port37, port_range,31 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port40, port_range,32 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port41, port_range,33 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port42, port_range,34 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port43, port_range,35 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port44, port_range,36 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port45, port_range,37 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port46, port_range,38 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port47, port_range,39 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port50, port_range,40 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port51, port_range,41 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port52, port_range,42 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port53, port_range,43 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port54, port_range,44 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port55, port_range,45 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port56, port_range,46 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port57, port_range,47 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port60, port_range,48 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port61, port_range,49 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port62, port_range,50 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port63, port_range,51 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port64, port_range,52 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port65, port_range,53 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port66, port_range,54 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port67, port_range,55 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port70, port_range,56 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port71, port_range,57 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port72, port_range,58 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port73, port_range,59 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port74, port_range,60 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port75, port_range,61 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port76, port_range,62 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port77, port_range,63 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port80, port_range,64 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port81, port_range,65 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port82, port_range,66 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port83, port_range,67 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port84, port_range,68 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port85, port_range,69 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port86, port_range,70 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port87, port_range,71 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port90, port_range,72 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port91, port_range,73 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port92, port_range,74 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port93, port_range,75 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port94, port_range,76 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port95, port_range,77 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port96, port_range,78 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port97, port_range,79 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port100, port_range,80 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port101, port_range,81 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port102, port_range,82 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port103, port_range,83 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port104, port_range,84 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port105, port_range,85 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port106, port_range,86 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port107, port_range,87 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port120, port_range,96 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port121, port_range,97 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port122, port_range,98 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port123, port_range,99 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port124, port_range,100 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port125, port_range,101 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port126, port_range,102 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port127, port_range,103 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port130, port_range,104 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port131, port_range,105 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port132, port_range,106 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port133, port_range,107 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port134, port_range,108 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port135, port_range,109 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port136, port_range,110 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port137, port_range,111 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port140, port_range,112 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port141, port_range,113 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port142, port_range,114 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port143, port_range,115 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port144, port_range,116 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port145, port_range,117 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port146, port_range,118 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port147, port_range,119 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port180, port_range,144 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port181, port_range,145 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port182, port_range,146 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port183, port_range,147 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port184, port_range,148 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port185, port_range,149 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port186, port_range,150 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port187, port_range,151 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port200, port_range,160 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port201, port_range,161 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port202, port_range,162 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port203, port_range,163 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port204, port_range,164 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port205, port_range,165 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port206, port_range,166 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port207, port_range,167 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port210, port_range,168 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port211, port_range,169 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port212, port_range,170 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port213, port_range,171 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port214, port_range,172 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port215, port_range,173 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port216, port_range,174 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port217, port_range,175 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port220, port_range,176 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port221, port_range,177 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port222, port_range,178 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port223, port_range,179 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port224, port_range,180 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port225, port_range,181 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port226, port_range,182 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port227, port_range,183 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port230, port_range,184 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port231, port_range,185 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port232, port_range,186 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port233, port_range,187 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port234, port_range,188 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port235, port_range,189 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port236, port_range,190 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port237, port_range,191 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port240, port_range,192 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port241, port_range,193 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port242, port_range,194 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port243, port_range,195 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port244, port_range,196 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port245, port_range,197 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port246, port_range,198 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port247, port_range,199 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port250, port_range,200 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port251, port_range,201 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port252, port_range,202 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port253, port_range,203 ), -UNIPHIER_PINCTRL_GROUP_SINGLE (port254, port_range,204 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port00, port_range0,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port01, port_range0,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port02, port_range0,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port03, port_range0,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port04, port_range0,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port05, port_range0,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port06, port_range0,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port07, port_range0,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port10, port_range0,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port11, port_range0,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port12, port_range0,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port13, port_range0,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port14, port_range0,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port15, port_range0,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port16, port_range0,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port17, port_range0,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port20, port_range0,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port21, port_range0,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port22, port_range0,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port23, port_range0,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port24, port_range0,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port25, port_range0,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port26, port_range0,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port27, port_range0,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port30, port_range0,24 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port31, port_range0,25 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port32, port_range0,26 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port33, port_range0,27 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port34, port_range0,28 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port35, port_range0,29 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port36, port_range0,30 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port37, port_range0,31 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port40, port_range0,32 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port41, port_range0,33 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port42, port_range0,34 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port43, port_range0,35 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port44, port_range0,36 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port45, port_range0,37 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port46, port_range0,38 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port47, port_range0,39 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port50, port_range0,40 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port51, port_range0,41 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port52, port_range0,42 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port53, port_range0,43 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port54, port_range0,44 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port55, port_range0,45 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port56, port_range0,46 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port57, port_range0,47 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port60, port_range0,48 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port61, port_range0,49 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port62, port_range0,50 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port63, port_range0,51 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port64, port_range0,52 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port65, port_range0,53 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port66, port_range0,54 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port67, port_range0,55 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port70, port_range0,56 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port71, port_range0,57 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port72, port_range0,58 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port73, port_range0,59 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port74, port_range0,60 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port75, port_range0,61 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port76, port_range0,62 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port77, port_range0,63 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port80, port_range0,64 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port81, port_range0,65 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port82, port_range0,66 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port83, port_range0,67 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port84, port_range0,68 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port85, port_range0,69 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port86, port_range0,70 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port87, port_range0,71 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port90, port_range0,72 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port91, port_range0,73 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port92, port_range0,74 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port93, port_range0,75 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port94, port_range0,76 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port95, port_range0,77 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port96, port_range0,78 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port97, port_range0,79 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port100, port_range0,80 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port101, port_range0,81 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port102, port_range0,82 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port103, port_range0,83 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port104, port_range0,84 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port105, port_range0,85 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port106, port_range0,86 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port107, port_range0,87 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port120, port_range1,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port121, port_range1,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port122, port_range1,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port123, port_range1,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port124, port_range1,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port125, port_range1,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port126, port_range1,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port127, port_range1,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port130, port_range1,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port131, port_range1,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port132, port_range1,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port133, port_range1,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port134, port_range1,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port135, port_range1,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port136, port_range1,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port137, port_range1,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port140, port_range1,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port141, port_range1,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port142, port_range1,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port143, port_range1,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port144, port_range1,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port145, port_range1,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port146, port_range1,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port147, port_range1,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port180, port_range2,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port181, port_range2,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port182, port_range2,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port183, port_range2,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port184, port_range2,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port185, port_range2,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port186, port_range2,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port187, port_range2,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port200, port_range3,0 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port201, port_range3,1 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port202, port_range3,2 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port203, port_range3,3 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port204, port_range3,4 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port205, port_range3,5 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port206, port_range3,6 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port207, port_range3,7 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port210, port_range3,8 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port211, port_range3,9 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port212, port_range3,10 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port213, port_range3,11 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port214, port_range3,12 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port215, port_range3,13 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port216, port_range3,14 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port217, port_range3,15 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port220, port_range3,16 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port221, port_range3,17 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port222, port_range3,18 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port223, port_range3,19 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port224, port_range3,20 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port225, port_range3,21 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port226, port_range3,22 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port227, port_range3,23 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port230, port_range3,24 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port231, port_range3,25 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port232, port_range3,26 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port233, port_range3,27 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port234, port_range3,28 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port235, port_range3,29 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port236, port_range3,30 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port237, port_range3,31 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port240, port_range3,32 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port241, port_range3,33 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port242, port_range3,34 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port243, port_range3,35 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port244, port_range3,36 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port245, port_range3,37 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port246, port_range3,38 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port247, port_range3,39 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port250, port_range3,40 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port251, port_range3,41 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port252, port_range3,42 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port253, port_range3,43 ), +UNIPHIER_PINCTRL_GROUP_SINGLE (port254, port_range3,44 ),UNIPHIER_PINCTRL_GROUP_SINGLE (xirq0, xirq,0 ),UNIPHIER_PINCTRL_GROUP_SINGLE (xirq1, xirq,1 ), UNIPHIER_PINCTRL_GROUP_SINGLE(xirq2, xirq, 2),
Greg Kroah-Hartman
maintainerPATCH 39/41 pinctrl: samsung: Remove bogus irq_[un]mask from resource management
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 3fa53ec2ed885b0aec3f0472e3b4a8a6f1cd748c upstream.
The irq chip callbacks irq_request/release_resources() have absolutely no business with masking and unmasking the irq.
The core code unmasks the interrupt after complete setup and masks it before invoking irq_release_resources().
The unmask is actually harmful as it happens before the interrupt is completely initialized in __setup_irq().
Remove it.
--- drivers/pinctrl/samsung/pinctrl-exynos.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos.c +0 -4
@@ -195,8 +195,6 @@ static int exynos_irq_request_resources(spin_unlock_irqrestore (&bank->slock, flags); -exynos_irq_unmask (irqd); -return 0 ; }
@@ -217,8 +215,6 @@ static void exynos_irq_release_resources shift = irqd->hwirq * bank_type->fld_width[PINCFG_TYPE_FUNC ]; mask = (1 << bank_type->fld_width[PINCFG_TYPE_FUNC ]) -1 ; -exynos_irq_mask (irqd); -spin_lock_irqsave (&bank->slock, flags); con =readl (d->virt_base + reg_con);
Greg Kroah-Hartman
maintainerPATCH 40/41 pinctrl: meson-gxbb: Add missing GPIODV_18 pin entry
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neil Armstrong <[email protected]>
commit 34e61801a3b9df74b69f0e359d64a197a77dd6ac upstream.
GPIODV_18 entry was missing in the original driver push.
--- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/meson/pinctrl-meson-gxbb.c +1 -0
@@ -85,6 +85,7 @@ static const struct pinctrl_pin_desc mesMESON_PIN (GPIODV_15 ,EE_OFF ),MESON_PIN (GPIODV_16 ,EE_OFF ),MESON_PIN (GPIODV_17 ,EE_OFF ), +MESON_PIN (GPIODV_18 ,EE_OFF ),MESON_PIN (GPIODV_19 ,EE_OFF ),MESON_PIN (GPIODV_20 ,EE_OFF ), MESON_PIN(GPIODV_21, EE_OFF),
Greg Kroah-Hartman
maintainerPATCH 41/41 MIPS: DEC: Fix an int-handler.S CPU_DADDI_WORKAROUNDS regression
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
commit 68fe55680d0f3342969f49412fceabb90bdfadba upstream.
Fix a commit 3021773c7c3e ("MIPS: DEC: Avoid la pseudo-instruction in delay slots") regression and remove assembly errors:
arch/mips/dec/int-handler.S: Assembler messages:arch/mips/dec/int-handler.S:162: Error: Macro used $at after ".set noat" arch/mips/dec/int-handler.S:163: Error: Macro used $at after ".set noat" arch/mips/dec/int-handler.S:229: Error: Macro used $at after ".set noat" arch/mips/dec/int-handler.S:230: Error: Macro used $at after ".set noat"
triggering with with the CPU_DADDI_WORKAROUNDS option set and the DADDIU instruction. This is because with that option in place the instruction becomes a macro, which expands to an LI/DADDU (or actually ADDIU/DADDU) sequence that uses $at as a temporary register.
With CPU_DADDI_WORKAROUNDS we only support `-msym32' compilation though, and this is already enforced in arch/mips/Makefile, so choose the 32-bit expansion variant for the supported configurations and then replace the 64-bit variant with #error just in case.
Patchwork: https://patchwork.linux-mips.org/patch/16893/
--- arch/mips/dec/int-handler.S | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-)
arch/mips/dec/int-handler.S +6 -28
@@ -147,23 +147,12 @@ * Find irq with highest priority */ # open coded PTR_LA t1, cpu_mask_nr_tbl -#if (_MIPS_SZPTR == 32) +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) # open coded la t1, cpu_mask_nr_tbl lui t1, %hi(cpu_mask_nr_tbl) addiu t1, %lo(cpu_mask_nr_tbl) - -#endif -#if (_MIPS_SZPTR == 64) - # open coded dla t1, cpu_mask_nr_tbl - .set push - .set noat - lui t1, %highest(cpu_mask_nr_tbl) - lui AT, %hi(cpu_mask_nr_tbl) - daddiu t1, t1, %higher(cpu_mask_nr_tbl) - daddiu AT, AT, %lo(cpu_mask_nr_tbl) - dsll t1, 32 - daddu t1, t1, AT - .set pop +#else +#error GCC `-msym32' option required for 64-bit DECstation builds #endif 1: lw t2,(t1) nop
@@ -214,23 +203,12 @@ * Find irq with highest priority */ # open coded PTR_LA t1,asic_mask_nr_tbl -#if (_MIPS_SZPTR == 32) +#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) # open coded la t1, asic_mask_nr_tbl lui t1, %hi(asic_mask_nr_tbl) addiu t1, %lo(asic_mask_nr_tbl) - -#endif -#if (_MIPS_SZPTR == 64) - # open coded dla t1, asic_mask_nr_tbl - .set push - .set noat - lui t1, %highest(asic_mask_nr_tbl) - lui AT, %hi(asic_mask_nr_tbl) - daddiu t1, t1, %higher(asic_mask_nr_tbl) - daddiu AT, AT, %lo(asic_mask_nr_tbl) - dsll t1, 32 - daddu t1, t1, AT - .set pop +#else +#error GCC `-msym32' option required for 64-bit DECstation builds #endif 2: lw t2,(t1) nop
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.44 release. There are 41 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 Thu Aug 17 01:17:56 UTC 2017. Anything received after that time might be too late.
Build results:
total: 145 pass: 145 fail: 0 Qemu test results: total: 122 pass: 122 fail: 0
Details are available at http://kerneltests.org/builders.
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.44 release. There are 41 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 Thu Aug 17 01:17:56 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.44-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah