- Linux-stable-mirror - lists.linaro.org

Re: [PATCH v2] input/touchscreen: atmel_mxt_ts: Add correct touchpad button mapping for the Caroline Chromebook.

by Dmitry Torokhov

On Thu, Apr 26, 2018 at 06:45:32AM -0700, Guenter Roeck wrote: > On Wed, Apr 25, 2018 at 10:37 PM, Vittorio Gambaletta (VittGam) < > linuxbugs(a)vittgam.net> wrote: > > > Hello, > > > > On 26/04/2018 00:57:34 CEST, Dmitry Torokhov wrote: > > > On Wed, Apr 25, 2018 at 03:26:50PM -0700, Dmitry Torokhov wrote: > > >> On Wed, Apr 25, 2018 at 02:32:58PM +0200, Vittorio Gambaletta (VittGam) > > wrote: > > >> > This patch adds the correct platform data information for the Caroline > > >> > Chromebook, so that the mouse button does not get stuck in pressed > > state > > >> > after the first click. > > >> > > > >> > The Samus button keymap and platform data definition are the correct > > >> > ones for Caroline, so they have been reused here. > > >> > > > >> > v2: updated patch offset after 20180409 changes. > > >> > > > >> > Cc: stable(a)vger.kernel.org > > >> > Signed-off-by: Vittorio Gambaletta <linuxbugs(a)vittgam.net> > > >> > Signed-off-by: Salvatore Bellizzi <lkml(a)seppia.net> > > >> > > > >> > > >> Applied, thank you. > > >> > > >> > --- > > >> > > > >> > --- a/drivers/input/touchscreen/atmel_mxt_ts.c > > >> > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c > > >> > @@ -3035,6 +3035,15 @@ > > >> > .driver_data = samus_platform_data, > > >> > }, > > >> > { > > >> > + /* Samsung Chromebook Pro */ > > >> > + .ident = "Samsung Chromebook Pro", > > >> > + .matches = { > > >> > + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), > > > > > > I've been alerted that shipping BIOS has vendor not capitalized; where > > > did you get the firmware that has vendor all capitals? > > > > Upstream coreboot and mrchromebox's coreboot, which do support loading > > Linux > > natively or with UEFI, both use capitalized GOOGLE as DMI System Vendor > > as far as I know. > > > > By the way, the shipping BIOS (coreboot customized by Google) does not > > support > > mainline Linux natively (eg. without seabios and nasty tricks), but only > > Chromium OS, which for Caroline is an old 3.something fork of Linux, so > > this > > patch does not really apply to Chromium OS or to Linux running on shipping > > BIOS. > > > > Can you provide details or a pointer to it ? The mainline kernel boots > fine for me (with a ChromeOS distribution), with the exception of the > Google/GOOGLE problem. > > > > Anyway if I recall correctly, the DMI System Vendor should be GOOGLE in > > Google's coreboot for Caroline too, but I'm not 100% sure and cannot check > > right now. > > > > > FWIW, the DMI system vendor is "Google" in my Caroline. I'll dig up > configuration files later today - maybe it was changed to "GOOGLE" at some > point and I have an old Bios in my system. I believe all shipping BIOSes use "Google" as vendor, as it is what is specified in src/mainboard/google/Kconfig::MAINBOARD_VENDOR and our configs/build scripts do not override it. I do not know why we have this difference. > > Thanks, > Guenter > > By the way please note that this is the DMI System Vendor and not the DMI > > BIOS version string, which indeed starts with "Google_" in the shipping > > BIOS > > (but not in coreboot, see f56db262e46d3368ee4e5c9e19797853cab382cd). Hmm, I just tried checking out tree from https://review.coreboot.org/coreboot.git and do not see this commit: dtor@dtor-ws:~/coreboot $ git show f56db262e46d3368ee4e5c9e19797853cab382cd fatal: bad object f56db262e46d3368ee4e5c9e19797853cab382cd dtor@dtor-ws:~/coreboot $ git log --oneline -1 HEAD 82d0f91420 (HEAD -> master, origin/master, origin/HEAD) soc/intel/apollolake: enable exception handling in every stage for glk Anyway, if you are overriding the shipping BIOS, then please adjust coreboot to use device-tree compatible bindings (via PRP0001 HID and _DSD properties - you can check out bindings for PENH device in Caroline to see how they can be used). This way we would not need to breed DMI quirks. Thanks. -- Dmitry

7 years, 8 months

2
3
0 0

[PATCH 0/2] musb fixes for v4.17-rc4

by Bin Liu

Hi Greg, Here are musb fixes for v4.17-rc4 to fix two NULL pointer dereference cases. Please let me know if any change is needed. Regards, -Bin. ---- Bin Liu (2): usb: musb: host: fix potential NULL pointer dereference usb: musb: trace: fix NULL pointer dereference in musb_g_tx() drivers/usb/musb/musb_gadget.c | 3 ++- drivers/usb/musb/musb_host.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) -- 1.9.1

7 years, 8 months

2
6
0 0

[PATCH] perf session: Fix undeclared 'oe'

by Murilo Opsfelder Araujo

Using linux-3.18.y branch, perf build fails with the following: $ make -s -j16 -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=/usr DESTDIR=/tmp/builddir/build all [...] util/session.c: In function ‘__perf_session__process_pipe_events’: util/session.c:1093:36: error: ‘oe’ undeclared (first use in this function) ordered_events__set_copy_on_queue(oe, true); ^ util/session.c:1093:36: note: each undeclared identifier is reported only once for each function it appears in This patch fixes it for linux-3.18.y branch. Fixes: 95b33b99cdd6 ("perf inject: Copy events when reordering events in pipe mode") Cc: <stable(a)vger.kernel.org> # 3.18.x Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Andi Kleen <ak(a)linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com> Cc: David Carrillo-Cisneros <davidcc(a)google.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: He Kuang <hekuang(a)huawei.com> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Jiri Olsa <jolsa(a)kernel.org> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Paul Turner <pjt(a)google.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Sasha Levin <alexander.levin(a)microsoft.com> Cc: Simon Que <sque(a)chromium.org> Cc: Stephane Eranian <eranian(a)google.com> Cc: Wang Nan <wangnan0(a)huawei.com> Signed-off-by: Murilo Opsfelder Araujo <muriloo(a)linux.ibm.com> --- tools/perf/util/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index dc3d3b1b813e..c2d4a7ec40df 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1073,6 +1073,7 @@ volatile int session_done; static int __perf_session__process_pipe_events(struct perf_session *session, struct perf_tool *tool) { + struct ordered_events *oe = &session->ordered_events; int fd = perf_data_file__fd(session->file); union perf_event *event; uint32_t size, cur_size = 0; -- 2.14.3

7 years, 8 months

3
6
0 0

Re: [PATCH 4.4 12/50] KVM: s390: wire up bpb feature

by Christian Borntraeger

On 04/27/2018 03:58 PM, Greg Kroah-Hartman wrote: > 4.4-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Martin Schwidefsky <schwidefsky(a)de.ibm.com> > > > From: Christian Borntraeger <borntraeger(a)de.ibm.com> > > [ Upstream commit 35b3fde6203b932b2b1a5b53b3d8808abc9c4f60 ] > > The new firmware interfaces for branch prediction behaviour changes > are transparently available for the guest. Nevertheless, there is > new state attached that should be migrated and properly resetted. > Provide a mechanism for handling reset, migration and VSIE. > > Signed-off-by: Christian Borntraeger <borntraeger(a)de.ibm.com> > Reviewed-by: David Hildenbrand <david(a)redhat.com> > Reviewed-by: Cornelia Huck <cohuck(a)redhat.com> > [Changed capability number to 152. - Radim] > Signed-off-by: Radim Krčmář <rkrcmar(a)redhat.com> > Signed-off-by: Martin Schwidefsky <schwidefsky(a)de.ibm.com> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Something went wrong during the backport of this to 4.4 [...] > --- > arch/s390/include/asm/kvm_host.h | 3 ++- > arch/s390/include/uapi/asm/kvm.h | 3 +++ > arch/s390/kvm/kvm-s390.c | 13 ++++++++++++- > include/uapi/linux/kvm.h | 1 + > 4 files changed, 18 insertions(+), 2 deletions(-) > > --- a/arch/s390/include/asm/kvm_host.h > +++ b/arch/s390/include/asm/kvm_host.h > @@ -1286,7 +1291,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu > if (test_fp_ctl(current->thread.fpu.fpc)) > /* User space provided an invalid FPC, let's clear it */ > current->thread.fpu.fpc = 0; > - unrelated whitespace change > save_access_regs(vcpu->arch.host_acrs); > restore_access_regs(vcpu->run->s.regs.acrs); > gmap_enable(vcpu->arch.gmap); > @@ -1327,6 +1331,7 @@ static void kvm_s390_vcpu_initial_reset( > current->thread.fpu.fpc = 0; > vcpu->arch.sie_block->gbea = 1; > vcpu->arch.sie_block->pp = 0; > + vcpu->arch.sie_block->fpf &= ~FPF_BPBC; > vcpu->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID; > kvm_clear_async_pf_completion_queue(vcpu); > if (!kvm_s390_user_cpu_state_ctrl(vcpu->kvm)) > @@ -2162,6 +2167,7 @@ static void store_regs(struct kvm_vcpu * > kvm_run->s.regs.pft = vcpu->arch.pfault_token; > kvm_run->s.regs.pfs = vcpu->arch.pfault_select; > kvm_run->s.regs.pfc = vcpu->arch.pfault_compare; > + kvm_run->s.regs.bpbc = (vcpu->arch.sie_block->fpf & FPF_BPBC) == FPF_BPBC; > } > > int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) > @@ -2194,6 +2200,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v > kvm_run->exit_reason = KVM_EXIT_INTR; > rc = -EINTR; > } > + if ((kvm_run->kvm_dirty_regs & KVM_SYNC_BPBC) && > + test_kvm_facility(vcpu->kvm, 82)) { > + vcpu->arch.sie_block->fpf &= ~FPF_BPBC; > + vcpu->arch.sie_block->fpf |= kvm_run->s.regs.bpbc ? FPF_BPBC : 0; > + } > This looks misplaced and should go into the sync_regs function.

