sc16is7xx: Fix for "Unexpected interrupt: 8"
Subsystems (18)
Sasha Levin
maintainerPATCH 5/29 scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit ff64dd4857303dd5550faed9fd598ac90f0f2238 ]
git-diff-index does not refresh the index for you, so using it for a "-dirty" check can give misleading results. Commit 6147b1cf19651 ("scripts/setlocalversion: git: Make -dirty check more robust") tried to fix this by switching to git-status, but it overlooked the fact that git-status also writes to the .git directory of the source tree, which is definitely not kosher for an out-of-tree (O=) build. That is getting reverted.
Fortunately, git-status now supports avoiding writing to the index via the --no-optional-locks flag, as of git 2.14. It still calculates an up-to-date index, but it avoids writing it out to the .git directory.
So, let's retry the solution from commit 6147b1cf19651 using this new flag first, and if it fails, we assume this is an older version of git and just use the old git-diff-index method.
It's hairy to get the 'grep -vq' (inverted matching) correct by stashing the output of git-status (you have to be careful about the difference betwen "empty stdin" and "blank line on stdin"), so just pipe the output directly to grep and use a regex that's good enough for both the git-status and git-diff-index version.
--- scripts/setlocalversion | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
scripts/setlocalversion +10 -2
@@ -72,8 +72,16 @@ scm_version() printf -- '-svn%s' "`git svn find-rev $head`" fi - # Check for uncommitted changes - if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then + # Check for uncommitted changes. + # First, with git-status, but --no-optional-locks is only + # supported in git >= 2.14, so fall back to git-diff-index if + # it fails. Note that git-diff-index does not refresh the + # index, so it may give misleading results. See + # git-update-index(1), git-diff-index(1), and git-status(1). + if { + git --no-optional-locks status -uno --porcelain 2>/dev/null || + git diff-index --name-only HEAD + } | grep -qvE '^(.. )?scripts/package'; then printf '%s' -dirty fi
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/29 exec: load_script: Do not exec truncated interpreter path
In reply to Sasha LevinFrom: Kees Cook <[email protected]>
[ Upstream commit b5372fe5dc84235dbe04998efdede3c4daa866a9 ]
Commit 8099b047ecc4 ("exec: load_script: don't blindly truncate shebang string") was trying to protect against a confused exec of a truncated interpreter path. However, it was overeager and also refused to truncate arguments as well, which broke userspace, and it was reverted. This attempts the protection again, but allows arguments to remain truncated. In an effort to improve readability, helper functions and comments have been added.
--- fs/binfmt_script.c | 57 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 9 deletions(-)
fs/binfmt_script.c +48 -9
@@ -14,14 +14,31 @@#include <linux/err.h> #include <linux/fs.h> +static inline bool spacetab (char c) {return c ==' ' || c =='\t' ; } +static inline char *next_non_spacetab (char *first,const char *last) +{ +for (; first <= last; first++) +if (!spacetab (*first)) +return first; +return NULL ; +} +static inline char *next_terminator (char *first,const char *last) +{ +for (; first <= last; first++) +if (spacetab (*first) || !*first) +return first; +return NULL ; +} +static int load_script (struct linux_binprm *bprm) {const char *i_arg, *i_name; -char *cp; +char *cp, *buf_end;struct file *file;char interp[BINPRM_BUF_SIZE ];int retval; +/* Not ours to exec if we don't start with "#!". */ if ((bprm->buf[0 ] !='#' ) || (bprm->buf[1 ] !='!' ))return -ENOEXEC ;
@@ -34,18 +51,40 @@ static int load_script(struct linux_binprm *bprm)if (bprm->interp_flags &BINPRM_FLAGS_PATH_INACCESSIBLE )return -ENOENT ; -/* -* This section does the #! interpretation. -* Sorta complicated, but hopefully it will work. -TYT -*/ - +/* Release since we are not mapping a binary into memory. */ allow_write_access (bprm->file);fput (bprm->file); bprm->file =NULL ; - bprm->buf[BINPRM_BUF_SIZE -1 ] ='\0' ; -if ((cp =strchr (bprm->buf,'\n' )) ==NULL ) - cp = bprm->buf+BINPRM_BUF_SIZE -1 ; +/* +* This section handles parsing the #! line into separate +* interpreter path and argument strings. We must be careful +* because bprm->buf is not yet guaranteed to be NUL-terminated +* (though the buffer will have trailing NUL padding when the +* file size was smaller than the buffer size). +* +* We do not want to exec a truncated interpreter path, so either +* we find a newline (which indicates nothing is truncated), or +* we find a space/tab/NUL after the interpreter path (which +* itself may be preceded by spaces/tabs). Truncating the +* arguments is fine: the interpreter can re-read the script to +* parse them on its own. +*/ + buf_end = bprm->buf +sizeof (bprm->buf) -1 ; + cp =strnchr (bprm->buf,sizeof (bprm->buf),'\n' ); +if (!cp) { + cp =next_non_spacetab (bprm->buf +2 , buf_end); +if (!cp) +return -ENOEXEC ;/* Entire buf is spaces/tabs */ +/* +* If there is no later space/tab/NUL we must assume the +* interpreter path is truncated. +*/ +if (!next_terminator (cp, buf_end)) +return -ENOEXEC ; + cp = buf_end; + } +/* NUL-terminate the buffer and any trailing spaces/tabs. */ *cp ='\0' ;while (cp > bprm->buf) { cp--;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/29 perf map: Fix overlapped map handling
In reply to Sasha LevinFrom: Steve MacLean <[email protected]>
[ Upstream commit ee212d6ea20887c0ef352be8563ca13dbf965906 ]
Whenever an mmap/mmap2 event occurs, the map tree must be updated to add a new entry. If a new map overlaps a previous map, the overlapped section of the previous map is effectively unmapped, but the non-overlapping sections are still valid.
maps__fixup_overlappings() is responsible for creating any new map entries from the previously overlapped map. It optionally creates a before and an after map.
When creating the after map the existing code failed to adjust the map.pgoff. This meant the new after map would incorrectly calculate the file offset for the ip. This results in incorrect symbol name resolution for any ip in the after region.
Make maps__fixup_overlappings() correctly populate map.pgoff.
Add an assert that new mapping matches old mapping at the beginning of the after map.
Committer-testing:
Validated correct parsing of libcoreclr.so symbols from .NET Core 3.0 preview9 (which didn't strip symbols).
Preparation:
~/dotnet3.0-preview9/dotnet new webapi -o perfSymbol
cd perfSymbol
~/dotnet3.0-preview9/dotnet publish
perf record ~/dotnet3.0-preview9/dotnet \
bin/Debug/netcoreapp3.0/publish/perfSymbol.dll
^CBefore:
perf script --show-mmap-events 2>&1 | grep -e MMAP -e unknown |\
grep libcoreclr.so | head -n 4
dotnet 1907 373352.698780: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615726000(0x768000) @ 0 08:02 5510620 765057155]: \
r-xp .../3.0.0-preview9-19423-09/libcoreclr.so
dotnet 1907 373352.701091: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615974000(0x1000) @ 0x24e000 08:02 5510620 765057155]: \
rwxp .../3.0.0-preview9-19423-09/libcoreclr.so
dotnet 1907 373352.701241: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615c42000(0x1000) @ 0x51c000 08:02 5510620 765057155]: \
rwxp .../3.0.0-preview9-19423-09/libcoreclr.so
dotnet 1907 373352.705249: 250000 cpu-clock: \
7fe6159a1f99 [unknown] \
(.../3.0.0-preview9-19423-09/libcoreclr.so)After:
perf script --show-mmap-events 2>&1 | grep -e MMAP -e unknown |\
grep libcoreclr.so | head -n 4
dotnet 1907 373352.698780: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615726000(0x768000) @ 0 08:02 5510620 765057155]: \
r-xp .../3.0.0-preview9-19423-09/libcoreclr.so
dotnet 1907 373352.701091: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615974000(0x1000) @ 0x24e000 08:02 5510620 765057155]: \
rwxp .../3.0.0-preview9-19423-09/libcoreclr.so
dotnet 1907 373352.701241: PERF_RECORD_MMAP2 1907/1907: \
[0x7fe615c42000(0x1000) @ 0x51c000 08:02 5510620 765057155]: \
rwxp .../3.0.0-preview9-19423-09/libcoreclr.soAll the [unknown] symbols were resolved.
--- tools/perf/util/map.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/util/map.c +3 -0
@@ -1,4 +1,5 @@#include "symbol.h" +#include <assert.h> #include <errno.h> #include <inttypes.h> #include <limits.h>
@@ -716,6 +717,8 @@ static int maps__fixup_overlappings(struct maps *maps, struct map *map, FILE *fp } after->start = map->end; + after->pgoff += map->end - pos->start; +assert (pos->map_ip (pos, map->end) == after->map_ip (after, map->end));__map_groups__insert (pos->groups, after);if (verbose >=2 )map__fprintf (after, fp);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/29 RDMA/iwcm: Fix a lock inversion issue
In reply to Sasha LevinFrom: Bart Van Assche <[email protected]>
[ Upstream commit b66f31efbdad95ec274345721d99d1d835e6de01 ]
This patch fixes the lock inversion complaint:
============================================
WARNING: possible recursive locking detected
5.3.0-rc7-dbg+ #1 Not tainted
--------------------------------------------
kworker/u16:6/171 is trying to acquire lock:00000000035c6e6c (&id_priv->handler_mutex){+.+.}, at: rdma_destroy_id+0x78/0x4a0 [rdma_cm]
but task is already holding lock:00000000bc7c307d (&id_priv->handler_mutex){+.+.}, at: iw_conn_req_handler+0x151/0x680 [rdma_cm]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&id_priv->handler_mutex);
lock(&id_priv->handler_mutex);
*** DEADLOCK ***
May be due to missing lock nesting notation
3 locks held by kworker/u16:6/171:
#0: 00000000e2eaa773 ((wq_completion)iw_cm_wq){+.+.}, at: process_one_work+0x472/0xac0 #1: 000000001efd357b ((work_completion)(&work->work)#3){+.+.}, at: process_one_work+0x476/0xac0 #2: 00000000bc7c307d (&id_priv->handler_mutex){+.+.}, at: iw_conn_req_handler+0x151/0x680 [rdma_cm]
stack backtrace: CPU: 3 PID: 171 Comm: kworker/u16:6 Not tainted 5.3.0-rc7-dbg+ #1 Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011 Workqueue: iw_cm_wq cm_work_handler [iw_cm] Call Trace: dump_stack+0x8a/0xd6 __lock_acquire.cold+0xe1/0x24d lock_acquire+0x106/0x240 __mutex_lock+0x12e/0xcb0 mutex_lock_nested+0x1f/0x30 rdma_destroy_id+0x78/0x4a0 [rdma_cm] iw_conn_req_handler+0x5c9/0x680 [rdma_cm] cm_work_handler+0xe62/0x1100 [iw_cm] process_one_work+0x56d/0xac0 worker_thread+0x7a/0x5d0 kthread+0x1bc/0x210 ret_from_fork+0x24/0x30
This is not a bug as there are actually two lock classes here.
--- drivers/infiniband/core/cma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/cma.c +2 -1
@@ -2119,9 +2119,10 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id, conn_id->cm_id.iw =NULL ;cma_exch (conn_id,RDMA_CM_DESTROYING );mutex_unlock (&conn_id->handler_mutex); +mutex_unlock (&listen_id->handler_mutex);cma_deref_id (conn_id);rdma_destroy_id (&conn_id->id); - goto out; +return ret; }mutex_unlock (&conn_id->handler_mutex);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/29 efi/cper: Fix endianness of PCIe class code
In reply to Sasha LevinFrom: Lukas Wunner <[email protected]>
[ Upstream commit 6fb9367a15d1a126d222d738b2702c7958594a5f ]
The CPER parser assumes that the class code is big endian, but at least on this edk2-derived Intel Purley platform it's little endian:
efi: EFI v2.50 by EDK II BIOS ID:PLYDCRB1.86B.0119.R05.1701181843
DMI: Intel Corporation PURLEY/PURLEY, BIOS PLYDCRB1.86B.0119.R05.1701181843 01/18/2017
{1}[Hardware Error]: device_id: 0000:5d:00.0
{1}[Hardware Error]: slot: 0
{1}[Hardware Error]: secondary_bus: 0x5e
{1}[Hardware Error]: vendor_id: 0x8086, device_id: 0x2030
{1}[Hardware Error]: class_code: 000406
^^^^^^ (should be 060400)--- drivers/firmware/efi/cper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/cper.c +1 -1
@@ -375,7 +375,7 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,printk ("%s""vendor_id: 0x%04x, device_id: 0x%04x\n" , pfx, pcie->device_id.vendor_id, pcie->device_id.device_id); p = pcie->device_id.class_code; -printk ("%s""class_code: %02x%02x%02x\n" , pfx, p[0 ], p[1 ], p[2 ]); +printk ("%s""class_code: %02x%02x%02x\n" , pfx, p[2 ], p[1 ], p[0 ]); }if (pcie->validation_bits &CPER_PCIE_VALID_SERIAL_NUMBER ) printk("%s""serial number: 0x%04x, 0x%04x\n", pfx,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/29 HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override
In reply to Sasha LevinFrom: Julian Sax <[email protected]>
[ Upstream commit 399474e4c1100bca264ed14fa3ad0d68fab484d8 ]
This device uses the SIPODEV SP1064 touchpad, which does not supply descriptors, so it has to be added to the override list.
--- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +8 -0
@@ -330,6 +330,14 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { }, .driver_data = (void *)&sipodev_desc }, + { + .ident = "Direkt-Tek DTLAPY133-1", + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"Direkt-Tek" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "DTLAPY133-1"), + }, + .driver_data = (void *)&sipodev_desc + }, { .ident ="Mediacom Flexbook Edge 11" , .matches = {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/29 efi/x86: Do not clean dummy variable in kexec path
In reply to Sasha LevinFrom: Dave Young <[email protected]>
[ Upstream commit 2ecb7402cfc7f22764e7bbc80790e66eadb20560 ]
kexec reboot fails randomly in UEFI based KVM guest. The firmware just resets while calling efi_delete_dummy_variable(); Unfortunately I don't know how to debug the firmware, it is also possible a potential problem on real hardware as well although nobody reproduced it.
The intention of the efi_delete_dummy_variable is to trigger garbage collection when entering virtual mode. But SetVirtualAddressMap can only run once for each physical reboot, thus kexec_enter_virtual_mode() is not necessarily a good place to clean a dummy object.
Drop the efi_delete_dummy_variable so that kexec reboot can work.
--- arch/x86/platform/efi/efi.c | 3 --- 1 file changed, 3 deletions(-)
arch/x86/platform/efi/efi.c +0 -3
@@ -896,9 +896,6 @@ static void __init kexec_enter_virtual_mode(void)if (efi_enabled (EFI_OLD_MEMMAP ) && (__supported_pte_mask & _PAGE_NX))runtime_code_page_mkexec (); - -/* clean DUMMY object */ -efi_delete_dummy_variable ();#endif }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/29 x86/cpu: Add Atom Tremont (Jacobsville)
In reply to Sasha LevinFrom: Kan Liang <[email protected]>
[ Upstream commit 00ae831dfe4474ef6029558f5eb3ef0332d80043 ]
Add the Atom Tremont model number to the Intel family list.
[ Tony: Also update comment at head of file to say "_X" suffix is
also used for microserver parts. ]
--- arch/x86/include/asm/intel-family.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/include/asm/intel-family.h +2 -1
@@ -5,7 +5,7 @@* "Big Core" Processors (Branded as Core, Xeon, etc...) * * The "_X" parts are generally the EP and EX Xeons, or the -* "Extreme" ones, like Broadwell-E. +* "Extreme" ones, like Broadwell-E, or Atom microserver. * * Things ending in "2" are usually because we have no better * name for them. There's no processor called "SILVERMONT2".
@@ -67,6 +67,7 @@#define INTEL_FAM6_ATOM_GOLDMONT 0x5C/* Apollo Lake */ #define INTEL_FAM6_ATOM_GOLDMONT_X 0x5F/* Denverton */ #define INTEL_FAM6_ATOM_GOLDMONT_PLUS 0x7A/* Gemini Lake */ +#define INTEL_FAM6_ATOM_TREMONT_X 0x86/* Jacobsville */ /* Xeon Phi */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/29 iio: light: opt3001: fix mutex unlock race
In reply to Sasha LevinFrom: David Frey <[email protected]>
[ Upstream commit 82f3015635249a8c8c45bac303fd84905066f04f ]
When an end-of-conversion interrupt is received after performing a single-shot reading of the light sensor, the driver was waking up the result ready queue before checking opt->ok_to_ignore_lock to determine if it should unlock the mutex. The problem occurred in the case where the other thread woke up and changed the value of opt->ok_to_ignore_lock to false prior to the interrupt thread performing its read of the variable. In this case, the mutex would be unlocked twice.
--- drivers/iio/light/opt3001.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iio/light/opt3001.c +5 -1
@@ -695,6 +695,7 @@ static irqreturn_t opt3001_irq(int irq, void *_iio)struct iio_dev *iio = _iio;struct opt3001 *opt =iio_priv (iio);int ret; +bool wake_result_ready_queue = false;if (!opt->ok_to_ignore_lock)mutex_lock (&opt->lock);
@@ -729,13 +730,16 @@ static irqreturn_t opt3001_irq(int irq, void *_iio) } opt->result = ret; opt->result_ready = true; -wake_up (&opt->result_ready_queue); + wake_result_ready_queue = true; } out:if (!opt->ok_to_ignore_lock)mutex_unlock (&opt->lock); +if (wake_result_ready_queue) +wake_up (&opt->result_ready_queue); +return IRQ_HANDLED ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/29 USB: usb-skeleton: fix use-after-free after driver unbind
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 6353001852776e7eeaab4da78922d4c6f2b076af ]
The driver failed to stop its read URB on disconnect, something which could lead to a use-after-free in the completion handler after driver unbind in case the character device has been closed.
--- drivers/usb/usb-skeleton.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/usb-skeleton.c +1 -0
@@ -585,6 +585,7 @@ static void skel_disconnect(struct usb_interface *interface) dev->interface =NULL ;mutex_unlock (&dev->io_mutex); +usb_kill_urb (dev->bulk_in_urb);usb_kill_anchored_urbs (&dev->submitted);/* decrement our usage count */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/29 s390/uaccess: avoid (false positive) compiler warnings
In reply to Sasha LevinFrom: Christian Borntraeger <[email protected]>
[ Upstream commit 062795fcdcb2d22822fb42644b1d76a8ad8439b3 ]
Depending on inlining decisions by the compiler, __get/put_user_fn might become out of line. Then the compiler is no longer able to tell that size can only be 1,2,4 or 8 due to the check in __get/put_user resulting in false positives like
./arch/s390/include/asm/uaccess.h: In function ‘__put_user_fn’:./arch/s390/include/asm/uaccess.h:113:9: warning: ‘rc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
113 | return rc;
| ^~./arch/s390/include/asm/uaccess.h: In function ‘__get_user_fn’:./arch/s390/include/asm/uaccess.h:143:9: warning: ‘rc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
143 | return rc;
| ^~
These functions are supposed to be always inlined. Mark it as such.
--- arch/s390/include/asm/uaccess.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/s390/include/asm/uaccess.h +2 -2
@@ -151,7 +151,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, __rc; \ }) -static inline int __put_user_fn (void *x,void __user *ptr,unsigned long size) +static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) {unsigned long spec =0x810000UL ;int rc;
@@ -181,7 +181,7 @@ static inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)return rc; } -static inline int __get_user_fn (void *x,const void __user *ptr,unsigned long size) +static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size) {unsigned long spec =0x81UL ;int rc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/29 NFSv4: Fix leak of clp->cl_acceptor string
In reply to Sasha LevinFrom: Chuck Lever <[email protected]>
[ Upstream commit 1047ec868332034d1fbcb2fae19fe6d4cb869ff2 ]
Our client can issue multiple SETCLIENTID operations to the same server in some circumstances. Ensure that calls to nfs4_proc_setclientid() after the first one do not overwrite the previously allocated cl_acceptor string.
unreferenced object 0xffff888461031800 (size 32):
comm "mount.nfs", pid 2227, jiffies 4294822467 (age 1407.749s) hex dump (first 32 bytes):
6e 66 73 40 6b 6c 69 6d 74 2e 69 62 2e 31 30 31 [email protected] 35 67 72 61 6e 67 65 72 2e 6e 65 74 00 00 00 00 5granger.net.... backtrace: [<00000000ab820188>] __kmalloc+0x128/0x176 [<00000000eeaf4ec8>] gss_stringify_acceptor+0xbd/0x1a7 [auth_rpcgss] [<00000000e85e3382>] nfs4_proc_setclientid+0x34e/0x46c [nfsv4] [<000000003d9cf1fa>] nfs40_discover_server_trunking+0x7a/0xed [nfsv4] [<00000000b81c3787>] nfs4_discover_server_trunking+0x81/0x244 [nfsv4] [<000000000801b55f>] nfs4_init_client+0x1b0/0x238 [nfsv4] [<00000000977daf7f>] nfs4_set_client+0xfe/0x14d [nfsv4] [<0000000053a68a2a>] nfs4_create_server+0x107/0x1db [nfsv4] [<0000000088262019>] nfs4_remote_mount+0x2c/0x59 [nfsv4] [<00000000e84a2fd0>] legacy_get_tree+0x2d/0x4c [<00000000797e947c>] vfs_get_tree+0x20/0xc7 [<00000000ecabaaa8>] fc_mount+0xe/0x36 [<00000000f15fafc2>] vfs_kern_mount+0x74/0x8d [<00000000a3ff4e26>] nfs_do_root_mount+0x8a/0xa3 [nfsv4] [<00000000d1c2b337>] nfs4_try_mount+0x58/0xad [nfsv4] [<000000004c9bddee>] nfs_fs_mount+0x820/0x869 [nfs]
--- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
fs/nfs/nfs4proc.c +1 -0
@@ -5544,6 +5544,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, } status = task->tk_status;if (setclientid.sc_cred) { +kfree (clp->cl_acceptor); clp->cl_acceptor =rpcauth_stringify_acceptor (setclientid.sc_cred);put_rpccred (setclientid.sc_cred); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/29 tracing: Initialize iter->seq after zeroing in tracing_read_pipe()
In reply to Sasha LevinFrom: Petr Mladek <[email protected]>
[ Upstream commit d303de1fcf344ff7c15ed64c3f48a991c9958775 ]
A customer reported the following softlockup:
[899688.160002] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [test.sh:16464] [899688.160002] CPU: 0 PID: 16464 Comm: test.sh Not tainted 4.12.14-6.23-azure #1 SLE12-SP4 [899688.160002] RIP: 0010:up_write+0x1a/0x30 [899688.160002] Kernel panic - not syncing: softlockup: hung tasks [899688.160002] RIP: 0010:up_write+0x1a/0x30 [899688.160002] RSP: 0018:ffffa86784d4fde8 EFLAGS: 00000257 ORIG_RAX: ffffffffffffff12 [899688.160002] RAX: ffffffff970fea00 RBX: 0000000000000001 RCX: 0000000000000000 [899688.160002] RDX: ffffffff00000001 RSI: 0000000000000080 RDI: ffffffff970fea00 [899688.160002] RBP: ffffffffffffffff R08: ffffffffffffffff R09: 0000000000000000 [899688.160002] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8b59014720d8 [899688.160002] R13: ffff8b59014720c0 R14: ffff8b5901471090 R15: ffff8b5901470000 [899688.160002] tracing_read_pipe+0x336/0x3c0 [899688.160002] __vfs_read+0x26/0x140 [899688.160002] vfs_read+0x87/0x130 [899688.160002] SyS_read+0x42/0x90 [899688.160002] do_syscall_64+0x74/0x160
It caught the process in the middle of trace_access_unlock(). There is no loop. So, it must be looping in the caller tracing_read_pipe() via the "waitagain" label.
Crashdump analyze uncovered that iter->seq was completely zeroed at this point, including iter->seq.seq.size. It means that print_trace_line() was never able to print anything and there was no forward progress.
The culprit seems to be in the code:
/* reset all but tr, trace, and overruns */ memset(&iter->seq, 0, sizeof(struct trace_iterator) - offsetof(struct trace_iterator, seq));
It was added by the commit 53d0aa773053ab182877 ("ftrace:
add logic to record overruns"). It was v2.6.27-rc1. It was the time when iter->seq looked like:
struct trace_seq {
unsigned char buffer[PAGE_SIZE];
unsigned int len;
};There was no "size" variable and zeroing was perfectly fine.
The solution is to reinitialize the structure after or without zeroing.
--- kernel/trace/trace.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/trace.c +1 -0
@@ -5204,6 +5204,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,sizeof (struct trace_iterator ) - offsetof(struct trace_iterator, seq));cpumask_clear (iter->started); +trace_seq_init (&iter->seq); iter->pos =-1 ;trace_event_read_lock ();
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/29 serial: mctrl_gpio: Check for NULL pointer
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit 37e3ab00e4734acc15d96b2926aab55c894f4d9c ]
When using mctrl_gpio_to_gpiod, it dereferences gpios into a single requested GPIO. This dereferencing can break if gpios is NULL, so this patch adds a NULL check before dereferencing it. If gpios is NULL, this function will also return NULL.
--- drivers/tty/serial/serial_mctrl_gpio.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/serial_mctrl_gpio.c +3 -0
@@ -68,6 +68,9 @@ EXPORT_SYMBOL_GPL(mctrl_gpio_set);struct gpio_desc *mctrl_gpio_to_gpiod (struct mctrl_gpios *gpios,enum mctrl_gpio_idx gidx) { +if (gpios ==NULL ) +return NULL ; +return gpios->gpio[gidx]; }EXPORT_SYMBOL_GPL (mctrl_gpio_to_gpiod);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/29 fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 56e94ea132bb5c2c1d0b60a6aeb34dcb7d71a53d ]
In ocfs2_xa_prepare_entry(), there is an if statement on line 2136 to check whether loc->xl_entry is NULL:
if (loc->xl_entry)
When loc->xl_entry is NULL, it is used on line 2158:
ocfs2_xa_add_entry(loc, name_hash);
loc->xl_entry->xe_name_hash = cpu_to_le32(name_hash);
loc->xl_entry->xe_name_offset = cpu_to_le16(loc->xl_size);and line 2164:
ocfs2_xa_add_namevalue(loc, xi);
loc->xl_entry->xe_value_size = cpu_to_le64(xi->xi_value_len);
loc->xl_entry->xe_name_len = xi->xi_name_len;Thus, possible null-pointer dereferences may occur.
To fix these bugs, if loc-xl_entry is NULL, ocfs2_xa_prepare_entry() abnormally returns with -EINVAL.
These bugs are found by a static analysis tool STCheck written by us.
--- fs/ocfs2/xattr.c | 56 ++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 33 deletions(-)
fs/ocfs2/xattr.c +23 -33
@@ -1497,18 +1497,6 @@ static int ocfs2_xa_check_space(struct ocfs2_xa_loc *loc,return loc->xl_ops->xlo_check_space (loc, xi); } -static void ocfs2_xa_add_entry (struct ocfs2_xa_loc *loc,u32 name_hash) -{ - loc->xl_ops->xlo_add_entry (loc, name_hash); - loc->xl_entry->xe_name_hash =cpu_to_le32 (name_hash); -/* -* We can't leave the new entry's xe_name_offset at zero or -* add_namevalue() will go nuts. We set it to the size of our -* storage so that it can never be less than any other entry. -*/ - loc->xl_entry->xe_name_offset =cpu_to_le16 (loc->xl_size); -} -static void ocfs2_xa_add_namevalue (struct ocfs2_xa_loc *loc,struct ocfs2_xattr_info *xi) {
@@ -2140,29 +2128,31 @@ static int ocfs2_xa_prepare_entry(struct ocfs2_xa_loc *loc,if (rc) goto out; -if (loc->xl_entry) { -if (ocfs2_xa_can_reuse_entry (loc, xi)) { - orig_value_size = loc->xl_entry->xe_value_size; - rc =ocfs2_xa_reuse_entry (loc, xi, ctxt); -if (rc) - goto out; - goto alloc_value; - } +if (!loc->xl_entry) { + rc = -EINVAL ; + goto out; + } -if (!ocfs2_xattr_is_local (loc->xl_entry)) { - orig_clusters =ocfs2_xa_value_clusters (loc); - rc =ocfs2_xa_value_truncate (loc,0 , ctxt); -if (rc) { -mlog_errno (rc); -ocfs2_xa_cleanup_value_truncate (loc, -"overwriting" , - orig_clusters); - goto out; - } +if (ocfs2_xa_can_reuse_entry (loc, xi)) { + orig_value_size = loc->xl_entry->xe_value_size; + rc =ocfs2_xa_reuse_entry (loc, xi, ctxt); +if (rc) + goto out; + goto alloc_value; + } + +if (!ocfs2_xattr_is_local (loc->xl_entry)) { + orig_clusters =ocfs2_xa_value_clusters (loc); + rc =ocfs2_xa_value_truncate (loc,0 , ctxt); +if (rc) { +mlog_errno (rc); +ocfs2_xa_cleanup_value_truncate (loc, +"overwriting" , + orig_clusters); + goto out; } -ocfs2_xa_wipe_namevalue (loc); - }else -ocfs2_xa_add_entry (loc, name_hash); + } +ocfs2_xa_wipe_namevalue (loc);/* * If we get here, we have a blank entry. Fill it. We grow our
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/29 staging: rtl8188eu: fix null dereference when kzalloc fails
In reply to Sasha LevinFrom: Connor Kuehl <[email protected]>
[ Upstream commit 955c1532a34305f2f780b47f0c40cc7c65500810 ]
If kzalloc() returns NULL, the error path doesn't stop the flow of control from entering rtw_hal_read_chip_version() which dereferences the null pointer. Fix this by adding a 'goto' to the error path to more gracefully handle the issue and avoid proceeding with initialization steps that we're no longer prepared to handle.
Also update the debug message to be more consistent with the other debug messages in this function.
Addresses-Coverity: ("Dereference after null check")
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +4 -2
@@ -366,8 +366,10 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, } padapter->HalData =kzalloc (sizeof (struct hal_data_8188e ),GFP_KERNEL ); -if (!padapter->HalData) -DBG_88E ("cant not alloc memory for HAL DATA\n" ); +if (!padapter->HalData) { +DBG_88E ("Failed to allocate memory for HAL data\n" ); + goto free_adapter; + } padapter->intf_start = &usb_intf_start; padapter->intf_stop = &usb_intf_stop;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/29 MIPS: fw: sni: Fix out of bounds init of o32 stack
In reply to Sasha LevinFrom: Thomas Bogendoerfer <[email protected]>
[ Upstream commit efcb529694c3b707dc0471b312944337ba16e4dd ]
Use ARRAY_SIZE to caluculate the top of the o32 stack.
--- arch/mips/fw/sni/sniprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/fw/sni/sniprom.c +1 -1
@@ -42,7 +42,7 @@/* O32 stack has to be 8-byte aligned. */ static u64 o32_stk[4096 ]; -#define O32_STK &o32_stk[sizeof(o32_stk)] +#define O32_STK (&o32_stk[ARRAY_SIZE(o32_stk)])#define __PROM_O32 (fun, arg) fun arg __asm__(#fun); \ __asm__(#fun " = call_o32")
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/29 fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 2abb7d3b12d007c30193f48bebed781009bebdd2 ]
In ocfs2_info_scan_inode_alloc(), there is an if statement on line 283 to check whether inode_alloc is NULL:
if (inode_alloc)
When inode_alloc is NULL, it is used on line 287:
ocfs2_inode_lock(inode_alloc, &bh, 0);
ocfs2_inode_lock_full_nested(inode, ...)
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);Thus, a possible null-pointer dereference may occur.
To fix this bug, inode_alloc is checked on line 286.
This bug is found by a static analysis tool STCheck written by us.
--- fs/ocfs2/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/ioctl.c +1 -1
@@ -289,7 +289,7 @@ static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb,if (inode_alloc)inode_lock (inode_alloc); -if (o2info_coherent (&fi->ifi_req)) { +if (inode_alloc &&o2info_coherent (&fi->ifi_req)) { status =ocfs2_inode_lock (inode_alloc, &bh,0 );if (status <0 ) {mlog_errno (status);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/29 iio: adc: ad799x: fix probe error handling
In reply to Sasha LevinFrom: Marco Felsch <[email protected]>
[ Upstream commit c62dd44901cfff12acc5792bf3d2dec20bcaf392 ]
Since commit 0f7ddcc1bff1 ("iio:adc:ad799x: Write default config on probe and reset alert status on probe") the error path is wrong since it leaves the vref regulator on. Fix this by disabling both regulators.
--- drivers/iio/adc/ad799x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad799x.c +2 -2
@@ -817,10 +817,10 @@ static int ad799x_probe(struct i2c_client *client, ret =ad799x_write_config (st, st->chip_config->default_config);if (ret <0 ) - goto error_disable_reg; + goto error_disable_vref; ret =ad799x_read_config (st);if (ret <0 ) - goto error_disable_reg; + goto error_disable_vref; st->config = ret; ret = iio_triggered_buffer_setup(indio_dev, NULL,
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/29 fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock()
In reply to Sasha LevinFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 583fee3e12df0e6f1f66f063b989d8e7fed0e65a ]
In ocfs2_write_end_nolock(), there are an if statement on lines 1976, 2047 and 2058, to check whether handle is NULL:
if (handle)
When handle is NULL, it is used on line 2045:
ocfs2_update_inode_fsync_trans(handle, inode, 1);
oi->i_sync_tid = handle->h_transaction->t_tid;Thus, a possible null-pointer dereference may occur.
To fix this bug, handle is checked before callingocfs2_update_inode_fsync_trans().
This bug is found by a static analysis tool STCheck written by us.
--- fs/ocfs2/aops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ocfs2/aops.c +2 -1
@@ -2046,7 +2046,8 @@ int ocfs2_write_end_nolock(struct address_space *mapping, inode->i_mtime = inode->i_ctime =current_time (inode); di->i_mtime = di->i_ctime =cpu_to_le64 (inode->i_mtime.tv_sec); di->i_mtime_nsec = di->i_ctime_nsec =cpu_to_le32 (inode->i_mtime.tv_nsec); -ocfs2_update_inode_fsync_trans (handle, inode,1 ); +if (handle) +ocfs2_update_inode_fsync_trans (handle, inode,1 ); }if (handle)ocfs2_journal_dirty (handle, wc->w_di_bh);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/29 ocfs2: clear zero in unaligned direct IO
In reply to Sasha LevinFrom: Jia Guo <[email protected]>
[ Upstream commit 7a243c82ea527cd1da47381ad9cd646844f3b693 ]
Unused portion of a part-written fs-block-sized block is not set to zero in unaligned append direct write.This can lead to serious data inconsistencies.
Ocfs2 manage disk with cluster size(for example, 1M), part-written in one cluster will change the cluster state from UN-WRITTEN to WRITTEN, VFS(function dio_zero_block) doesn't do the cleaning because bh's state is not set to NEW in function ocfs2_dio_wr_get_block when we write a WRITTEN cluster. For example, the cluster size is 1M, file size is 8k and we direct write from 14k to 15k, then 12k~14k and 15k~16k will contain dirty data.
We have to deal with two cases:
1.The starting position of direct write is outside the file. 2.The starting position of direct write is located in the file.
We need set bh's state to NEW in the first case. In the second case, we need mapped twice because bh's state of area out file should be set to NEW while area in file not.
--- fs/ocfs2/aops.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
fs/ocfs2/aops.c +21 -1
@@ -2143,13 +2143,30 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,struct ocfs2_dio_write_ctxt *dwc =NULL ;struct buffer_head *di_bh =NULL ;u64 p_blkno; -loff_t pos = iblock << inode->i_sb->s_blocksize_bits; +unsigned int i_blkbits = inode->i_sb->s_blocksize_bits; +loff_t pos = iblock << i_blkbits; +sector_t endblk = (i_size_read (inode) -1 ) >> i_blkbits;unsigned len, total_len = bh_result->b_size;int ret =0 , first_get_block =0 ; len = osb->s_clustersize - (pos & (osb->s_clustersize -1 )); len =min (total_len, len); +/* +* bh_result->b_size is count in get_more_blocks according to write +* "pos" and "end", we need map twice to return different buffer state: +* 1. area in file size, not set NEW; +* 2. area out file size, set NEW. +* +* iblock endblk +* |--------|---------|---------|--------- +* |<-------area in file------->| +*/ + +if ((iblock <= endblk) && + ((iblock + ((len -1 ) >> i_blkbits)) > endblk)) + len = (endblk - iblock +1 ) << i_blkbits; +mlog (0 ,"get block of %lu at %llu:%u req %u\n" , inode->i_ino, pos, len, total_len);
@@ -2233,6 +2250,9 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,if (desc->c_needs_zero)set_buffer_new (bh_result); +if (iblock > endblk) +set_buffer_new (bh_result); +/* May sleep in end_io. It should not happen in a irq context. So defer * it to dio work queue. */ set_buffer_defer_completion (bh_result);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/29 fs: cifs: mute -Wunused-const-variable message
In reply to Sasha LevinFrom: Austin Kim <[email protected]>
[ Upstream commit dd19c106a36690b47bb1acc68372f2b472b495b8 ]
After 'Initial git repository build' commit, 'mapping_table_ERRHRD' variable has not been used.
So 'mapping_table_ERRHRD' const variable could be removed to mute below warning message:
fs/cifs/netmisc.c:120:40: warning: unused variable 'mapping_table_ERRHRD' [-Wunused-const-variable]
static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
^--- fs/cifs/netmisc.c | 4 ---- 1 file changed, 4 deletions(-)
fs/cifs/netmisc.c +0 -4
@@ -130,10 +130,6 @@ static const struct smb_to_posix_error mapping_table_ERRSRV[] = { {0, 0} }; -static const struct smb_to_posix_error mapping_table_ERRHRD[] = { - {0 ,0 } -}; -/* * Convert a string containing text IPv4 or IPv6 address to binary form. *
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/29 gpio: max77620: Use correct unit for debounce times
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit fffa6af94894126994a7600c6f6f09b892e89fa9 ]
The gpiod_set_debounce() function takes the debounce time in microseconds. Adjust the switch/case values in the MAX77620 GPIO to use the correct unit.
--- drivers/gpio/gpio-max77620.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpio/gpio-max77620.c +3 -3
@@ -167,13 +167,13 @@ static int max77620_gpio_set_debounce(struct gpio_chip *gc,case 0 : val = MAX77620_CNFG_GPIO_DBNC_None;break ; - case 1 ... 8: + case 1000 ... 8000: val = MAX77620_CNFG_GPIO_DBNC_8ms;break ; - case 9 ... 16: + case 9000 ... 16000: val = MAX77620_CNFG_GPIO_DBNC_16ms;break ; - case 17 ... 32: + case 17000 ... 32000: val = MAX77620_CNFG_GPIO_DBNC_32ms;break ;default :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/29 perf jevents: Fix period for Intel fixed counters
In reply to Sasha LevinFrom: Andi Kleen <[email protected]>
[ Upstream commit 6bdfd9f118bd59cf0f85d3bf4b72b586adea17c1 ]
The Intel fixed counters use a special table to override the JSON information.
During this override the period information from the JSON file got dropped, which results in inst_retired.any and similar running with frequency mode instead of a period.
Just specify the expected period in the table.
--- tools/perf/pmu-events/jevents.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/pmu-events/jevents.c +6 -6
@@ -311,12 +311,12 @@ static struct fixed {const char *name;const char *event; } fixed[] = { - { "inst_retired.any", "event=0xc0" }, - { "inst_retired.any_p", "event=0xc0" }, - { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" }, - { "cpu_clk_unhalted.thread", "event=0x3c" }, - { "cpu_clk_unhalted.core", "event=0x3c" }, - { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" }, + { "inst_retired.any", "event=0xc0,period=2000003" }, + { "inst_retired.any_p", "event=0xc0,period=2000003" }, + { "cpu_clk_unhalted.ref", "event=0x0,umask=0x03,period=2000003" }, + { "cpu_clk_unhalted.thread", "event=0x3c,period=2000003" }, + { "cpu_clk_unhalted.core", "event=0x3c,period=2000003" }, + { "cpu_clk_unhalted.thread_any", "event=0x3c,any=1,period=2000003" }, { NULL, NULL}, };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/29 iio: fix center temperature of bmc150-accel-core
In reply to Sasha LevinFrom: Pascal Bouwmann <[email protected]>
[ Upstream commit 6c59a962e081df6d8fe43325bbfabec57e0d4751 ]
The center temperature of the supported devices stored in the constant BMC150_ACCEL_TEMP_CENTER_VAL is not 24 degrees but 23 degrees.
It seems that some datasheets were inconsistent on this value leading to the error. For most usecases will only make minor difference so not queued for stable.
--- drivers/iio/accel/bmc150-accel-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/bmc150-accel-core.c +1 -1
@@ -125,7 +125,7 @@#define BMC150_ACCEL_SLEEP_1_SEC 0x0F#define BMC150_ACCEL_REG_TEMP 0x08 -#define BMC150_ACCEL_TEMP_CENTER_VAL 24 +#define BMC150_ACCEL_TEMP_CENTER_VAL 23#define BMC150_ACCEL_AXIS_TO_REG (axis) (BMC150_ACCEL_REG_XOUT_L + (axis * 2))#define BMC150_AUTO_SUSPEND_DELAY_MS 2000
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/29 rtc: pcf8523: set xtal load capacitance from DT
In reply to Sasha LevinFrom: Sam Ravnborg <[email protected]>
[ Upstream commit 189927e719e36ceefbb8037f23d3849e47833aef ]
Add support for specifying the xtal load capacitance in the DT node. The pcf8523 supports xtal load capacitance of 7pF or 12.5pF. If the rtc has the wrong configuration the time will drift several hours/week.
The driver use the default value 12.5pF.
The DT may specify either 7000fF or 12500fF.
(The DT uses femto Farad to avoid decimal numbers). Other values are warned and the driver uses the default value.
--- drivers/rtc/rtc-pcf8523.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/rtc/rtc-pcf8523.c +20 -8
@@ -94,8 +94,9 @@ static int pcf8523_voltage_low(struct i2c_client *client)return !!(value ®_CONTROL3_BLF ); } -static int pcf8523_select_capacitance (struct i2c_client *client,bool high) +static int pcf8523_load_capacitance (struct i2c_client *client) { +u32 load;u8 value;int err;
@@ -103,14 +104,24 @@ static int pcf8523_select_capacitance(struct i2c_client *client, bool high)if (err <0 )return err; -if (!high) - value &= ~REG_CONTROL1_CAP_SEL ; -else + load =12500 ; +of_property_read_u32 (client->dev.of_node,"quartz-load-femtofarads" , + &load); + +switch (load) { +default : +dev_warn (&client->dev,"Unknown quartz-load-femtofarads value: %d. Assuming 12500" , + load); +/* fall through */ +case 12500 : value |=REG_CONTROL1_CAP_SEL ; +break ; +case 7000 : + value &= ~REG_CONTROL1_CAP_SEL ; +break ; + } err =pcf8523_write (client,REG_CONTROL1 , value); -if (err <0 ) -return err;return err; }
@@ -307,9 +318,10 @@ static int pcf8523_probe(struct i2c_client *client,if (!pcf)return -ENOMEM ; - err =pcf8523_select_capacitance (client, true); + err =pcf8523_load_capacitance (client);if (err <0 ) -return err; +dev_warn (&client->dev,"failed to set xtal load capacitance: %d" , + err); err =pcf8523_set_pm (client,0 );if (err <0 )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/29 usb: handle warm-reset port requests on hub resume
In reply to Sasha LevinFrom: Jan-Marek Glogowski <[email protected]>
[ Upstream commit 4fdc1790e6a9ef22399c6bc6e63b80f4609f3b7e ]
On plug-in of my USB-C device, its USB_SS_PORT_LS_SS_INACTIVE link state bit is set. Greping all the kernel for this bit shows that the port status requests a warm-reset this way.
This just happens, if its the only device on the root hub, the hub therefore resumes and the HCDs status_urb isn't yet available. If a warm-reset request is detected, this sets the hubs event_bits, which will prevent any auto-suspend and allows the hubs workqueue to warm-reset the port later in port_event.
--- drivers/usb/core/hub.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/core/hub.c +7 -0
@@ -102,6 +102,8 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);static void hub_release (struct kref *kref);static int usb_reset_and_verify_device (struct usb_device *udev);static int hub_port_disable (struct usb_hub *hub,int port1,int set_state); +static bool hub_port_warm_reset_required (struct usb_hub *hub,int port1, +u16 portstatus);static inline char *portspeed (struct usb_hub *hub,int portstatus) {
@@ -1108,6 +1110,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } +/* Make sure a warm-reset request is handled by port_event */ +if (type ==HUB_RESUME && +hub_port_warm_reset_required (hub, port1, portstatus)) +set_bit (port1, hub->event_bits); +/* * Add debounce if USB3 link is in polling/link training state. * Link will automatically transition to Enabled state after
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/29 HID: i2c-hid: Add Odys Winbook 13 to descriptor override
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit f8f807441eefddc3c6d8a378421f0ede6361d565 ]
The Odys Winbook 13 uses a SIPODEV SP1064 touchpad, which does not supply descriptors, add this to the DMI descriptor override list, fixing the touchpad not working.
--- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +8 -0
@@ -346,6 +346,14 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { }, .driver_data = (void *)&sipodev_desc }, + { + .ident = "Odys Winbook 13", + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AXDIA International GmbH"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "WINBOOK 13"), + }, + .driver_data = (void *)&sipodev_desc + }, { } /* Terminate list */ };
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 1/29 sc16is7xx: Fix for "Unexpected interrupt: 8"
From: Phil Elwell <[email protected]>
[ Upstream commit 30ec514d440cf2c472c8e4b0079af2c731f71a3e ]
The SC16IS752 has an Enhanced Feature Register which is aliased at the same address as the Interrupt Identification Register; accessing it requires that a magic value is written to the Line Configuration Register. If an interrupt is raised while the EFR is mapped in then the ISR won't be able to access the IIR, leading to the "Unexpected interrupt" error messages.
Avoid the problem by claiming a mutex around accesses to the EFR register, also claiming the mutex in the interrupt handler work item (this is equivalent to disabling interrupts to interlock against a non-threaded interrupt handler).
See: https://github.com/raspberrypi/linux/issues/2529
--- drivers/tty/serial/sc16is7xx.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
drivers/tty/serial/sc16is7xx.c +28 -0
@@ -332,6 +332,7 @@ struct sc16is7xx_port {struct kthread_worker kworker;struct task_struct *kworker_task;struct kthread_work irq_work; +struct mutex efr_lock;struct sc16is7xx_one p[0 ]; };
@@ -503,6 +504,21 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) div /=4 ; } +/* In an amazing feat of design, the Enhanced Features Register shares +* the address of the Interrupt Identification Register, and is +* switched in by writing a magic value (0xbf) to the Line Control +* Register. Any interrupt firing during this time will see the EFR +* where it expects the IIR to be, leading to "Unexpected interrupt" +* messages. +* +* Prevent this possibility by claiming a mutex while accessing the +* EFR, and claiming the same mutex from within the interrupt handler. +* This is similar to disabling the interrupt, but that doesn't work +* because the bulk of the interrupt processing is run as a workqueue +* job in thread context. +*/ +mutex_lock (&s->efr_lock); + lcr =sc16is7xx_port_read (port,SC16IS7XX_LCR_REG );/* Open the LCR divisors for configuration */
@@ -518,6 +534,8 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)/* Put LCR back to the normal mode */ sc16is7xx_port_write (port,SC16IS7XX_LCR_REG , lcr); +mutex_unlock (&s->efr_lock); +sc16is7xx_port_update (port,SC16IS7XX_MCR_REG ,SC16IS7XX_MCR_CLKSEL_BIT , prescaler);
@@ -700,6 +718,8 @@ static void sc16is7xx_ist(struct kthread_work *ws) {struct sc16is7xx_port *s =to_sc16is7xx_port (ws, irq_work); +mutex_lock (&s->efr_lock); +while (1 ) {bool keep_polling = false;int i;
@@ -709,6 +729,8 @@ static void sc16is7xx_ist(struct kthread_work *ws)if (!keep_polling)break ; } + +mutex_unlock (&s->efr_lock); }static irqreturn_t sc16is7xx_irq (int irq,void *dev_id)
@@ -903,6 +925,9 @@ static void sc16is7xx_set_termios(struct uart_port *port,if (!(termios->c_cflag &CREAD )) port->ignore_status_mask |=SC16IS7XX_LSR_BRK_ERROR_MASK ; +/* As above, claim the mutex while accessing the EFR. */ +mutex_lock (&s->efr_lock); +sc16is7xx_port_write (port,SC16IS7XX_LCR_REG ,SC16IS7XX_LCR_CONF_MODE_B );
@@ -924,6 +949,8 @@ static void sc16is7xx_set_termios(struct uart_port *port,/* Update LCR register */ sc16is7xx_port_write (port,SC16IS7XX_LCR_REG , lcr); +mutex_unlock (&s->efr_lock); +/* Get baud rate generator configuration */ baud = uart_get_baud_rate(port, termios, old, port->uartclk / 16 / 4 / 0xffff,
@@ -1186,6 +1213,7 @@ static int sc16is7xx_probe(struct device *dev, s->regmap = regmap; s->devtype = devtype;dev_set_drvdata (dev, s); +mutex_init (&s->efr_lock);kthread_init_worker (&s->kworker);kthread_init_work (&s->irq_work, sc16is7xx_ist);
Signature · 1 line
2.20.1