Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1669441 > unrolled thread
| Started by | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| First post | 2017-06-19 18:20 +0200 |
| Last post | 2017-06-20 03:00 +0200 |
| Articles | 11 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 4.11 00/78] 4.11.7-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 16/78] mac80211: fix IBSS presp allocation size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 35/78] powerpc/mm: Add physical address to Linux page table dump Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 33/78] phy: rcar-gen3-usb2: fix implementation for runtime PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 04/78] ila_xlat: add missing hash secret initialization Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 27/78] mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 65/78] iio: imu: inv_mpu6050: add accel lpf setting for chip >= MPU6500 Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 26/78] x86/mm/32: Set the __vmalloc_start_set flag in initmem_init() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
[PATCH 4.11 06/78] [media] vb2: Fix an off by one error in vb2_plane_vaddr Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-19 18:20 +0200
Re: [PATCH 4.11 00/78] 4.11.7-stable review Guenter Roeck <linux@roeck-us.net> - 2017-06-20 00:50 +0200
Re: [PATCH 4.11 00/78] 4.11.7-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-06-20 03:00 +0200
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 00/78] 4.11.7-stable review |
| Message-ID | <tU6D7-4lE-3@gated-at.bofh.it> |
This is the start of the stable review cycle for the 4.11.7 release.
There are 78 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed Jun 21 15:10:11 UTC 2017.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.11.7-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.11.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 4.11.7-rc1
Hugh Dickins <hughd@google.com>
mm: larger stack guard gap, between vmas
Enric Balletbo i Serra <enric.balletbo@collabora.com>
ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
Enric Balletbo i Serra <enric.balletbo@collabora.com>
ARM: dts: am335x-sl50: Fix card detect pin for mmc1
David Miller <davem@davemloft.net>
crypto: Work around deallocated stack frame reference gcc bug on sparc.
Paul Burton <paul.burton@imgtec.com>
MIPS: .its targets depend on vmlinux
Paul Burton <paul.burton@imgtec.com>
MIPS: Fix bnezc/jialc return address calculation
Michael S. Tsirkin <mst@redhat.com>
virtio_balloon: disable VIOMMU support
Thomas Gleixner <tglx@linutronix.de>
alarmtimer: Rate limit periodic intervals
Thomas Gleixner <tglx@linutronix.de>
alarmtimer: Prevent overflow of relative timers
Heiner Kallweit <hkallweit1@gmail.com>
genirq: Release resources in __setup_irq() error path
Andy Lutomirski <luto@kernel.org>
sched/core: Idle_task_exit() shouldn't use switch_mm_irqs_off()
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
iio: adc: meson-saradc: fix potential crash in meson_sar_adc_clear_fifo
Alexey Khoroshilov <khoroshilov@ispras.ru>
staging: iio: ad7152: Fix deadlock in ad7152_write_raw_samp_freq()
Jean-Baptiste Maneyrol <JManeyrol@invensense.com>
iio: imu: inv_mpu6050: add accel lpf setting for chip >= MPU6500
Andrea Arcangeli <aarcange@redhat.com>
userfaultfd: shmem: handle coredumping in handle_userfault()
Mark Rutland <mark.rutland@arm.com>
mm: numa: avoid waiting on freed migrated pages
Yu Zhao <yuzhao@google.com>
swap: cond_resched in swap_cgroup_prepare()
James Morse <james.morse@arm.com>
mm/memory-failure.c: use compound_head() flags for huge pages
Alan Stern <stern@rowland.harvard.edu>
USB: gadgetfs, dummy-hcd, net2280: fix locking for callbacks
Alan Stern <stern@rowland.harvard.edu>
USB: gadget: fix GPF in gadgetfs
Corentin Labbe <clabbe.montjoie@gmail.com>
usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk
YD Tseng <yd_tseng@asmedia.com.tw>
usb: xhci: Fix USB 3.1 supported protocol parsing
Dan Carpenter <dan.carpenter@oracle.com>
drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR()
Philipp Zabel <p.zabel@pengutronix.de>
coda: restore original firmware locations
Chris Brandt <chris.brandt@renesas.com>
usb: r8a66597-hcd: decrease timeout
Chris Brandt <chris.brandt@renesas.com>
usb: r8a66597-hcd: select a different endpoint on timeout
Johan Hovold <johan@kernel.org>
USB: gadget: dummy_hcd: fix hub-descriptor removable fields
Arnd Bergmann <arnd@arndb.de>
pvrusb2: reduce stack usage pvr2_eeprom_analyze()
Roger Quadros <rogerq@ti.com>
usb: dwc3: gadget: Fix ISO transfer performance
Johan Hovold <johan@kernel.org>
USB: usbip: fix nonconforming hub descriptor
Anton Bondarenko <anton.bondarenko.sama@gmail.com>
usb: core: fix potential memory leak in error path during hcd creation
Johan Hovold <johan@kernel.org>
USB: hub: fix SS max number of ports
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
usb: gadget: udc: renesas_usb3: lock for PN_ registers access
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
usb: gadget: udc: renesas_usb3: fix deadlock by spinlock
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
usb: gadget: udc: renesas_usb3: fix pm_runtime functions calling
Johan Hovold <johan@kernel.org>
ALSA: usb-audio: fix Amanero Combo384 quirk on big-endian hosts
Subhransu S. Prusty <subhransu.s.prusty@intel.com>
ALSA: hda: Add Geminilake id to SKL_PLUS
Dan Carpenter <dan.carpenter@oracle.com>
iio: adc: ti_am335x_adc: allocating too much in probe
Matt Ranostay <matt.ranostay@konsulko.com>
iio: proximity: as3935: recalibrate RCO after resume
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
iio: imu: st_lsm6dsx: do not apply ODR configuration in write_raw handler
Eva Rachel Retuya <eraretuya@gmail.com>
staging: iio: tsl2x7x_core: Fix standard deviation calculation
Dan Carpenter <dan.carpenter@oracle.com>
staging: bcm2835-camera: fix error handling in init
Dan Carpenter <dan.carpenter@oracle.com>
staging: rtl8188eu: prevent an underflow in rtw_check_beacon_data()
Oliver O'Halloran <oohall@gmail.com>
powerpc/mm: Add physical address to Linux page table dump
Linus Walleij <linus.walleij@linaro.org>
mtd: physmap_of: really fix the physmap add-ons
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
phy: rcar-gen3-usb2: fix implementation for runtime PM
Tony Lindgren <tony@atomide.com>
mfd: cpcap: Fix bad use of IRQ sense register
Tony Lindgren <tony@atomide.com>
mfd: cpcap: Use ack_invert interrupts
Tony Lindgren <tony@atomide.com>
mfd: cpcap: Fix interrupt to use level interrupt
Rask Ingemann Lambertsen <rask@formelder.dk>
dt-bindings: mfd: axp20x: Add "xpowers,master-mode" property for AXP806 PMICs
Rask Ingemann Lambertsen <rask@formelder.dk>
mfd: axp20x: Add support for dts property "xpowers,master-mode"
Tony Lindgren <tony@atomide.com>
mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode
Laura Abbott <labbott@redhat.com>
x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init()
Geert Uytterhoeven <geert+renesas@glider.be>
serial: sh-sci: Fix late enablement of AUTORTS
Geert Uytterhoeven <geert+renesas@glider.be>
serial: sh-sci: Fix (AUTO)RTS in sci_init_pins()
Jan Kiszka <jan.kiszka@siemens.com>
serial: 8250_lpss: Unconditionally set PCI master for Quark
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
serial: efm32: Fix parity management in 'efm32_uart_console_get_options()'
Eric Anholt <eric@anholt.net>
drm/vc4: Fix OOPSes from trying to cache a partially constructed BO.
YYS <nickey.yang@rock-chips.com>
drm/mediatek: fix mtk_hdmi_setup_vendor_specific_infoframe mistake
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
mac80211: don't send SMPS action frame in AP mode when not needed
Johannes Berg <johannes.berg@intel.com>
mac80211: fix dropped counter in multiqueue RX
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
mac80211: strictly check mesh address extension mode
Johannes Berg <johannes.berg@intel.com>
mac80211: fix IBSS presp allocation size
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drm/i915: Do not sync RCU during shrinking
Ville Syrjälä <ville.syrjala@linux.intel.com>
drm/i915: Fix scaling check for 90/270 degree plane rotation
Zhenyu Wang <zhenyuw@linux.intel.com>
drm/i915: Fix GVT-g PVINFO version compatibility check
Mario Kleiner <mario.kleiner.de@gmail.com>
drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions.
Fabio Estevam <fabio.estevam@nxp.com>
drm: mxsfb_crtc: Reset the eLCDIF controller
Jason A. Donenfeld <Jason@zx2c4.com>
mac80211/wpa: use constant time memory comparison for MACs
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
mac80211: don't look at the PM bit of BAR frames
Paul Moore <paul@paul-moore.com>
selinux: fix double free in selinux_parse_opts_str()
Hans Verkuil <hans.verkuil@cisco.com>
cec: race fix: don't return -ENONET in cec_receive()
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
vb2: Fix an off by one error in 'vb2_plane_vaddr'
Tomasz Wilczyński <twilczynski@naver.com>
cpufreq: conservative: Allow down_threshold to take values from 1 to 10
Arnd Bergmann <arnd@arndb.de>
ila_xlat: add missing hash secret initialization
Marc Kleine-Budde <mkl@pengutronix.de>
can: gs_usb: fix memory leak in gs_cmd_reset()
Nicholas Bellinger <nab@linux-iscsi.org>
configfs: Fix race between create_link and configfs_rmdir
Christoph Hellwig <hch@lst.de>
fs: pass on flags in compat_writev
-------------
Diffstat:
Documentation/admin-guide/kernel-parameters.txt | 7 +
Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +
Makefile | 4 +-
arch/arc/mm/mmap.c | 2 +-
arch/arm/boot/dts/am335x-sl50.dts | 8 +-
arch/arm/mm/mmap.c | 4 +-
arch/frv/mm/elf-fdpic.c | 2 +-
arch/mips/boot/Makefile | 10 +-
arch/mips/kernel/branch.c | 4 +-
arch/mips/mm/mmap.c | 2 +-
arch/parisc/kernel/sys_parisc.c | 15 ++-
arch/powerpc/mm/dump_linuxpagetables.c | 18 ++-
arch/powerpc/mm/hugetlbpage-radix.c | 2 +-
arch/powerpc/mm/mmap.c | 4 +-
arch/powerpc/mm/slice.c | 2 +-
arch/s390/mm/mmap.c | 4 +-
arch/sh/mm/mmap.c | 4 +-
arch/sparc/kernel/sys_sparc_64.c | 4 +-
arch/sparc/mm/hugetlbpage.c | 2 +-
arch/tile/mm/hugetlbpage.c | 2 +-
arch/x86/kernel/sys_x86_64.c | 4 +-
arch/x86/mm/hugetlbpage.c | 2 +-
arch/x86/mm/numa_32.c | 1 +
arch/xtensa/kernel/syscall.c | 2 +-
drivers/cpufreq/cpufreq_conservative.c | 4 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 7 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 +-
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 7 +-
drivers/gpu/drm/i915/i915_gem_shrinker.c | 5 -
drivers/gpu/drm/i915/i915_pvinfo.h | 8 +-
drivers/gpu/drm/i915/i915_vgpu.c | 10 +-
drivers/gpu/drm/i915/intel_display.c | 14 +-
drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 42 ++++++
drivers/gpu/drm/vc4/vc4_bo.c | 8 ++
drivers/iio/adc/meson_saradc.c | 4 +-
drivers/iio/adc/ti_am335x_adc.c | 2 +-
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 39 +++++-
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 41 +++---
drivers/iio/proximity/as3935.c | 6 +-
drivers/media/cec/cec-api.c | 8 +-
drivers/media/platform/coda/coda-common.c | 21 +--
drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 13 +-
drivers/media/v4l2-core/videobuf2-core.c | 2 +-
drivers/mfd/axp20x.c | 21 +--
drivers/mfd/motorola-cpcap.c | 6 +-
drivers/mfd/omap-usb-tll.c | 2 +-
drivers/misc/c2port/c2port-duramar2150.c | 4 +-
drivers/mtd/maps/Makefile | 10 +-
.../mtd/maps/{physmap_of.c => physmap_of_core.c} | 0
drivers/net/can/usb/gs_usb.c | 2 +
drivers/phy/phy-rcar-gen3-usb2.c | 31 ++++-
drivers/staging/iio/cdc/ad7152.c | 6 +-
drivers/staging/iio/light/tsl2x7x_core.c | 2 +-
.../media/platform/bcm2835/bcm2835-camera.c | 14 +-
drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +-
drivers/tty/serial/8250/8250_lpss.c | 3 +-
drivers/tty/serial/efm32-uart.c | 11 +-
drivers/tty/serial/sh-sci.c | 29 +++-
drivers/usb/core/hcd.c | 1 +
drivers/usb/core/hub.c | 8 +-
drivers/usb/dwc3/gadget.c | 12 +-
drivers/usb/gadget/legacy/inode.c | 9 +-
drivers/usb/gadget/udc/dummy_hcd.c | 19 +--
drivers/usb/gadget/udc/net2280.c | 9 +-
drivers/usb/gadget/udc/renesas_usb3.c | 43 ++++--
drivers/usb/host/r8a66597-hcd.c | 6 +-
drivers/usb/host/xhci-mem.c | 7 +-
drivers/usb/host/xhci-pci.c | 3 +
drivers/usb/usbip/vhci_hcd.c | 11 +-
drivers/virtio/virtio_balloon.c | 7 +
fs/btrfs/hash.c | 5 +-
fs/configfs/symlink.c | 3 +-
fs/f2fs/f2fs.h | 5 +-
fs/hugetlbfs/inode.c | 2 +-
fs/proc/task_mmu.c | 4 -
fs/read_write.c | 2 +-
fs/userfaultfd.c | 29 ++--
include/linux/mm.h | 53 ++++----
include/uapi/linux/usb/ch11.h | 3 +
kernel/irq/manage.c | 4 +-
kernel/sched/core.c | 2 +-
kernel/time/alarmtimer.c | 14 +-
lib/libcrc32c.c | 6 +-
mm/gup.c | 5 -
mm/huge_memory.c | 8 +-
mm/memory-failure.c | 5 +-
mm/memory.c | 38 ------
mm/mmap.c | 149 ++++++++++++---------
mm/swap_cgroup.c | 3 +
net/ipv6/ila/ila_xlat.c | 1 +
net/mac80211/cfg.c | 2 +
net/mac80211/ibss.c | 2 +
net/mac80211/rx.c | 9 +-
net/mac80211/sta_info.c | 2 +-
net/mac80211/wpa.c | 9 +-
net/wireless/util.c | 10 +-
security/selinux/hooks.c | 5 +-
sound/pci/hda/hda_intel.c | 4 +-
sound/usb/quirks.c | 2 +-
102 files changed, 643 insertions(+), 393 deletions(-)
[toc] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 16/78] mac80211: fix IBSS presp allocation size |
| Message-ID | <tU7zd-4Y3-37@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <johannes.berg@intel.com>
commit f1f3e9e2a50a70de908f9dfe0d870e9cdc67e042 upstream.
When VHT IBSS support was added, the size of the extra elements
wasn't considered in ieee80211_ibss_build_presp(), which makes
it possible that it would overrun the allocated buffer. Fix it
by allocating the necessary space.
Fixes: abcff6ef01f9 ("mac80211: add VHT support for IBSS")
Reported-by: Shaul Triebitz <shaul.triebitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/mac80211/ibss.c | 2 ++
1 file changed, 2 insertions(+)
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -66,6 +66,8 @@ ieee80211_ibss_build_presp(struct ieee80
2 + (IEEE80211_MAX_SUPP_RATES - 8) +
2 + sizeof(struct ieee80211_ht_cap) +
2 + sizeof(struct ieee80211_ht_operation) +
+ 2 + sizeof(struct ieee80211_vht_cap) +
+ 2 + sizeof(struct ieee80211_vht_operation) +
ifibss->ie_len;
presp = kzalloc(sizeof(*presp) + frame_len, GFP_KERNEL);
if (!presp)
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 35/78] powerpc/mm: Add physical address to Linux page table dump |
| Message-ID | <tU7zd-4Y3-39@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver O'Halloran <oohall@gmail.com>
commit aaa229529244a1135b29353fefb001c430db79f0 upstream.
The current page table dumper scans the Linux page tables and coalesces mappings
with adjacent virtual addresses and similar PTE flags. This behaviour is
somewhat broken when you consider the IOREMAP space where entirely unrelated
mappings will appear to be virtually contiguous. This patch modifies the range
coalescing so that only ranges that are both physically and virtually contiguous
are combined. This patch also adds to the dump output the physical address at
the start of each range.
Fixes: 8eb07b187000 ("powerpc/mm: Dump linux pagetables")
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
[mpe: Print the physicall address with 0x like the other addresses]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/mm/dump_linuxpagetables.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
--- a/arch/powerpc/mm/dump_linuxpagetables.c
+++ b/arch/powerpc/mm/dump_linuxpagetables.c
@@ -57,6 +57,8 @@ struct pg_state {
struct seq_file *seq;
const struct addr_marker *marker;
unsigned long start_address;
+ unsigned long start_pa;
+ unsigned long last_pa;
unsigned int level;
u64 current_flags;
};
@@ -253,7 +255,9 @@ static void dump_addr(struct pg_state *s
const char *unit = units;
unsigned long delta;
- seq_printf(st->seq, "0x%016lx-0x%016lx ", st->start_address, addr-1);
+ seq_printf(st->seq, "0x%016lx-0x%016lx ", st->start_address, addr-1);
+ seq_printf(st->seq, "0x%016lx ", st->start_pa);
+
delta = (addr - st->start_address) >> 10;
/* Work out what appropriate unit to use */
while (!(delta & 1023) && unit[1]) {
@@ -268,11 +272,15 @@ static void note_page(struct pg_state *s
unsigned int level, u64 val)
{
u64 flag = val & pg_level[level].mask;
+ u64 pa = val & PTE_RPN_MASK;
+
/* At first no level is set */
if (!st->level) {
st->level = level;
st->current_flags = flag;
st->start_address = addr;
+ st->start_pa = pa;
+ st->last_pa = pa;
seq_printf(st->seq, "---[ %s ]---\n", st->marker->name);
/*
* Dump the section of virtual memory when:
@@ -280,9 +288,11 @@ static void note_page(struct pg_state *s
* - we change levels in the tree.
* - the address is in a different section of memory and is thus
* used for a different purpose, regardless of the flags.
+ * - the pa of this page is not adjacent to the last inspected page
*/
} else if (flag != st->current_flags || level != st->level ||
- addr >= st->marker[1].start_address) {
+ addr >= st->marker[1].start_address ||
+ pa != st->last_pa + PAGE_SIZE) {
/* Check the PTE flags */
if (st->current_flags) {
@@ -306,8 +316,12 @@ static void note_page(struct pg_state *s
seq_printf(st->seq, "---[ %s ]---\n", st->marker->name);
}
st->start_address = addr;
+ st->start_pa = pa;
+ st->last_pa = pa;
st->current_flags = flag;
st->level = level;
+ } else {
+ st->last_pa = pa;
}
}
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 33/78] phy: rcar-gen3-usb2: fix implementation for runtime PM |
| Message-ID | <tU7ze-4Y3-51@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
commit 441a681b8843474c9796b50c35794ff102701f37 upstream.
This patch fixes an issue that this driver doesn't take care of the runtime
PM. This code assumed that devm_phy_create() called pm_runtime_enable(dev),
but it misunderstood the dev_phy_create()'s specification.
This driver should call its own pm_runtime_enable() before
dev_phy_create().
Fixes: f3b5a8d9b50d ("phy: rcar-gen3-usb2: Add R-Car Gen3 USB2 PHY driver")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/phy/phy-rcar-gen3-usb2.c | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -20,6 +20,7 @@
#include <linux/of_address.h>
#include <linux/phy/phy.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h>
#include <linux/workqueue.h>
@@ -395,7 +396,7 @@ static int rcar_gen3_phy_usb2_probe(stru
struct rcar_gen3_chan *channel;
struct phy_provider *provider;
struct resource *res;
- int irq;
+ int irq, ret = 0;
if (!dev->of_node) {
dev_err(dev, "This driver needs device tree\n");
@@ -434,17 +435,24 @@ static int rcar_gen3_phy_usb2_probe(stru
}
}
- /* devm_phy_create() will call pm_runtime_enable(dev); */
+ /*
+ * devm_phy_create() will call pm_runtime_enable(&phy->dev);
+ * And then, phy-core will manage runtime pm for this device.
+ */
+ pm_runtime_enable(dev);
channel->phy = devm_phy_create(dev, NULL, &rcar_gen3_phy_usb2_ops);
if (IS_ERR(channel->phy)) {
dev_err(dev, "Failed to create USB2 PHY\n");
- return PTR_ERR(channel->phy);
+ ret = PTR_ERR(channel->phy);
+ goto error;
}
channel->vbus = devm_regulator_get_optional(dev, "vbus");
if (IS_ERR(channel->vbus)) {
- if (PTR_ERR(channel->vbus) == -EPROBE_DEFER)
- return PTR_ERR(channel->vbus);
+ if (PTR_ERR(channel->vbus) == -EPROBE_DEFER) {
+ ret = PTR_ERR(channel->vbus);
+ goto error;
+ }
channel->vbus = NULL;
}
@@ -454,15 +462,22 @@ static int rcar_gen3_phy_usb2_probe(stru
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
if (IS_ERR(provider)) {
dev_err(dev, "Failed to register PHY provider\n");
+ ret = PTR_ERR(provider);
+ goto error;
} else if (channel->has_otg) {
int ret;
ret = device_create_file(dev, &dev_attr_role);
if (ret < 0)
- return ret;
+ goto error;
}
- return PTR_ERR_OR_ZERO(provider);
+ return 0;
+
+error:
+ pm_runtime_disable(dev);
+
+ return ret;
}
static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
@@ -472,6 +487,8 @@ static int rcar_gen3_phy_usb2_remove(str
if (channel->has_otg)
device_remove_file(&pdev->dev, &dev_attr_role);
+ pm_runtime_disable(&pdev->dev);
+
return 0;
};
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 04/78] ila_xlat: add missing hash secret initialization |
| Message-ID | <tU7ze-4Y3-53@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <arnd@arndb.de>
commit 0db47e3d323411beeb6ea97f2c4d19395c91fd8b upstream.
While discussing the possible merits of clang warning about unused initialized
functions, I found one function that was clearly meant to be called but
never actually is.
__ila_hash_secret_init() initializes the hash value for the ila locator,
apparently this is intended to prevent hash collision attacks, but this ends
up being a read-only zero constant since there is no caller. I could find
no indication of why it was never called, the earliest patch submission
for the module already was like this. If my interpretation is right, we
certainly want to backport the patch to stable kernels as well.
I considered adding it to the ila_xlat_init callback, but for best effect
the random data is read as late as possible, just before it is first used.
The underlying net_get_random_once() is already highly optimized to avoid
overhead when called frequently.
Fixes: 7f00feaf1076 ("ila: Add generic ILA translation facility")
Link: https://www.spinics.net/lists/kernel/msg2527243.html
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
net/ipv6/ila/ila_xlat.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -68,6 +68,7 @@ static inline u32 ila_locator_hash(struc
{
u32 *v = (u32 *)loc.v32;
+ __ila_hash_secret_init();
return jhash_2words(v[0], v[1], hashrnd);
}
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 27/78] mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode |
| Message-ID | <tU7ze-4Y3-57@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tony Lindgren <tony@atomide.com>
commit 8b8a84c54aff4256d592dc18346c65ecf6811b45 upstream.
Commit 16fa3dc75c22 ("mfd: omap-usb-tll: HOST TLL platform driver")
added support for USB TLL, but uses OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
bit the wrong way. The comments in the code are correct, but the inverted
use of OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF causes the register to be
enabled instead of disabled unlike what the comments say.
Without this change the Wrigley 3G LTE modem on droid 4 EHCI bus can
be only pinged few times before it stops responding.
Fixes: 16fa3dc75c22 ("mfd: omap-usb-tll: HOST TLL platform driver")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/mfd/omap-usb-tll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -377,8 +377,8 @@ int omap_tll_init(struct usbhs_omap_plat
* and use SDR Mode
*/
reg &= ~(OMAP_TLL_CHANNEL_CONF_UTMIAUTOIDLE
- | OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF
| OMAP_TLL_CHANNEL_CONF_ULPIDDRMODE);
+ reg |= OMAP_TLL_CHANNEL_CONF_ULPINOBITSTUFF;
} else if (pdata->port_mode[i] ==
OMAP_EHCI_PORT_MODE_HSIC) {
/*
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 65/78] iio: imu: inv_mpu6050: add accel lpf setting for chip >= MPU6500 |
| Message-ID | <tU7ze-4Y3-61@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean-Baptiste Maneyrol <JManeyrol@invensense.com>
commit 948588e25b8af5e66962ed3f53e1cae1656fa5af upstream.
Starting from MPU6500, accelerometer dlpf is set in a separate
register named ACCEL_CONFIG_2.
Add this new register in the map and set it for the corresponding
chips.
Signed-off-by: Jean-Baptiste Maneyrol <jmaneyrol@invensense.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 39 ++++++++++++++++++++++++++---
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 ++
2 files changed, 39 insertions(+), 3 deletions(-)
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
@@ -41,6 +41,7 @@ static const int accel_scale[] = {598, 1
static const struct inv_mpu6050_reg_map reg_set_6500 = {
.sample_rate_div = INV_MPU6050_REG_SAMPLE_RATE_DIV,
.lpf = INV_MPU6050_REG_CONFIG,
+ .accel_lpf = INV_MPU6500_REG_ACCEL_CONFIG_2,
.user_ctrl = INV_MPU6050_REG_USER_CTRL,
.fifo_en = INV_MPU6050_REG_FIFO_EN,
.gyro_config = INV_MPU6050_REG_GYRO_CONFIG,
@@ -205,6 +206,37 @@ int inv_mpu6050_set_power_itg(struct inv
EXPORT_SYMBOL_GPL(inv_mpu6050_set_power_itg);
/**
+ * inv_mpu6050_set_lpf_regs() - set low pass filter registers, chip dependent
+ *
+ * MPU60xx/MPU9150 use only 1 register for accelerometer + gyroscope
+ * MPU6500 and above have a dedicated register for accelerometer
+ */
+static int inv_mpu6050_set_lpf_regs(struct inv_mpu6050_state *st,
+ enum inv_mpu6050_filter_e val)
+{
+ int result;
+
+ result = regmap_write(st->map, st->reg->lpf, val);
+ if (result)
+ return result;
+
+ switch (st->chip_type) {
+ case INV_MPU6050:
+ case INV_MPU6000:
+ case INV_MPU9150:
+ /* old chips, nothing to do */
+ result = 0;
+ break;
+ default:
+ /* set accel lpf */
+ result = regmap_write(st->map, st->reg->accel_lpf, val);
+ break;
+ }
+
+ return result;
+}
+
+/**
* inv_mpu6050_init_config() - Initialize hardware, disable FIFO.
*
* Initial configuration:
@@ -227,8 +259,7 @@ static int inv_mpu6050_init_config(struc
if (result)
return result;
- d = INV_MPU6050_FILTER_20HZ;
- result = regmap_write(st->map, st->reg->lpf, d);
+ result = inv_mpu6050_set_lpf_regs(st, INV_MPU6050_FILTER_20HZ);
if (result)
return result;
@@ -531,6 +562,8 @@ error_write_raw:
* would be alising. This function basically search for the
* correct low pass parameters based on the fifo rate, e.g,
* sampling frequency.
+ *
+ * lpf is set automatically when setting sampling rate to avoid any aliases.
*/
static int inv_mpu6050_set_lpf(struct inv_mpu6050_state *st, int rate)
{
@@ -546,7 +579,7 @@ static int inv_mpu6050_set_lpf(struct in
while ((h < hz[i]) && (i < ARRAY_SIZE(d) - 1))
i++;
data = d[i];
- result = regmap_write(st->map, st->reg->lpf, data);
+ result = inv_mpu6050_set_lpf_regs(st, data);
if (result)
return result;
st->chip_config.lpf = data;
--- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
+++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
@@ -28,6 +28,7 @@
* struct inv_mpu6050_reg_map - Notable registers.
* @sample_rate_div: Divider applied to gyro output rate.
* @lpf: Configures internal low pass filter.
+ * @accel_lpf: Configures accelerometer low pass filter.
* @user_ctrl: Enables/resets the FIFO.
* @fifo_en: Determines which data will appear in FIFO.
* @gyro_config: gyro config register.
@@ -47,6 +48,7 @@
struct inv_mpu6050_reg_map {
u8 sample_rate_div;
u8 lpf;
+ u8 accel_lpf;
u8 user_ctrl;
u8 fifo_en;
u8 gyro_config;
@@ -187,6 +189,7 @@ struct inv_mpu6050_state {
#define INV_MPU6050_FIFO_THRESHOLD 500
/* mpu6500 registers */
+#define INV_MPU6500_REG_ACCEL_CONFIG_2 0x1D
#define INV_MPU6500_REG_ACCEL_OFFSET 0x77
/* delay time in milliseconds */
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 26/78] x86/mm/32: Set the __vmalloc_start_set flag in initmem_init() |
| Message-ID | <tU7ze-4Y3-63@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Laura Abbott <labbott@redhat.com>
commit 861ce4a3244c21b0af64f880d5bfe5e6e2fb9e4a upstream.
'__vmalloc_start_set' currently only gets set in initmem_init() when
!CONFIG_NEED_MULTIPLE_NODES. This breaks detection of vmalloc address
with virt_addr_valid() with CONFIG_NEED_MULTIPLE_NODES=y, causing
a kernel crash:
[mm/usercopy] 517e1fbeb6: kernel BUG at arch/x86/mm/physaddr.c:78!
Set '__vmalloc_start_set' appropriately for that case as well.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: dc16ecf7fd1f ("x86-32: use specific __vmalloc_start_set flag in __virt_addr_valid")
Link: http://lkml.kernel.org/r/1494278596-30373-1-git-send-email-labbott@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/mm/numa_32.c | 1 +
1 file changed, 1 insertion(+)
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -100,5 +100,6 @@ void __init initmem_init(void)
printk(KERN_DEBUG "High memory starts at vaddr %08lx\n",
(ulong) pfn_to_kaddr(highstart_pfn));
+ __vmalloc_start_set = true;
setup_bootmem_allocator();
}
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-19 18:20 +0200 |
| Subject | [PATCH 4.11 06/78] [media] vb2: Fix an off by one error in vb2_plane_vaddr |
| Message-ID | <tU7zf-4Y3-65@gated-at.bofh.it> |
| In reply to | #1669441 |
4.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
commit 5ebb6dd36c9f5fb37b1077b393c254d70a14cb46 upstream.
We should ensure that 'plane_no' is '< vb->num_planes' as done in
'vb2_plane_cookie' just a few lines below.
Fixes: e23ccc0ad925 ("[media] v4l: add videobuf2 Video for Linux 2 driver framework")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/media/v4l2-core/videobuf2-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -868,7 +868,7 @@ EXPORT_SYMBOL_GPL(vb2_core_create_bufs);
void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no)
{
- if (plane_no > vb->num_planes || !vb->planes[plane_no].mem_priv)
+ if (plane_no >= vb->num_planes || !vb->planes[plane_no].mem_priv)
return NULL;
return call_ptr_memop(vb, vaddr, vb->planes[plane_no].mem_priv);
[toc] | [prev] | [next] | [standalone]
| From | Guenter Roeck <linux@roeck-us.net> |
|---|---|
| Date | 2017-06-20 00:50 +0200 |
| Message-ID | <tUdEC-hg-3@gated-at.bofh.it> |
| In reply to | #1669441 |
On Mon, Jun 19, 2017 at 11:15:00PM +0800, Greg Kroah-Hartman wrote: > This is the start of the stable review cycle for the 4.11.7 release. > There are 78 patches in this series, all will be posted as a response > to this one. If anyone has any issues with these being applied, please > let me know. > > Responses should be made by Wed Jun 21 15:10:11 UTC 2017. > Anything received after that time might be too late. > Build results: total: 145 pass: 145 fail: 0 Qemu test results: total: 122 pass: 122 fail: 0 Details are available at http://kerneltests.org/builders. Guenter
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2017-06-20 03:00 +0200 |
| Message-ID | <tUfGp-1wn-3@gated-at.bofh.it> |
| In reply to | #1670014 |
On Mon, Jun 19, 2017 at 03:48:46PM -0700, Guenter Roeck wrote: > On Mon, Jun 19, 2017 at 11:15:00PM +0800, Greg Kroah-Hartman wrote: > > This is the start of the stable review cycle for the 4.11.7 release. > > There are 78 patches in this series, all will be posted as a response > > to this one. If anyone has any issues with these being applied, please > > let me know. > > > > Responses should be made by Wed Jun 21 15:10:11 UTC 2017. > > Anything received after that time might be too late. > > > > Build results: > total: 145 pass: 145 fail: 0 > Qemu test results: > total: 122 pass: 122 fail: 0 > > Details are available at http://kerneltests.org/builders. Really, it all worked? Very nice, thanks so much for testing all of these and all of the versions as well. Much appreciated. greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web