7 years, 8 months

3
6
0 0

[PATCH 3.18 v2 1/1] perf session: Fix undeclared 'oe'

by Murilo Opsfelder Araujo

Using linux-3.18.y branch, perf build fails with the following: $ make -s -j16 -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=/usr DESTDIR=/tmp/builddir/build all [...] util/session.c: In function ‘__perf_session__process_pipe_events’: util/session.c:1093:36: error: ‘oe’ undeclared (first use in this function) ordered_events__set_copy_on_queue(oe, true); ^ util/session.c:1093:36: note: each undeclared identifier is reported only once for each function it appears in This patch fixes it for linux-3.18.y branch. Fixes: 95b33b99cdd6 ("perf inject: Copy events when reordering events in pipe mode") Cc: <stable(a)vger.kernel.org> # 3.18.x Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Andi Kleen <ak(a)linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com> Cc: David Carrillo-Cisneros <davidcc(a)google.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: He Kuang <hekuang(a)huawei.com> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Jiri Olsa <jolsa(a)kernel.org> Cc: Masami Hiramatsu <mhiramat(a)kernel.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Paul Turner <pjt(a)google.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Sasha Levin <alexander.levin(a)microsoft.com> Cc: Simon Que <sque(a)chromium.org> Cc: Stephane Eranian <eranian(a)google.com> Cc: Wang Nan <wangnan0(a)huawei.com> Signed-off-by: Murilo Opsfelder Araujo <muriloo(a)linux.ibm.com> --- tools/perf/util/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index dc3d3b1b813e..c2d4a7ec40df 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1073,6 +1073,7 @@ volatile int session_done; static int __perf_session__process_pipe_events(struct perf_session *session, struct perf_tool *tool) { + struct ordered_events *oe = &session->ordered_events; int fd = perf_data_file__fd(session->file); union perf_event *event; uint32_t size, cur_size = 0; -- 2.14.3

7 years, 8 months

1
0
0 0

[PATCH 1/3] ioremap: Update pgtable free interfaces with addr

by Toshi Kani

From: Chintan Pandya <cpandya(a)codeaurora.org> This patch ("mm/vmalloc: Add interfaces to free unmapped page table") adds following 2 interfaces to free the page table in case we implement huge mapping. pud_free_pmd_page() and pmd_free_pte_page() Some architectures (like arm64) needs to do proper TLB maintanance after updating pagetable entry even in map. Why ? Read this, https://patchwork.kernel.org/patch/10134581/ Pass 'addr' in these interfaces so that proper TLB ops can be performed. Fixes: b6bdb7517c3d ("mm/vmalloc: add interfaces to free unmapped page table") Signed-off-by: Chintan Pandya <cpandya(a)codeaurora.org> Signed-off-by: Toshi Kani <toshi.kani(a)hpe.com> Cc: <stable(a)vger.kernel.org> --- arch/arm64/mm/mmu.c | 4 ++-- arch/x86/mm/pgtable.c | 8 +++++--- include/asm-generic/pgtable.h | 8 ++++---- lib/ioremap.c | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 2dbb2c9f1ec1..da98828609a1 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -973,12 +973,12 @@ int pmd_clear_huge(pmd_t *pmdp) return 1; } -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return pud_none(*pud); } -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return pmd_none(*pmd); } diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index ffc8c13c50e4..37e3cbac59b9 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -718,11 +718,12 @@ int pmd_clear_huge(pmd_t *pmd) /** * pud_free_pmd_page - Clear pud entry and free pmd page. * @pud: Pointer to a PUD. + * @addr: Virtual address associated with pud. * * Context: The pud range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pud_free_pmd_page(pud_t *pud) +int pud_free_pmd_page(pud_t *pud, unsigned long addr) { pmd_t *pmd; int i; @@ -733,7 +734,7 @@ int pud_free_pmd_page(pud_t *pud) pmd = (pmd_t *)pud_page_vaddr(*pud); for (i = 0; i < PTRS_PER_PMD; i++) - if (!pmd_free_pte_page(&pmd[i])) + if (!pmd_free_pte_page(&pmd[i], addr + (i * PMD_SIZE))) return 0; pud_clear(pud); @@ -745,11 +746,12 @@ int pud_free_pmd_page(pud_t *pud) /** * pmd_free_pte_page - Clear pmd entry and free pte page. * @pmd: Pointer to a PMD. + * @addr: Virtual address associated with pmd. * * Context: The pmd range has been unmaped and TLB purged. * Return: 1 if clearing the entry succeeded. 0 otherwise. */ -int pmd_free_pte_page(pmd_t *pmd) +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { pte_t *pte; diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f59639afaa39..b081794ba135 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1019,8 +1019,8 @@ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot); int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot); int pud_clear_huge(pud_t *pud); int pmd_clear_huge(pmd_t *pmd); -int pud_free_pmd_page(pud_t *pud); -int pmd_free_pte_page(pmd_t *pmd); +int pud_free_pmd_page(pud_t *pud, unsigned long addr); +int pmd_free_pte_page(pmd_t *pmd, unsigned long addr); #else /* !CONFIG_HAVE_ARCH_HUGE_VMAP */ static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot) { @@ -1046,11 +1046,11 @@ static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } -static inline int pud_free_pmd_page(pud_t *pud) +static inline int pud_free_pmd_page(pud_t *pud, unsigned long addr) { return 0; } -static inline int pmd_free_pte_page(pmd_t *pmd) +static inline int pmd_free_pte_page(pmd_t *pmd, unsigned long addr) { return 0; } diff --git a/lib/ioremap.c b/lib/ioremap.c index 54e5bbaa3200..517f5853ffed 100644 --- a/lib/ioremap.c +++ b/lib/ioremap.c @@ -92,7 +92,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr, if (ioremap_pmd_enabled() && ((next - addr) == PMD_SIZE) && IS_ALIGNED(phys_addr + addr, PMD_SIZE) && - pmd_free_pte_page(pmd)) { + pmd_free_pte_page(pmd, addr)) { if (pmd_set_huge(pmd, phys_addr + addr, prot)) continue; } @@ -119,7 +119,7 @@ static inline int ioremap_pud_range(p4d_t *p4d, unsigned long addr, if (ioremap_pud_enabled() && ((next - addr) == PUD_SIZE) && IS_ALIGNED(phys_addr + addr, PUD_SIZE) && - pud_free_pmd_page(pud)) { + pud_free_pmd_page(pud, addr)) { if (pud_set_huge(pud, phys_addr + addr, prot)) continue; }

7 years, 8 months

1
0
0 0

[PATCH for-next 0/6] IB/hfi1,rdmavt: Fixes for the 4.17 RC

by Dennis Dalessandro

Hi Jason and Doug, Here are 6 patches that might make the bar for RC. The first patch fixes something that came in pretty recently, I beleive 4.13. The second patch is trivial, but does modify user visible text. Patch 3 looks large but it's mostly comments. It just moves code. Patch 4 is also pretty simple. The last two patches fix memory leaks. If you don't think these pass muster for RC please carry over to for-next. --- Michael J. Ruhl (1): IB/hfi1 Use correct type for num_user_context Mike Marciniszyn (2): IB/hfi1: Fix handling of FECN marked multicast packet IB/hfi1: Fix loss of BECN with AHG Sebastian Sanchez (3): IB/hfi1: Fix NULL pointer dereference when invalid num_vls is used IB/{hfi1,rdmavt}: Fix memory leak in hfi1_alloc_devdata() upon failure IB/hfi1: Fix memory leak in exception path in get_irq_affinity() drivers/infiniband/hw/hfi1/affinity.c | 11 +++---- drivers/infiniband/hw/hfi1/driver.c | 19 ++++++++++--- drivers/infiniband/hw/hfi1/hfi.h | 8 +++-- drivers/infiniband/hw/hfi1/init.c | 43 ++++++++++++++++++++-------- drivers/infiniband/hw/hfi1/pcie.c | 3 -- drivers/infiniband/hw/hfi1/platform.c | 1 + drivers/infiniband/hw/hfi1/qsfp.c | 2 + drivers/infiniband/hw/hfi1/ruc.c | 50 ++++++++++++++++++++++++++------- drivers/infiniband/hw/hfi1/ud.c | 6 ++-- 9 files changed, 101 insertions(+), 42 deletions(-) -- -Denny

7 years, 8 months

1
3
0 0

WTF: patch "[PATCH] arm/arm64: KVM: Add PSCI version selection API" was seriously submitted to be applied to the 4.16-stable tree?

by gregkh＠linuxfoundation.org

The patch below was submitted to be applied to the 4.16-stable tree. I fail to see how this patch meets the stable kernel rules as found at Documentation/process/stable-kernel-rules.rst. I could be totally wrong, and if so, please respond to <stable(a)vger.kernel.org> and let me know why this patch should be applied. Otherwise, it is now dropped from my patch queues, never to be seen again. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 85bd0ba1ff9875798fad94218b627ea9f768f3c3 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier(a)arm.com> Date: Sun, 21 Jan 2018 16:42:56 +0000 Subject: [PATCH] arm/arm64: KVM: Add PSCI version selection API Although we've implemented PSCI 0.1, 0.2 and 1.0, we expose either 0.1 or 1.0 to a guest, defaulting to the latest version of the PSCI implementation that is compatible with the requested version. This is no different from doing a firmware upgrade on KVM. But in order to give a chance to hypothetical badly implemented guests that would have a fit by discovering something other than PSCI 0.2, let's provide a new API that allows userspace to pick one particular version of the API. This is implemented as a new class of "firmware" registers, where we expose the PSCI version. This allows the PSCI version to be save/restored as part of a guest migration, and also set to any supported version if the guest requires it. Cc: stable(a)vger.kernel.org #4.16 Reviewed-by: Christoffer Dall <cdall(a)kernel.org> Signed-off-by: Marc Zyngier <marc.zyngier(a)arm.com> diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 1c7958b57fe9..758bf403a169 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -1960,6 +1960,9 @@ ARM 32-bit VFP control registers have the following id bit patterns: ARM 64-bit FP registers have the following id bit patterns: 0x4030 0000 0012 0 <regno:12> +ARM firmware pseudo-registers have the following bit pattern: + 0x4030 0000 0014 <regno:16> + arm64 registers are mapped using the lower 32 bits. The upper 16 of that is the register group type, or coprocessor number: @@ -1976,6 +1979,9 @@ arm64 CCSIDR registers are demultiplexed by CSSELR value: arm64 system registers have the following id bit patterns: 0x6030 0000 0013 <op0:2> <op1:3> <crn:4> <crm:4> <op2:3> +arm64 firmware pseudo-registers have the following bit pattern: + 0x6030 0000 0014 <regno:16> + MIPS registers are mapped using the lower 32 bits. The upper 16 of that is the register group type: @@ -2510,7 +2516,8 @@ Possible features: and execute guest code when KVM_RUN is called. - KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode. Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only). - - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU. + - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 (or a future revision + backward compatible with v0.2) for the CPU. Depends on KVM_CAP_ARM_PSCI_0_2. - KVM_ARM_VCPU_PMU_V3: Emulate PMUv3 for the CPU. Depends on KVM_CAP_ARM_PMU_V3. diff --git a/Documentation/virtual/kvm/arm/psci.txt b/Documentation/virtual/kvm/arm/psci.txt new file mode 100644 index 000000000000..aafdab887b04 --- /dev/null +++ b/Documentation/virtual/kvm/arm/psci.txt @@ -0,0 +1,30 @@ +KVM implements the PSCI (Power State Coordination Interface) +specification in order to provide services such as CPU on/off, reset +and power-off to the guest. + +The PSCI specification is regularly updated to provide new features, +and KVM implements these updates if they make sense from a virtualization +point of view. + +This means that a guest booted on two different versions of KVM can +observe two different "firmware" revisions. This could cause issues if +a given guest is tied to a particular PSCI revision (unlikely), or if +a migration causes a different PSCI version to be exposed out of the +blue to an unsuspecting guest. + +In order to remedy this situation, KVM exposes a set of "firmware +pseudo-registers" that can be manipulated using the GET/SET_ONE_REG +interface. These registers can be saved/restored by userspace, and set +to a convenient value if required. + +The following register is defined: + +* KVM_REG_ARM_PSCI_VERSION: + + - Only valid if the vcpu has the KVM_ARM_VCPU_PSCI_0_2 feature set + (and thus has already been initialized) + - Returns the current PSCI version on GET_ONE_REG (defaulting to the + highest PSCI version implemented by KVM and compatible with v0.2) + - Allows any PSCI version implemented by KVM and compatible with + v0.2 to be set with SET_ONE_REG + - Affects the whole VM (even if the register view is per-vcpu) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index c6a749568dd6..c7c28c885a19 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -77,6 +77,9 @@ struct kvm_arch { /* Interrupt controller */ struct vgic_dist vgic; int max_vcpus; + + /* Mandated version of PSCI */ + u32 psci_version; }; #define KVM_NR_MEM_OBJS 40 diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index 2ba95d6fe852..caae4843cb70 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h @@ -195,6 +195,12 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_VFP_FPINST 0x1009 #define KVM_REG_ARM_VFP_FPINST2 0x100A +/* KVM-as-firmware specific pseudo-registers */ +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM | KVM_REG_SIZE_U64 | \ + KVM_REG_ARM_FW | ((r) & 0xffff)) +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) + /* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index 1e0784ebbfd6..a18f33edc471 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/vmalloc.h> #include <linux/fs.h> +#include <kvm/arm_psci.h> #include <asm/cputype.h> #include <linux/uaccess.h> #include <asm/kvm.h> @@ -176,6 +177,7 @@ static unsigned long num_core_regs(void) unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) { return num_core_regs() + kvm_arm_num_coproc_regs(vcpu) + + kvm_arm_get_fw_num_regs(vcpu) + NUM_TIMER_REGS; } @@ -196,6 +198,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) uindices++; } + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); + if (ret) + return ret; + uindices += kvm_arm_get_fw_num_regs(vcpu); + ret = copy_timer_indices(vcpu, uindices); if (ret) return ret; @@ -214,6 +221,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) return get_core_reg(vcpu, reg); + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) + return kvm_arm_get_fw_reg(vcpu, reg); + if (is_timer_reg(reg->id)) return get_timer_reg(vcpu, reg); @@ -230,6 +240,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) return set_core_reg(vcpu, reg); + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) + return kvm_arm_set_fw_reg(vcpu, reg); + if (is_timer_reg(reg->id)) return set_timer_reg(vcpu, reg); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index ab46bc70add6..469de8acd06f 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -75,6 +75,9 @@ struct kvm_arch { /* Interrupt controller */ struct vgic_dist vgic; + + /* Mandated version of PSCI */ + u32 psci_version; }; #define KVM_NR_MEM_OBJS 40 diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 9abbf3044654..04b3256f8e6d 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -206,6 +206,12 @@ struct kvm_arch_memory_slot { #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) +/* KVM-as-firmware specific pseudo-registers */ +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ + KVM_REG_ARM_FW | ((r) & 0xffff)) +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) + /* Device Control API: ARM VGIC */ #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 959e50d2588c..56a0260ceb11 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -25,6 +25,7 @@ #include <linux/module.h> #include <linux/vmalloc.h> #include <linux/fs.h> +#include <kvm/arm_psci.h> #include <asm/cputype.h> #include <linux/uaccess.h> #include <asm/kvm.h> @@ -205,7 +206,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) { return num_core_regs() + kvm_arm_num_sys_reg_descs(vcpu) - + NUM_TIMER_REGS; + + kvm_arm_get_fw_num_regs(vcpu) + NUM_TIMER_REGS; } /** @@ -225,6 +226,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) uindices++; } + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); + if (ret) + return ret; + uindices += kvm_arm_get_fw_num_regs(vcpu); + ret = copy_timer_indices(vcpu, uindices); if (ret) return ret; @@ -243,6 +249,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) return get_core_reg(vcpu, reg); + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) + return kvm_arm_get_fw_reg(vcpu, reg); + if (is_timer_reg(reg->id)) return get_timer_reg(vcpu, reg); @@ -259,6 +268,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) return set_core_reg(vcpu, reg); + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) + return kvm_arm_set_fw_reg(vcpu, reg); + if (is_timer_reg(reg->id)) return set_timer_reg(vcpu, reg); diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h index e518e4e3dfb5..4b1548129fa2 100644 --- a/include/kvm/arm_psci.h +++ b/include/kvm/arm_psci.h @@ -37,10 +37,15 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) * Our PSCI implementation stays the same across versions from * v0.2 onward, only adding the few mandatory functions (such * as FEATURES with 1.0) that are required by newer - * revisions. It is thus safe to return the latest. + * revisions. It is thus safe to return the latest, unless + * userspace has instructed us otherwise. */ - if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { + if (vcpu->kvm->arch.psci_version) + return vcpu->kvm->arch.psci_version; + return KVM_ARM_PSCI_LATEST; + } return KVM_ARM_PSCI_0_1; } @@ -48,4 +53,11 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); +struct kvm_one_reg; + +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu); +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices); +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); + #endif /* __KVM_ARM_PSCI_H__ */ diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index 6919352cbf15..c4762bef13c6 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -18,6 +18,7 @@ #include <linux/arm-smccc.h> #include <linux/preempt.h> #include <linux/kvm_host.h> +#include <linux/uaccess.h> #include <linux/wait.h> #include <asm/cputype.h> @@ -427,3 +428,62 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) smccc_set_retval(vcpu, val, 0, 0, 0); return 1; } + +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) +{ + return 1; /* PSCI version */ +} + +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) +{ + if (put_user(KVM_REG_ARM_PSCI_VERSION, uindices)) + return -EFAULT; + + return 0; +} + +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) +{ + if (reg->id == KVM_REG_ARM_PSCI_VERSION) { + void __user *uaddr = (void __user *)(long)reg->addr; + u64 val; + + val = kvm_psci_version(vcpu, vcpu->kvm); + if (copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id))) + return -EFAULT; + + return 0; + } + + return -EINVAL; +} + +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) +{ + if (reg->id == KVM_REG_ARM_PSCI_VERSION) { + void __user *uaddr = (void __user *)(long)reg->addr; + bool wants_02; + u64 val; + + if (copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id))) + return -EFAULT; + + wants_02 = test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features); + + switch (val) { + case KVM_ARM_PSCI_0_1: + if (wants_02) + return -EINVAL; + vcpu->kvm->arch.psci_version = val; + return 0; + case KVM_ARM_PSCI_0_2: + case KVM_ARM_PSCI_1_0: + if (!wants_02) + return -EINVAL; + vcpu->kvm->arch.psci_version = val; + return 0; + } + } + + return -EINVAL; +}

7 years, 8 months

4
5
0 0

Add commit 716c7c32eae4 to 4.16 stable

by Tom Lendacky

Hi Greg, Can you add: 716c7c32eae4 ("crypto: ccp - add check to get PSP master only when PSP is detected") to 4.16 stable. This fixes an oops in the CCP module that also prevents the AMD KVM module (kvm_amd) from being able to load. Thanks, Tom

7 years, 8 months

2
1
0 0

[PATCH v2 2/2] x86/mm: implement free pmd/pte page interfaces

by Toshi Kani

Implement pud_free_pmd_page() and pmd_free_pte_page() on x86, which clear a given pud/pmd entry and free up lower level page table(s). Address range associated with the pud/pmd entry must have been purged by INVLPG. fixes: e61ce6ade404e ("mm: change ioremap to set up huge I/O mappings") Signed-off-by: Toshi Kani <toshi.kani(a)hpe.com> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: Borislav Petkov <bp(a)suse.de> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: <stable(a)vger.kernel.org> --- arch/x86/mm/pgtable.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 1eed7ed518e6..34cda7e0551b 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -712,7 +712,22 @@ int pmd_clear_huge(pmd_t *pmd) */ int pud_free_pmd_page(pud_t *pud) { - return pud_none(*pud); + pmd_t *pmd; + int i; + + if (pud_none(*pud)) + return 1; + + pmd = (pmd_t *)pud_page_vaddr(*pud); + + for (i = 0; i < PTRS_PER_PMD; i++) + if (!pmd_free_pte_page(&pmd[i])) + return 0; + + pud_clear(pud); + free_page((unsigned long)pmd); + + return 1; } /** @@ -724,6 +739,15 @@ int pud_free_pmd_page(pud_t *pud) */ int pmd_free_pte_page(pmd_t *pmd) { - return pmd_none(*pmd); + pte_t *pte; + + if (pmd_none(*pmd)) + return 1; + + pte = (pte_t *)pmd_page_vaddr(*pmd); + pmd_clear(pmd); + free_page((unsigned long)pte); + + return 1; } #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */

7 years, 8 months

6
19
0 0

Linux 4.16.6

by Greg KH

I'm announcing the release of the 4.16.6 kernel. All users of the 4.16 kernel series must upgrade. The updated 4.16.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.16.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/networking/ip-sysctl.txt | 8 Makefile | 2 arch/s390/kernel/perf_cpum_cf_events.c | 8 arch/s390/kernel/uprobes.c | 9 drivers/acpi/acpi_video.c | 27 + drivers/block/swim.c | 49 +- drivers/block/swim3.c | 6 drivers/cdrom/cdrom.c | 2 drivers/char/tpm/tpm-interface.c | 131 +++++-- drivers/char/tpm/tpm.h | 1 drivers/char/tpm/tpm_crb.c | 108 ++++-- drivers/char/tpm/tpm_tis_core.c | 4 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 drivers/hwmon/k10temp.c | 17 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 16 drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 196 +++++++++-- drivers/net/ethernet/amd/xgbe/xgbe.h | 9 drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 16 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 49 +- drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 drivers/net/ethernet/marvell/mvpp2.c | 12 drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 7 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/macsec.c | 5 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +- drivers/net/tun.c | 7 drivers/net/usb/qmi_wwan.c | 1 drivers/net/virtio_net.c | 79 ++-- drivers/net/vmxnet3/vmxnet3_drv.c | 17 drivers/net/vmxnet3/vmxnet3_int.h | 4 drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/pinctrl/intel/pinctrl-intel.c | 23 - drivers/s390/block/dasd_alias.c | 13 drivers/s390/cio/chsc.c | 14 drivers/s390/net/qeth_core.h | 2 drivers/s390/net/qeth_core_main.c | 115 ++---- include/linux/fsnotify_backend.h | 4 include/linux/hmm.h | 9 include/linux/if_vlan.h | 7 include/linux/tpm.h | 2 include/net/ife.h | 3 include/net/llc_conn.h | 1 kernel/kprobes.c | 2 kernel/trace/trace_entries.h | 2 net/core/dev.c | 2 net/core/neighbour.c | 40 +- net/dns_resolver/dns_key.c | 12 net/ife/ife.c | 38 ++ net/ipv4/tcp.c | 8 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/ipv6/seg6_iptunnel.c | 2 net/l2tp/l2tp_core.c | 40 +- net/l2tp/l2tp_core.h | 3 net/l2tp/l2tp_debugfs.c | 18 - net/l2tp/l2tp_netlink.c | 11 net/l2tp/l2tp_ppp.c | 34 + net/llc/af_llc.c | 14 net/llc/llc_c_ac.c | 9 net/llc/llc_conn.c | 22 + net/packet/af_packet.c | 83 +++- net/packet/internal.h | 10 net/sched/act_ife.c | 9 net/sctp/ipv6.c | 60 +-- net/smc/af_smc.c | 10 net/strparser/strparser.c | 9 net/tipc/netlink.c | 3 net/vmw_vsock/af_vsock.c | 6 security/commoncap.c | 2 80 files changed, 1083 insertions(+), 479 deletions(-) Ahmed Abdelsalam (1): ipv6: sr: fix NULL pointer dereference in seg6_do_srh_encap()- v4 pkts Alexander Aring (3): net: sched: ife: signal not finding metaid net: sched: ife: handle malformed tlv length net: sched: ife: check on metadata length André Wild (1): s390/cpum_cf: rename IBM z13/z14 counter names Bjørn Mork (1): tun: fix vlan packet truncation Cong Wang (3): llc: delete timers synchronously in llc_sk_free() llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (2): Revert "macsec: missing dev_put() on error in macsec_newlink()" cdrom: information leak in cdrom_ioctl_media_changed() Doron Roberts-Kedes (2): strparser: Do not call mod_delayed_work with a timeout of LONG_MAX strparser: Fix incorrect strp->need_bytes value. Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (5): ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy net: af_packet: fix race in PACKET_{R|T}X_RING tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets tipc: add policy for TIPC_NLA_NET_ADDR net: validate attribute sizes in neigh_dump_table() Finn Thain (8): m68k/mac: Don't remap SWIM MMIO region block/swim: Check drive type block/swim: Don't log an error message for an invalid ioctl block/swim: Remove extra put_disk() call from error path block/swim: Rename macros to avoid inconsistent inverted logic block/swim: Select appropriate drive on device open block/swim: Fix array bounds check block/swim: Fix IO error at end of medium Greg Kroah-Hartman (3): Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" Revert "mm/hmm: fix header file if/else/endif maze" Linux 4.16.6 Guenter Roeck (2): hwmon: (k10temp) Add temperature offset for Ryzen 2700X hwmon: (k10temp) Add support for AMD Ryzen w/ Vega graphics Guillaume Nault (6): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() l2tp: hold reference on tunnels in netlink dumps l2tp: hold reference on tunnels printed in pppol2tp proc file l2tp: hold reference on tunnels printed in l2tp/tunnels debugfs file l2tp: fix {pppol2tp, l2tp_dfs}_seq_stop() in case of seq_file overflow Hans de Goede (1): ACPI / video: Only default only_lcd to true on Win8-ready _desktops_ Heiko Carstens (1): s390/uprobes: implement arch_uretprobe_is_alive() Igor Russkikh (2): net: aquantia: Regression on reset with 1.x firmware net: aquantia: oops when shutdown on already stopped device Ivan Khoronzhuk (1): net: ethernet: ti: cpsw: fix tx vlan priority mapping James Bottomley (1): tpm: add retry logic Jann Horn (1): tcp: don't read out-of-bounds opsize Jason Wang (1): virtio-net: add missing virtqueue kick when flushing packets Jose Abreu (1): net: stmmac: Disable ACS Feature for GMAC >= 4 Julian Wiedmann (3): s390/qeth: fix error handling in adapter command callbacks s390/qeth: avoid control IO completion stalls s390/qeth: handle failure on workqueue creation Karthikeyan Periyasamy (1): Revert "ath10k: send (re)assoc peer command when NSS changed" Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Maxime Chevallier (1): net: mvpp2: Fix DMA address mask size Michael S. Tsirkin (2): virtio_net: split out ctrl buffer virtio_net: fix adding vids on big-endian Neil Armstrong (1): drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs Olivier Gayot (1): docs: ip-sysctl.txt: fix name of some ipv6 variables Paolo Abeni (1): team: avoid adding twice the same option to the event list Pawel Dembicki (1): net: qmi_wwan: add Wistron Neweb D19Q1 Paweł Jabłoński (1): i40e: Fix attach VF to VM issue Peter Xu (1): tracing: Fix missing tab for hwlat_detector print format Robert Kolchmeyer (1): fsnotify: Fix fsnotify_mark_connector race Ronak Doshi (1): vmxnet3: fix incorrect dereference when rxvlan is disabled Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Soheil Hassas Yeganeh (1): tcp: clear tp->packets_out when purging write queue Stefan Haberland (1): s390/dasd: fix IO error for newly defined devices Stefan Hajnoczi (1): VSOCK: make af_vsock.ko removable again Tetsuo Handa (1): commoncap: Handle memory allocation failure. Thomas Richter (1): kprobes: Fix random address output of blacklist file Tom Lendacky (3): amd-xgbe: Add pre/post auto-negotiation phy hooks amd-xgbe: Improve KR auto-negotiation and training amd-xgbe: Only use the SFP supported transceiver signals Tomas Winkler (1): tpm: cmd_ready command can be issued only after granting locality Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Ursula Braun (1): net/smc: fix shutdown in state SMC_LISTEN Vasundhara Volam (1): bnxt_en: Fix memory fault in bnxt_ethtool_init() Willem de Bruijn (1): packet: fix bitfield update race Winkler, Tomas (1): tpm: tpm-interface: fix tpm_transmit/_cmd kdoc Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xin Long (3): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave sctp: do not check port in sctp_inet6_cmp_addr team: fix netconsole setup over team

7 years, 8 months

1
1
0 0

Linux 4.14.38

by Greg KH

I'm announcing the release of the 4.14.38 kernel. All users of the 4.14 kernel series must upgrade. The updated 4.14.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/admin-guide/kernel-parameters.txt | 3 Makefile | 2 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 11 arch/microblaze/Kconfig.platform | 1 arch/microblaze/lib/fastcopy.S | 4 arch/s390/Kconfig | 47 +++ arch/s390/Makefile | 10 arch/s390/include/asm/alternative.h | 149 ++++++++++++ arch/s390/include/asm/barrier.h | 24 ++ arch/s390/include/asm/facility.h | 18 + arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/asm/lowcore.h | 7 arch/s390/include/asm/nospec-branch.h | 17 + arch/s390/include/asm/processor.h | 4 arch/s390/include/asm/thread_info.h | 4 arch/s390/include/uapi/asm/kvm.h | 5 arch/s390/kernel/Makefile | 6 arch/s390/kernel/alternative.c | 112 +++++++++ arch/s390/kernel/early.c | 5 arch/s390/kernel/entry.S | 250 ++++++++++++++++++--- arch/s390/kernel/ipl.c | 1 arch/s390/kernel/module.c | 65 +++++ arch/s390/kernel/nospec-branch.c | 169 ++++++++++++++ arch/s390/kernel/processor.c | 18 + arch/s390/kernel/setup.c | 14 + arch/s390/kernel/smp.c | 7 arch/s390/kernel/uprobes.c | 9 arch/s390/kernel/vmlinux.lds.S | 37 +++ arch/s390/kvm/kvm-s390.c | 12 + arch/s390/kvm/vsie.c | 30 ++ drivers/acpi/acpi_video.c | 27 ++ drivers/block/swim.c | 49 +--- drivers/block/swim3.c | 6 drivers/cdrom/cdrom.c | 2 drivers/char/tpm/tpm-interface.c | 131 ++++++++--- drivers/char/tpm/tpm.h | 1 drivers/char/tpm/tpm_crb.c | 108 ++++++--- drivers/char/tpm/tpm_tis_core.c | 4 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 3 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 16 + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 +- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 196 ++++++++++++++-- drivers/net/ethernet/amd/xgbe/xgbe.h | 9 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 ++- drivers/net/virtio_net.c | 68 +++-- drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/pinctrl/intel/pinctrl-intel.c | 23 - drivers/s390/block/dasd_alias.c | 13 - drivers/s390/char/Makefile | 2 drivers/s390/cio/chsc.c | 14 - include/linux/fsnotify_backend.h | 4 include/linux/hmm.h | 9 include/linux/if_vlan.h | 7 include/linux/tpm.h | 2 include/net/ife.h | 3 include/net/llc_conn.h | 1 include/net/tcp.h | 1 include/uapi/linux/kvm.h | 1 kernel/trace/trace_entries.h | 2 net/core/dev.c | 2 net/core/neighbour.c | 40 ++- net/dns_resolver/dns_key.c | 13 - net/ife/ife.c | 38 +++ net/ipv4/tcp.c | 7 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/ipv6/seg6_iptunnel.c | 2 net/l2tp/l2tp_ppp.c | 7 net/llc/af_llc.c | 14 + net/llc/llc_c_ac.c | 9 net/llc/llc_conn.c | 22 + net/packet/af_packet.c | 83 ++++-- net/packet/internal.h | 10 net/sched/act_ife.c | 9 net/sctp/ipv6.c | 60 ++--- net/smc/af_smc.c | 10 net/strparser/strparser.c | 9 net/tipc/netlink.c | 3 security/commoncap.c | 2 87 files changed, 1835 insertions(+), 359 deletions(-) Ahmed Abdelsalam (1): ipv6: sr: fix NULL pointer dereference in seg6_do_srh_encap()- v4 pkts Alexander Aring (3): net: sched: ife: signal not finding metaid net: sched: ife: handle malformed tlv length net: sched: ife: check on metadata length Christian Borntraeger (3): KVM: s390: wire up bpb feature KVM: s390: force bp isolation for VSIE s390/entry.S: fix spurious zeroing of r0 Cong Wang (3): llc: delete timers synchronously in llc_sk_free() llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (1): cdrom: information leak in cdrom_ioctl_media_changed() Doron Roberts-Kedes (2): strparser: Do not call mod_delayed_work with a timeout of LONG_MAX strparser: Fix incorrect strp->need_bytes value. Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (5): ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy net: validate attribute sizes in neigh_dump_table() net: af_packet: fix race in PACKET_{R|T}X_RING tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets tipc: add policy for TIPC_NLA_NET_ADDR Eugeniu Rosca (1): s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) Finn Thain (8): m68k/mac: Don't remap SWIM MMIO region block/swim: Check drive type block/swim: Don't log an error message for an invalid ioctl block/swim: Remove extra put_disk() call from error path block/swim: Rename macros to avoid inconsistent inverted logic block/swim: Select appropriate drive on device open block/swim: Fix array bounds check block/swim: Fix IO error at end of medium Greg Kroah-Hartman (3): Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" Revert "mm/hmm: fix header file if/else/endif maze" Linux 4.14.38 Guillaume Nault (2): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() Hans de Goede (1): ACPI / video: Only default only_lcd to true on Win8-ready _desktops_ Heiko Carstens (2): s390: enable CPU alternatives unconditionally s390/uprobes: implement arch_uretprobe_is_alive() Ivan Khoronzhuk (1): net: ethernet: ti: cpsw: fix tx vlan priority mapping James Bottomley (1): tpm: add retry logic Jann Horn (1): tcp: don't read out-of-bounds opsize Karthikeyan Periyasamy (1): Revert "ath10k: send (re)assoc peer command when NSS changed" Klaus Goger (1): arm64: dts: rockchip: remove vdd_log from rk3399-puma Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Martin Schwidefsky (13): s390: scrub registers on kernel entry and KVM exit s390: add optimized array_index_mask_nospec s390/alternative: use a copy of the facility bit mask s390: add options to change branch prediction behaviour for the kernel s390: run user space and KVM guests with modified branch prediction s390: introduce execute-trampolines for branches s390: do not bypass BPENTER for interrupt system calls s390: move nobp parameter functions to nospec-branch.c s390: add automatic detection of the spectre defense s390: report spectre mitigation via syslog s390: add sysfs attributes for spectre s390: correct nospec auto detection init order s390: correct module section names for expoline code revert Michael S. Tsirkin (2): virtio_net: split out ctrl buffer virtio_net: fix adding vids on big-endian Michal Simek (1): microblaze: Setup dependencies for ASM optimized lib functions Neil Armstrong (1): drm: bridge: dw-hdmi: Fix overflow workaround for Amlogic Meson GX SoCs Paolo Abeni (1): team: avoid adding twice the same option to the event list Paweł Jabłoński (1): i40e: Fix attach VF to VM issue Peter Xu (1): tracing: Fix missing tab for hwlat_detector print format Robert Kolchmeyer (1): fsnotify: Fix fsnotify_mark_connector race Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Soheil Hassas Yeganeh (1): tcp: clear tp->packets_out when purging write queue Stefan Haberland (1): s390/dasd: fix IO error for newly defined devices Tetsuo Handa (1): commoncap: Handle memory allocation failure. Tom Lendacky (3): amd-xgbe: Add pre/post auto-negotiation phy hooks amd-xgbe: Improve KR auto-negotiation and training amd-xgbe: Only use the SFP supported transceiver signals Tomas Winkler (1): tpm: cmd_ready command can be issued only after granting locality Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Ursula Braun (1): net/smc: fix shutdown in state SMC_LISTEN Vasily Gorbik (1): s390: introduce CPU alternatives Willem de Bruijn (1): packet: fix bitfield update race Winkler, Tomas (1): tpm: tpm-interface: fix tpm_transmit/_cmd kdoc Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xin Long (3): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team sctp: do not check port in sctp_inet6_cmp_addr

7 years, 8 months

1
1
0 0

Linux 4.9.97

by Greg KH

I'm announcing the release of the 4.9.97 kernel. All users of the 4.9 kernel series must upgrade. The updated 4.9.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/kernel-parameters.txt | 3 Makefile | 2 arch/mips/Kconfig | 1 arch/s390/Kconfig | 47 +++++ arch/s390/Makefile | 10 + arch/s390/include/asm/alternative.h | 149 +++++++++++++++++ arch/s390/include/asm/barrier.h | 24 ++ arch/s390/include/asm/facility.h | 18 ++ arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/asm/lowcore.h | 7 arch/s390/include/asm/nospec-branch.h | 17 + arch/s390/include/asm/processor.h | 4 arch/s390/include/asm/thread_info.h | 4 arch/s390/include/uapi/asm/kvm.h | 5 arch/s390/kernel/Makefile | 6 arch/s390/kernel/alternative.c | 112 ++++++++++++ arch/s390/kernel/early.c | 5 arch/s390/kernel/entry.S | 250 ++++++++++++++++++++++++++--- arch/s390/kernel/ipl.c | 1 arch/s390/kernel/module.c | 65 +++++++ arch/s390/kernel/nospec-branch.c | 169 +++++++++++++++++++ arch/s390/kernel/processor.c | 18 ++ arch/s390/kernel/setup.c | 14 + arch/s390/kernel/smp.c | 7 arch/s390/kernel/uprobes.c | 9 + arch/s390/kernel/vmlinux.lds.S | 37 ++++ arch/s390/kvm/kvm-s390.c | 13 + arch/s390/kvm/vsie.c | 30 +++ arch/x86/kernel/tsc.c | 2 drivers/acpi/acpi_video.c | 27 ++- drivers/cdrom/cdrom.c | 2 drivers/gpu/drm/drm_dp_dual_mode_helper.c | 39 +++- drivers/gpu/drm/i915/i915_drv.h | 6 drivers/gpu/drm/i915/intel_display.c | 9 - drivers/gpu/drm/i915/intel_pm.c | 6 drivers/gpu/drm/vc4/vc4_bo.c | 2 drivers/gpu/drm/vc4/vc4_validate_shaders.c | 1 drivers/i2c/busses/i2c-i801.c | 29 +++ drivers/infiniband/hw/mlx5/qp.c | 3 drivers/input/misc/drv260x.c | 2 drivers/media/usb/stkwebcam/stk-sensor.c | 6 drivers/media/usb/stkwebcam/stk-webcam.c | 11 - drivers/media/usb/stkwebcam/stk-webcam.h | 2 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/ti/cpsw.c | 2 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +++- drivers/net/usb/cdc_ether.c | 10 + drivers/net/usb/r8152.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/net/wireless/ath/ath9k/hw.c | 4 drivers/net/wireless/mac80211_hwsim.c | 7 drivers/of/base.c | 2 drivers/pci/pci.c | 52 ++++-- drivers/pinctrl/intel/pinctrl-intel.c | 23 -- drivers/power/supply/bq2415x_charger.c | 5 drivers/s390/block/dasd_alias.c | 13 + drivers/s390/char/Makefile | 2 drivers/s390/cio/chsc.c | 14 + drivers/usb/musb/musb_core.c | 8 fs/cifs/dir.c | 9 - fs/jbd2/journal.c | 2 include/linux/if_vlan.h | 7 include/net/llc_conn.h | 1 include/uapi/linux/kvm.h | 1 kernel/events/callchain.c | 21 +- kernel/events/core.c | 4 net/core/dev.c | 2 net/core/neighbour.c | 40 +++- net/dns_resolver/dns_key.c | 13 - net/ipv4/tcp.c | 6 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/l2tp/l2tp_ppp.c | 7 net/llc/af_llc.c | 14 + net/llc/llc_c_ac.c | 9 - net/llc/llc_conn.c | 22 ++ net/packet/af_packet.c | 82 ++++++--- net/packet/internal.h | 10 - net/sched/act_ife.c | 2 net/sctp/ipv6.c | 60 +++--- net/strparser/strparser.c | 7 net/tipc/netlink.c | 3 tools/perf/util/dso.c | 16 - 85 files changed, 1458 insertions(+), 261 deletions(-) Alexander Aring (1): net: sched: ife: signal not finding metaid Andreas Kemnade (1): usb: musb: fix enumeration after resume Benjamin Beichler (1): mac80211_hwsim: fix use-after-free bug in hwsim_exit_net Benjamin Tissoires (1): i2c: i801: store and restore the SLVCMD register at load and unload Christian Borntraeger (3): KVM: s390: wire up bpb feature KVM: s390: force bp isolation for VSIE s390/entry.S: fix spurious zeroing of r0 Colin Ian King (1): power: supply: bq2415x: check for NULL acpi_id to avoid null pointer dereference Cong Wang (3): llc: delete timers synchronously in llc_sk_free() llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (2): stk-webcam: fix an endian bug in stk_camera_read_reg() cdrom: information leak in cdrom_ioctl_media_changed() Daniel J Blueman (1): drm/vc4: Fix memory leak during BO teardown Dmitry Torokhov (1): Input: drv260x - fix initializing overdrive voltage Doron Roberts-Kedes (1): strparser: Fix incorrect strp->need_bytes value. Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (5): net: validate attribute sizes in neigh_dump_table() tipc: add policy for TIPC_NLA_NET_ADDR tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: af_packet: fix race in PACKET_{R|T}X_RING ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy Eugeniu Rosca (1): s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) Felix Fietkau (1): ath9k_hw: check if the chip failed to wake up Grant Grundler (1): r8152: add Linksys USB3GIGV1 id Greg Kroah-Hartman (3): Revert "perf tools: Decompress kernel module when reading DSO data" Revert "pinctrl: intel: Initialize GPIO properly when used through irqchip" Linux 4.9.97 Guillaume Nault (2): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() Hans de Goede (1): ACPI / video: Only default only_lcd to true on Win8-ready _desktops_ Heiko Carstens (2): s390: enable CPU alternatives unconditionally s390/uprobes: implement arch_uretprobe_is_alive() Imre Deak (2): drm/i915: Fix LSPCON TMDS output buffer enabling from low-power state drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing Ivan Khoronzhuk (1): net: ethernet: ti: cpsw: fix tx vlan priority mapping Jann Horn (1): tcp: don't read out-of-bounds opsize Jean Delvare (2): i2c: i801: Save register SMBSLVCMD value only once i2c: i801: Restore configuration at shutdown Jiri Olsa (2): perf: Fix sample_max_stack maximum check perf: Return proper values for user stack errors Karthikeyan Periyasamy (1): Revert "ath10k: send (re)assoc peer command when NSS changed" Leon Romanovsky (1): RDMA/mlx5: Fix NULL dereference while accessing XRC_TGT QPs Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Martin Schwidefsky (13): s390: scrub registers on kernel entry and KVM exit s390: add optimized array_index_mask_nospec s390/alternative: use a copy of the facility bit mask s390: add options to change branch prediction behaviour for the kernel s390: run user space and KVM guests with modified branch prediction s390: introduce execute-trampolines for branches s390: do not bypass BPENTER for interrupt system calls s390: move nobp parameter functions to nospec-branch.c s390: add automatic detection of the spectre defense s390: report spectre mitigation via syslog s390: add sysfs attributes for spectre s390: correct nospec auto detection init order s390: correct module section names for expoline code revert Matt Redfearn (1): MIPS: Generic: Fix big endian CPUs on generic machine Merlijn Wajer (2): usb: musb: call pm_runtime_{get,put}_sync before reading vbus registers usb: musb: Fix external abort in musb_remove on omap2430 Paolo Abeni (1): team: avoid adding twice the same option to the event list Paul Burton (1): OF: Prevent unaligned access in of_alias_scan() Sahitya Tummala (1): jbd2: fix use after free in kjournald2() Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Sinan Kaya (1): PCI: Wait up to 60 seconds for device to become ready after FLR Stefan Haberland (1): s390/dasd: fix IO error for newly defined devices Steve French (1): cifs: do not allow creating sockets except with SMB1 posix exensions Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Vasily Gorbik (1): s390: introduce CPU alternatives Willem de Bruijn (1): packet: fix bitfield update race Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xiaoming Gao (1): x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Xin Long (3): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team sctp: do not check port in sctp_inet6_cmp_addr

7 years, 8 months

1
1
0 0

Linux 4.4.130

by Greg KH

I'm announcing the release of the 4.4.130 kernel. All users of the 4.4 kernel series must upgrade. The updated 4.4.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Documentation/kernel-parameters.txt | 3 Makefile | 2 arch/s390/Kconfig | 47 ++++ arch/s390/Makefile | 10 + arch/s390/include/asm/alternative.h | 149 +++++++++++++++ arch/s390/include/asm/barrier.h | 24 ++ arch/s390/include/asm/facility.h | 18 + arch/s390/include/asm/kvm_host.h | 3 arch/s390/include/asm/lowcore.h | 7 arch/s390/include/asm/nospec-branch.h | 17 + arch/s390/include/asm/processor.h | 4 arch/s390/include/asm/thread_info.h | 4 arch/s390/include/uapi/asm/kvm.h | 3 arch/s390/kernel/Makefile | 5 arch/s390/kernel/alternative.c | 112 +++++++++++ arch/s390/kernel/early.c | 5 arch/s390/kernel/entry.S | 250 +++++++++++++++++++++++--- arch/s390/kernel/ipl.c | 1 arch/s390/kernel/module.c | 65 ++++++ arch/s390/kernel/nospec-branch.c | 169 +++++++++++++++++ arch/s390/kernel/processor.c | 18 + arch/s390/kernel/setup.c | 14 + arch/s390/kernel/smp.c | 7 arch/s390/kernel/uprobes.c | 9 arch/s390/kernel/vmlinux.lds.S | 37 +++ arch/s390/kvm/kvm-s390.c | 12 + arch/x86/kernel/tsc.c | 2 drivers/cdrom/cdrom.c | 2 drivers/input/misc/drv260x.c | 2 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 drivers/net/ppp/pppoe.c | 4 drivers/net/team/team.c | 38 +++ drivers/net/usb/cdc_ether.c | 10 + drivers/net/usb/r8152.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 5 drivers/net/wireless/ath/ath9k/hw.c | 4 drivers/s390/char/Makefile | 2 drivers/s390/cio/chsc.c | 14 + drivers/staging/android/ion/ion_system_heap.c | 2 fs/cifs/dir.c | 9 fs/jbd2/journal.c | 2 include/linux/if_vlan.h | 7 include/net/llc_conn.h | 1 include/uapi/linux/kvm.h | 1 kernel/events/core.c | 4 net/core/dev.c | 2 net/core/neighbour.c | 40 ++-- net/dns_resolver/dns_key.c | 13 - net/ipv4/tcp.c | 6 net/ipv4/tcp_input.c | 7 net/ipv6/route.c | 2 net/l2tp/l2tp_ppp.c | 7 net/llc/af_llc.c | 14 + net/llc/llc_c_ac.c | 9 net/llc/llc_conn.c | 22 ++ net/packet/af_packet.c | 88 ++++++--- net/packet/internal.h | 10 - net/sctp/ipv6.c | 60 +++--- net/tipc/net.c | 3 60 files changed, 1227 insertions(+), 166 deletions(-) Chen Feng (1): staging: ion : Donnot wakeup kswapd in ion system alloc Christian Borntraeger (2): KVM: s390: wire up bpb feature s390/entry.S: fix spurious zeroing of r0 Cong Wang (3): llc: delete timers synchronously in llc_sk_free() llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED Dan Carpenter (1): cdrom: information leak in cdrom_ioctl_media_changed() Dmitry Torokhov (1): Input: drv260x - fix initializing overdrive voltage Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (5): net: validate attribute sizes in neigh_dump_table() tipc: add policy for TIPC_NLA_NET_ADDR tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: af_packet: fix race in PACKET_{R|T}X_RING ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy Eugeniu Rosca (1): s390: Replace IS_ENABLED(EXPOLINE_*) with IS_ENABLED(CONFIG_EXPOLINE_*) Felix Fietkau (1): ath9k_hw: check if the chip failed to wake up Grant Grundler (1): r8152: add Linksys USB3GIGV1 id Greg Kroah-Hartman (1): Linux 4.4.130 Guillaume Nault (2): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() Heiko Carstens (2): s390: enable CPU alternatives unconditionally s390/uprobes: implement arch_uretprobe_is_alive() Jann Horn (1): tcp: don't read out-of-bounds opsize Jiri Olsa (1): perf: Return proper values for user stack errors Karthikeyan Periyasamy (1): Revert "ath10k: send (re)assoc peer command when NSS changed" Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Martin Schwidefsky (13): s390: scrub registers on kernel entry and KVM exit s390: add optimized array_index_mask_nospec s390/alternative: use a copy of the facility bit mask s390: add options to change branch prediction behaviour for the kernel s390: run user space and KVM guests with modified branch prediction s390: introduce execute-trampolines for branches s390: do not bypass BPENTER for interrupt system calls s390: move nobp parameter functions to nospec-branch.c s390: add automatic detection of the spectre defense s390: report spectre mitigation via syslog s390: add sysfs attributes for spectre s390: correct nospec auto detection init order s390: correct module section names for expoline code revert Paolo Abeni (1): team: avoid adding twice the same option to the event list Sahitya Tummala (1): jbd2: fix use after free in kjournald2() Sebastian Ott (1): s390/cio: update chpid descriptor after resource accessibility event Steve French (1): cifs: do not allow creating sockets except with SMB1 posix exensions Toshiaki Makita (1): vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi Vasily Gorbik (1): s390: introduce CPU alternatives Willem de Bruijn (1): packet: fix bitfield update race Wolfgang Bumiller (1): net: fix deadlock while clearing neighbor proxy table Xiaoming Gao (1): x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Xin Long (3): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team sctp: do not check port in sctp_inet6_cmp_addr

7 years, 8 months

1
1
0 0

Linux 3.18.107

by Greg KH

I'm announcing the release of the 3.18.107 kernel. All users of the 3.18 kernel series must upgrade. The updated 3.18.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 arch/x86/kernel/tsc.c | 2 drivers/cdrom/cdrom.c | 2 drivers/message/fusion/mptsas.c | 1 drivers/net/bonding/bond_main.c | 3 - drivers/net/ppp/pppoe.c | 4 + drivers/net/team/team.c | 38 ++++++++++++++--- fs/cifs/dir.c | 9 ++-- fs/ext4/balloc.c | 3 - fs/ext4/ialloc.c | 43 +------------------ fs/ext4/inline.c | 66 +++++++++++++----------------- fs/ext4/inode.c | 2 fs/ext4/xattr.c | 30 +++++-------- fs/ext4/xattr.h | 32 ++++++++++++++ fs/jbd2/journal.c | 2 include/net/llc_conn.h | 1 kernel/events/core.c | 4 - mm/filemap.c | 4 - net/dns_resolver/dns_key.c | 13 ++--- net/ipv4/tcp.c | 6 +- net/ipv4/tcp_input.c | 7 --- net/ipv6/route.c | 2 net/l2tp/l2tp_ppp.c | 7 +++ net/llc/af_llc.c | 14 +++++- net/llc/llc_c_ac.c | 9 ---- net/llc/llc_conn.c | 22 +++++++++- net/packet/af_packet.c | 88 ++++++++++++++++++++++++++++------------ net/packet/internal.h | 10 ++-- 28 files changed, 253 insertions(+), 173 deletions(-) Cong Wang (3): llc: hold llc_sap before release_sock() llc: fix NULL pointer deref for SOCK_ZAPPED llc: delete timers synchronously in llc_sk_free() Dan Carpenter (1): cdrom: information leak in cdrom_ioctl_media_changed() Eric Biggers (1): KEYS: DNS: limit the length of option strings Eric Dumazet (3): tcp: md5: reject TCP_MD5SIG or TCP_MD5SIG_EXT on established sockets net: af_packet: fix race in PACKET_{R|T}X_RING ipv6: add RTA_TABLE and RTA_PREFSRC to rtm_ipv6_policy Greg Kroah-Hartman (1): Linux 3.18.107 Guillaume Nault (2): l2tp: check sockaddr length in pppol2tp_connect() pppoe: check sockaddr length in pppoe_connect() Jann Horn (1): tcp: don't read out-of-bounds opsize Jiri Olsa (1): perf: Return proper values for user stack errors Martin K. Petersen (1): scsi: mptsas: Disable WRITE SAME Matthew Wilcox (1): mm/filemap.c: fix NULL pointer in page_cache_tree_insert() Paolo Abeni (1): team: avoid adding twice the same option to the event list Sahitya Tummala (1): jbd2: fix use after free in kjournald2() Steve French (1): cifs: do not allow creating sockets except with SMB1 posix exensions Theodore Ts'o (2): ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea() ext4: don't update checksum of new initialized bitmaps Willem de Bruijn (1): packet: fix bitfield update race Xiaoming Gao (1): x86/tsc: Prevent 32bit truncation in calc_hpet_ref() Xin Long (2): bonding: do not set slave_dev npinfo before slave_enable_netpoll in bond_enslave team: fix netconsole setup over team wangguang (1): ext4: bugfix for mmaped pages in mpage_release_unused_pages()

7 years, 8 months

1
1
0 0

[PATCH] Bluetooth: btusb: Add Dell XPS 13 9360 to btusb_needs_reset_resume_table

by Hans de Goede

The Dell XPS 13 9360 uses a QCA Rome chip which needs to be reset (and have its firmware reloaded) for bluetooth to work after suspend/resume. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836 Cc: stable(a)vger.kernel.org Cc: Garrett LeSage <glesage(a)redhat.com> Reported-and-tested-by: Garrett LeSage <glesage(a)redhat.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/bluetooth/btusb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index ee31c997e695..55693648b211 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -399,6 +399,13 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 3060"), }, }, + { + /* Dell XPS 9360 (QCA ROME device 0cf3:e300) */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"), + }, + }, {} }; -- 2.17.0

7 years, 8 months

2
1
0 0

[PATCH] Bluetooth: btusb: Only check needs_reset_resume DMI table for QCA rome chipsets

by Hans de Goede

Jeremy Cline correctly points out in rhbz#1514836 that a device where the QCA rome chipset needs the USB_QUIRK_RESET_RESUME quirk, may also ship with a different wifi/bt chipset in some configurations. If that is the case then we are needlessly penalizing those other chipsets with a reset-resume quirk, typically causing 0.4W extra power use because this disables runtime-pm. This commit moves the DMI table check to a btusb_check_needs_reset_resume() helper (so that we can easily also call it for other chipsets) and calls this new helper only for QCA_ROME chipsets for now. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836 Cc: stable(a)vger.kernel.org Cc: Jeremy Cline <jcline(a)redhat.com> Suggested-by: Jeremy Cline <jcline(a)redhat.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/bluetooth/btusb.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index f064984c9ec0..15e7cdca6eb5 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2863,6 +2863,12 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) } #endif +static void btusb_check_needs_reset_resume(struct usb_interface *intf) +{ + if (dmi_check_system(btusb_needs_reset_resume_table)) + interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME; +} + static int btusb_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -2985,9 +2991,6 @@ static int btusb_probe(struct usb_interface *intf, hdev->send = btusb_send_frame; hdev->notify = btusb_notify; - if (dmi_check_system(btusb_needs_reset_resume_table)) - interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME; - #ifdef CONFIG_PM err = btusb_config_oob_wake(hdev); if (err) @@ -3076,6 +3079,7 @@ static int btusb_probe(struct usb_interface *intf, data->setup_on_usb = btusb_setup_qca; hdev->set_bdaddr = btusb_set_bdaddr_ath3012; set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); + btusb_check_needs_reset_resume(intf); } #ifdef CONFIG_BT_HCIBTUSB_RTL -- 2.17.0

7 years, 8 months

3
4
0 0

[RESEND PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake

by ianwmorrison＠gmail.com

From: Ian W MORRISON <ianwmorrison(a)gmail.com> As the Geminilake firmware is now merged to linux-firmware.git use MODUE_FIRMWARE to load the firmware. This removes the error message in the dmesg log: i915 0000:00:02.0: Direct firmware load for i915/glk_dmc_ver1_04.bin failed with error -2 i915 0000:00:02.0: Failed to load DMC firmware i915/glk_dmc_ver1_04.bin. Disabling runtime power management. i915 0000:00:02.0: DMC firmware homepage: https://01.org/linuxgraphics/downloads/firmware and now shows that the firmware has correctly loaded: [drm] Finished loading DMC firmware i915/glk_dmc_ver1_04.bin (v1.4) Cc: stable(a)vger.kernel.org Signed-off-by: Ian W MORRISON <ianwmorrison(a)gmail.com> --- drivers/gpu/drm/i915/intel_csr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index 41e6c75a7f3c..f9550ea46c26 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -35,6 +35,7 @@ */ #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin" +MODULE_FIRMWARE(I915_CSR_GLK); #define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4) #define I915_CSR_CNL "i915/cnl_dmc_ver1_07.bin" -- 2.11.0

7 years, 8 months

7
17
0 0

[PATCH v4.4 0/2] serial: mctrl_gpio: export mctrl_gpio_disable_ms and mctrl_gpio_init

by Daniel Wagner

Hi Greg, These two patches should probably be part of the 4.4 because ce59e48fdbad ("serial: mctrl_gpio: implement interrupt handling") backport. 4.9, 4.14 and 4.16 have these patches already in it. Romain Izard (1): serial: mctrl_gpio: Add missing module license Uwe Kleine-König (1): serial: mctrl_gpio: export mctrl_gpio_disable_ms and mctrl_gpio_init drivers/tty/serial/serial_mctrl_gpio.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.14.3

7 years, 8 months

1
0
0 0

v4.9.97 build: 0 failures 2 warnings (v4.9.97)

by Build bot for Mark Brown

Tree/Branch: v4.9.97 Git describe: v4.9.97 Commit: ba3cd57962 Linux 4.9.97 Build Time: 82 min 58 sec Passed: 11 / 11 (100.00 %) Failed: 0 / 11 ( 0.00 %) Errors: 0 Warnings: 2 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : arm64-allmodconfig 1 warnings 0 mismatches : x86_64-allmodconfig ------------------------------------------------------------------------------- Warnings Summary: 2 1 drivers/target/iscsi/iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78b: sibling call from callable instruction with changed frame pointer 1 ../include/linux/sched.h:2349:56: warning: 'noio_flag' may be used uninitialized in this function [-Wmaybe-uninitialized] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../include/linux/sched.h:2349:56: warning: 'noio_flag' may be used uninitialized in this function [-Wmaybe-uninitialized] ------------------------------------------------------------------------------- x86_64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: drivers/target/iscsi/iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78b: sibling call from callable instruction with changed frame pointer ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig

7 years, 8 months

1
0
0 0

v4.14.38 build: 0 failures 1 warnings (v4.14.38)

by Build bot for Mark Brown

Tree/Branch: v4.14.38 Git describe: v4.14.38 Commit: a87463f742 Linux 4.14.38 Build Time: 98 min 0 sec Passed: 11 / 11 (100.00 %) Failed: 0 / 11 ( 0.00 %) Errors: 0 Warnings: 1 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : x86_64-allmodconfig ------------------------------------------------------------------------------- Warnings Summary: 1 1 drivers/target/iscsi/.tmp_iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78f: sibling call from callable instruction with modified stack frame =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- x86_64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: drivers/target/iscsi/.tmp_iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78f: sibling call from callable instruction with modified stack frame ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

7 years, 8 months

1
0
0 0

Re: Fix build of stable-4.16.5 and 4.14.37 with GCC 8.0.1

by Greg KH

On Sun, Apr 29, 2018 at 10:15:03PM +0200, Fredrik Schön wrote: > 2018-04-29 14:53 GMT+02:00 Greg KH <gregkh(a)linuxfoundation.org>: > > How about build warnings for gcc 8? Anything we need to make it build > > "clean" there? I do have a fedora system around here, I guess I could > > try it out myself later this week... > > There are a ton of build warnings of the kind: > > mm/vmscan.o: warning: objtool: shrink_slab.part.44()+0x120: sibling call > from callable instruction with modified stack frame > > I don't know how to fix them, unfortunately. Do they show up in Linus's tree? I thought Arnd was working on gcc 8 warning fixes a while ago... thanks, greg k-h

7 years, 8 months

1
0
0 0

[PATCH v4] KVM: lapic: remove APIC Timer periodic/oneshot spikes

by Anthoine Bourgeois

Since the commit "8003c9ae204e: add APIC Timer periodic/oneshot mode VMX preemption timer support", a Windows 10 guest has some erratic timer spikes. Here the results on a 150000 times 1ms timer without any load: Before 8003c9ae204e | After 8003c9ae204e Max 1834us | 86000us Mean 1100us | 1021us Deviation 59us | 149us Here the results on a 150000 times 1ms timer with a cpu-z stress test: Before 8003c9ae204e | After 8003c9ae204e Max 32000us | 140000us Mean 1006us | 1997us Deviation 140us | 11095us The root cause of the problem is starting hrtimer with an expiry time already in the past can take more than 20 milliseconds to trigger the timer function. It can be solved by forward such past timers immediately, rather than submitting them to hrtimer_start(). In case the timer is periodic, update the target expiration and call hrtimer_start with it. v2: Check if the tsc deadline is already expired. Thank you Mika. v3: Execute the past timers immediately rather than submitting them to hrtimer_start(). v4: Rearm the periodic timer with advance_periodic_target_expiration() a simpler version of set_target_expiration(). Thank you Paolo. Cc: Mika Penttilä <mika.penttila(a)nextfour.com> Cc: Wanpeng Li <kernellwp(a)gmail.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: stable(a)vger.kernel.org Signed-off-by: Anthoine Bourgeois <anthoine.bourgeois(a)blade-group.com> --- arch/x86/kvm/lapic.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 70dcb5548022..b74c9c1405b9 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1463,23 +1463,6 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic) local_irq_restore(flags); } -static void start_sw_period(struct kvm_lapic *apic) -{ - if (!apic->lapic_timer.period) - return; - - if (apic_lvtt_oneshot(apic) && - ktime_after(ktime_get(), - apic->lapic_timer.target_expiration)) { - apic_timer_expired(apic); - return; - } - - hrtimer_start(&apic->lapic_timer.timer, - apic->lapic_timer.target_expiration, - HRTIMER_MODE_ABS_PINNED); -} - static void update_target_expiration(struct kvm_lapic *apic, uint32_t old_divisor) { ktime_t now, remaining; @@ -1546,6 +1529,26 @@ static void advance_periodic_target_expiration(struct kvm_lapic *apic) apic->lapic_timer.period); } +static void start_sw_period(struct kvm_lapic *apic) +{ + if (!apic->lapic_timer.period) + return; + + if (ktime_after(ktime_get(), + apic->lapic_timer.target_expiration)) { + apic_timer_expired(apic); + + if (apic_lvtt_oneshot(apic)) + return; + + advance_periodic_target_expiration(apic); + } + + hrtimer_start(&apic->lapic_timer.timer, + apic->lapic_timer.target_expiration, + HRTIMER_MODE_ABS_PINNED); +} + bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu) { if (!lapic_in_kernel(vcpu)) -- 2.11.0

7 years, 8 months

1
0
0 0

[PATCH 3.18 18/52] HID: i2c-hid: fix size check and type usage

by John Smith

> - if (ret_size > size) { > + if ((ret_size > size) || (ret_size <= 2)) { > dev_err(&ihid->client->dev, "%s: incomplete report (%d/%d)\n", > __func__, size, ret_size); > return; This change spams in the dmesg output. Could you please undo this change? Or - if ((ret_size > size) || (ret_size <= 2)) { + if ((ret_size > size) || (ret_size < 2)) { $ dmesg [ 1781.266353] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.273898] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.281464] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.289064] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.296607] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.304131] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.311751] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.319315] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2) [ 1781.326882] i2c_hid i2c-ALP0017:00: i2c_hid_get_input: incomplete report (30/2)

7 years, 8 months

2
3
0 0

[PATCH V4] clk: at91: PLL recalc_rate() now using cached MUL and DIV values

by Marcin Ziemianowicz

When a USB device is connected to the USB host port on the SAM9N12 then you get "-62" error which seems to indicate USB replies from the device are timing out. Based on a logic sniffer, I saw the USB bus was running at half speed. The PLL code uses cached MUL and DIV values which get set in set_rate() and applied in prepare(), but the recalc_rate() function instead queries the hardware instead of using these cached values. Therefore, if recalc_rate() is called between a set_rate() and prepare(), the wrong frequency is calculated and later the USB clock divider for the SAM9N12 SOC will be configured for an incorrect clock. In my case, the PLL hardware was set to 96 Mhz before the OHCI driver loads, and therefore the usb clock divider was being set to /2 even though the OHCI driver set the PLL to 48 Mhz. As an alternative explanation, I noticed this was fixed in the past by 87e2ed338f1b ("clk: at91: fix recalc_rate implementation of PLL driver") but the bug was later re-introduced by 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally"). Fixes: 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally) Cc: <stable(a)vger.kernel.org> Signed-off-by: Marcin Ziemianowicz <marcin(a)ziemianowicz.com> --- Thank you for bearing with me about this Boris. Changes since V3: Fix for double returns found by kbluild test robot > Comments by Boris Brezillon about email formatting issues Changes since V2: Removed all logging/debug messages I added > Comment by Boris Brezillon about my fix being wrong addressed Changes since V1: Added patch set cover letter Shortened lines which were over >80 characters long > Comment by Greg Kroah-Hartman about "from" field in email addressed > Comment by Alan Stern about redundant debug lines addressed drivers/clk/at91/clk-pll.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c index 7d3223fc..72b6091e 100644 --- a/drivers/clk/at91/clk-pll.c +++ b/drivers/clk/at91/clk-pll.c @@ -132,19 +132,8 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct clk_pll *pll = to_clk_pll(hw); - unsigned int pllr; - u16 mul; - u8 div; - - regmap_read(pll->regmap, PLL_REG(pll->id), &pllr); - - div = PLL_DIV(pllr); - mul = PLL_MUL(pllr, pll->layout); - - if (!div || !mul) - return 0; - return (parent_rate / div) * (mul + 1); + return (parent_rate / pll->div) * (pll->mul + 1); } static long clk_pll_get_best_div_mul(struct clk_pll *pll, unsigned long rate, -- 2.17.0

7 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror