3.8.1-stable review
Subsystems (85)
Greg Kroah-Hartman
maintainercover 3.8.1-stable review
This is the start of the stable review cycle for the 3.8.1 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 28 23:52:34 UTC 2013. 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/v3.0/stable-review/patch-3.8.1-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.8.1-rc1
Fabio Baltieri <[email protected]>
usb: musb: ux500: use clk_prepare_enable and clk_disable_unprepare
Ming Lei <[email protected]>
usb: musb: fix dependency on transceiver driver
Ming Lei <[email protected]>
usb: musb: core: fix failure path
Josh Boyer <[email protected]>
USB: usb-storage: unusual_devs update for Super TOP SATA bridge
fangxiaozhi <[email protected]>
USB: storage: properly handle the endian issues of idProduct
Roger Quadros <[email protected]>
USB: ehci-omap: Fix autoloading of module
Bjørn Mork <[email protected]>
USB: option: add Huawei "ACM" devices using protocol = vendor
Bjørn Mork <[email protected]>
USB: option: add Yota / Megafon M100-1 4g modem
Bjørn Mork <[email protected]>
USB: option: add and update Alcatel modems
Maciej Sosnowski <[email protected]>
dca: check against empty dca_domains list before unregister provider
Guennadi Liakhovetski <[email protected]>
dma: sh: Don't use ENODEV for failing slave lookup
Magnus Damm <[email protected]>
gpio: em: Use irq_domain_add_simple() to fix runtime error
Roger Quadros <[email protected]>
USB: ehci-omap: Don't free gpios that we didn't request
Johannes Berg <[email protected]>
mac80211: always unblock CSA queue stop when disconnecting
Cong Wang <[email protected]>
vlan: adjust vlan_set_encap_proto() for its callers
Mathias Krause <[email protected]>
sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
Kleber Sacilotto de Souza <[email protected]>
mlx4_en: fix allocation of CPU affinity reverse-map
Kleber Sacilotto de Souza <[email protected]>
mlx4_en: fix allocation of device tx_cq
Yuchung Cheng <[email protected]>
tcp: fix SYN-data space mis-accounting
Li Wei <[email protected]>
ipv4: fix error handling in icmp_protocol.
Eric Dumazet <[email protected]>
ipv6: use a stronger hash for tcp
Li Wei <[email protected]>
ipv4: fix a bug in ping_err().
YOSHIFUJI Hideaki <[email protected]>
ipv6: fix race condition regarding dst->expires and dst->from.
Eric Dumazet <[email protected]>
ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
Romain KUNTZ <[email protected]>
xfrm: release neighbor upon dst destruction
Ying Xue <[email protected]>
net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
David Vrabel <[email protected]>
xen-netback: cancel the credit timer when taking the vif down
David Vrabel <[email protected]>
xen-netback: correctly return errors from netbk_count_requests()
Bjørn Mork <[email protected]>
net: cdc_ncm: fix probing of devices with multiple control interface altsettings
David Herrmann <[email protected]>
HID: wiimote: fix nunchuck button parser
Balaji T K <[email protected]>
mmc: core: expose RPMB partition only for CMD23 capable hosts
Shawn Guo <[email protected]>
mmc: sdhci-esdhc-imx: fix host version read
Takashi Iwai <[email protected]>
fb: Yet another band-aid for fixing lockdep mess
Alan Cox <[email protected]>
fb: rework locking to fix lock ordering on takeover
Dave Airlie <[email protected]>
fbcon: don't lose the console font across generic->chip driver switch
Anatolij Gustschin <[email protected]>
drivers/video: fsl-diu-fb: fix bugs in interrupt handling
Anatolij Gustschin <[email protected]>
drivers/video: fsl-diu-fb: fix pixel formats for 24 and 16 bpp
Jean Delvare <[email protected]>
pcmcia/vrc4171: Add missing spinlock init
John David Anglin <[email protected]>
Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
Thadeu Lima de Souza Cascardo <[email protected]>
powerpc/eeh: Fix crash when adding a device in a slot with DDW
Suzuki K. Poulose <[email protected]>
uprobes/powerpc: Add dependency on single step emulation
Phileas Fogg <[email protected]>
powerpc/kexec: Disable hard IRQ before kexec
Joonsoo Kim <[email protected]>
ARM: 7643/1: sched: correct update_sched_clock()
Will Deacon <[email protected]>
arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
Will Deacon <[email protected]>
ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
Steffen Trumtrar <[email protected]>
ARM: i.MX25: clk: parent per5_clk to AHB clock
Arnd Bergmann <[email protected]>
ARM: samsung: fix assembly syntax for new gas
Nicolas Ferre <[email protected]>
ARM: at91/DT: remove atmel,use-dma-* from 9x5 and 9n12 USART nodes
Igor Grinberg <[email protected]>
ARM: PXA3xx: program the CSMSADRCFG register
Linus Walleij <[email protected]>
ARM: 7635/1: versatile: fix the PCI IRQ regression
Ryo Tsutsui <[email protected]>
ASoC: arizona: Fixed a bug in FLL fractional calculation
Chris Rattray <[email protected]>
ASoC: wm2200: correct IN2L and IN3L digital mute
Malcolm Priestley <[email protected]>
staging: vt6656: Fix URB submitted while active warning.
Malcolm Priestley <[email protected]>
staging: vt6656: Revert: 64bit fixes: dpc.c incorrect addressing of void structure.
Malcolm Priestley <[email protected]>
staging: vt6656: revert : 64 bit- Correctly address void structure.
Ian Abbott <[email protected]>
staging: comedi: ni_labpc: correct differential channel sequence for AI commands
Ian Abbott <[email protected]>
staging: comedi: ni_labpc: set up command4 register *after* command3
Ian Abbott <[email protected]>
staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
Minchan Kim <[email protected]>
staging: zsmalloc: Fix TLB coherency and build problem
Chris Wilson <[email protected]>
drm/i915: Handle untiled planes when computing their offsets
Daniel Vetter <[email protected]>
drm/i915: inverted brightness quirk for Acer Aspire 4736Z
Daniel Vetter <[email protected]>
drm/i915: Use HAS_L3_GPU_CACHE in i915_gem_l3_remap
Jani Nikula <[email protected]>
drm/i915: add missing \n to UTS_RELEASE in the error_state
Patrik Jakobsson <[email protected]>
drm/i915: Set i9xx sdvo clock limits according to specifications
Mika Kuoppala <[email protected]>
drm/i915: disable shared panel fitter for pipe
Daniel Vetter <[email protected]>
drm/i915: write backlight harder
Ben Widawsky <[email protected]>
drm/i915: Fix RC6VIDS encode/decode
Ben Widawsky <[email protected]>
drm/i915: Fix CAGF for HSW
Chris Wilson <[email protected]>
drm/i915: Only run idle processing from i915_gem_retire_requests_worker
Damien Lespiau <[email protected]>
drm/i915: Preserve the FDI line reversal override bit on CPT
Damien Lespiau <[email protected]>
drm/i915: Preserve the DDI link reversal configuration
Al Viro <[email protected]>
get rid of unprotected dereferencing of mnt->mnt_ns
Daniel Vetter <[email protected]>
intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets
Dave Airlie <[email protected]>
drm/usb: bind driver to correct device
Daniel Vetter <[email protected]>
Revert "drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S"
Ville Syrjälä <[email protected]>
drm: Use C8 instead of RGB332 when determining the format from depth/bpp
Ville Syrjälä <[email protected]>
drm: Fill depth/bits_per_pixel for C8 format
Maarten Lankhorst <[email protected]>
drm: shut up invalid edid messages
Paulo Zanoni <[email protected]>
drm: don't add inferred modes for monitors that don't support them
Alex Williamson <[email protected]>
PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
Dave Airlie <[email protected]>
vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
Dave Airlie <[email protected]>
drm/udl: disable fb_defio by default
Dave Airlie <[email protected]>
drm/udl: make usage as a console safer
Alex Deucher <[email protected]>
drm/radeon: properly validate the atpx interface
Alex Deucher <[email protected]>
drm/radeon: remove overzealous warning in hdmi handling
Alex Deucher <[email protected]>
drm/radeon: fix multi-head power profile stability on BTC+ asics
Alex Deucher <[email protected]>
drm/radeon/dce6: fix display powergating
David S. Miller <[email protected]>
sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
David S. Miller <[email protected]>
sparc64: Fix tsb_grow() in atomic context.
David S. Miller <[email protected]>
sparc64: Handle hugepage TSB being NULL.
David S. Miller <[email protected]>
sparc64: Fix gfp_flags setting in tsb_grow().
Bob Peterson <[email protected]>
GFS2: Get a block reservation before resizing a file
David Henningsson <[email protected]>
ALSA: hda - hdmi: ELD shouldn't be valid after unplug
Takashi Iwai <[email protected]>
ALSA: hda - Fix broken workaround for HDMI/SPDIF conflicts
Fernando Luis Vazquez Cao <[email protected]>
ALSA: hda - Workaround for silent output on Sony Vaio VGC-LN51JGB with ALC889
Anssi Hannula <[email protected]>
ALSA: hda - Fix default multichannel HDMI mapping regression
Takashi Iwai <[email protected]>
ALSA: hda - Release assigned pin/cvt at error path of hdmi_pcm_open()
Takashi Iwai <[email protected]>
ALSA: hda - Disable runtime PM for Intel 5 Series/3400
Pawel Moll <[email protected]>
ALSA: usb: Fix Processing Unit Descriptor parsers
Jiri Slaby <[email protected]>
ALSA: usb/quirks, fix out-of-bounds access
Clemens Ladisch <[email protected]>
ALSA: usb-audio: fix Roland A-PRO support
Tomasz Guszkowski <[email protected]>
p54usb: corrected USB ID for T-Com Sinus 154 data II
Weston Andros Adamson <[email protected]>
NFSv4.1: Don't decode skipped layoutgets
Trond Myklebust <[email protected]>
NFSv4.1: Fix bulk recall and destroy of layouts
Trond Myklebust <[email protected]>
NFSv4.1: Fix an ABBA locking issue with session and state serialisation
Trond Myklebust <[email protected]>
NLM: Ensure that we resend all pending blocking locks after a reclaim
fanchaoting <[email protected]>
umount oops when remove blocklayoutdriver first
Grant Likely <[email protected]>
drivercore: Fix ordering between deferred_probe and exiting initcalls
Mel Gorman <[email protected]>
mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
Greg Thelen <[email protected]>
tmpfs: fix use-after-free of mempolicy object
David Howells <[email protected]>
KEYS: Revert one application of "Fix unreachable code" patch
Lars-Peter Clausen <[email protected]>
drivers/video/backlight/adp88?0_bl.c: fix resume
Junxiao Bi <[email protected]>
ocfs2: unlock super lock if lockres refresh failed
MITSUNARI Shigeo <[email protected]>
fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
Jim Somerville <[email protected]>
inotify: remove broken mask checks causing unmount to be EINVAL
Thomas Gleixner <[email protected]>
futex: Revert "futex: Mark get_robust_list as deprecated"
Christian Borntraeger <[email protected]>
s390/kvm: Fix store status for ACRS/FPRS
Cornelia Huck <[email protected]>
KVM: s390: Handle hosts not supporting s390-virtio.
Robin Holt <[email protected]>
mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
Bjorn Helgaas <[email protected]>
Driver core: treat unregistered bus_types as having no devices
Minchan Kim <[email protected]>
zram: Fix deadlock bug in partial read/write
George Spelvin <[email protected]>
pps: Fix a use-after free bug when unregistering a source.
George Spelvin <[email protected]>
pps: Use pps_lookup_dev to reduce ldisc coupling
George Spelvin <[email protected]>
pps: Add pps_lookup_dev() function
Wei Liu <[email protected]>
xen: close evtchn port if binding to irq fails
Stefan Bader <[email protected]>
xen: Send spinlock IPI to all waiters
Nicolas Pitre <[email protected]>
tty vt: fix character insertion overflow
Jussi Kivilinna <[email protected]>
rtlwifi: usb: allocate URB control message setup_packet and data buffer separately
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Add new USB ID
Larry Finger <[email protected]>
rtlwifi: rtl8192cu: Fix NULL dereference BUG when using new_id
Larry Finger <[email protected]>
b43: Increase number of RX DMA slots
Michael Chan <[email protected]>
serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Thomas Gleixner <[email protected]>
serial: imx: Fix recursive locking bug
Johan Hovold <[email protected]>
USB: serial: fix null-pointer dereferences on disconnect
Oleg Nesterov <[email protected]>
tty: set_termios/set_termiox should not return -EINTR
Dirkjan Bussink <[email protected]>
tty: Prevent deadlock in n_gsm driver
Takashi Iwai <[email protected]>
ALSA: aloop: Fix Oops while PM resume
Denis Efremov <[email protected]>
ALSA: rme32.c irq enabling after spin_lock_irq
Denis Efremov <[email protected]>
ALSA: ali5451: remove irq enabling in pointer callback
Konstantin Khlebnikov <[email protected]>
workqueue: un-GPL function delayed_work_timer_fn()
Olaf Hering <[mailto:[email protected]]>
x86: Hyper-V: register clocksource only if its advertised
Leonid Shatz <[email protected]>
hrtimer: Prevent hrtimer_enqueue_reprogram race
Stanislaw Gruszka <[email protected]>
posix-cpu-timers: Fix nanosleep task_struct leak
Thomas Gleixner <[email protected]>
genirq: Avoid deadlock in spurious handling
H. Peter Anvin <[email protected]>
timeconst.pl: Eliminate Perl warning
Jiri Olsa <[email protected]>
perf hists: Fix period symbol_conf.field_sep display
Vinson Lee <[email protected]>
perf tools: Fix build with bison 2.3 and older.
H. Peter Anvin <[email protected]>
x86-32, mm: Remove reference to alloc_remap()
H. Peter Anvin <[email protected]>
x86-32, mm: Remove reference to resume_map_numa_kva()
Dave Hansen <[email protected]>
x86-32, mm: Rip out x86_32 NUMA remapping code
-------------
Diffstat:
Makefile | 4 +- arch/arm/boot/dts/at91sam9n12.dtsi | 8 -- arch/arm/boot/dts/at91sam9x5.dtsi | 6 - arch/arm/kernel/sched_clock.c | 4 +- arch/arm/mach-imx/clk-imx25.c | 3 + arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 ++- arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 12 +- arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 4 +- arch/arm/mach-s3c24xx/pm-h1940.S | 2 +- arch/arm/mach-s3c24xx/sleep-s3c2410.S | 12 +- arch/arm/mach-s3c24xx/sleep-s3c2412.S | 12 +- arch/arm/mach-versatile/core.c | 15 ++- arch/arm/mach-versatile/pci.c | 11 +- arch/arm/plat-samsung/include/plat/debug-macro.S | 18 +-- arch/arm64/kernel/signal32.c | 4 +- arch/parisc/include/asm/pgtable.h | 13 ++- arch/parisc/kernel/cache.c | 18 +++ arch/powerpc/Kconfig | 4 + arch/powerpc/include/asm/eeh.h | 3 + arch/powerpc/kernel/machine_kexec_64.c | 5 + arch/powerpc/kernel/of_platform.c | 3 + arch/powerpc/kernel/pci-common.c | 7 +- arch/powerpc/lib/Makefile | 4 +- arch/powerpc/platforms/pseries/eeh.c | 24 +++- arch/s390/kvm/kvm-s390.c | 8 ++ arch/sparc/include/asm/hugetlb.h | 1 - arch/sparc/include/asm/page_64.h | 4 +- arch/sparc/include/asm/tsb.h | 28 +++-- arch/sparc/kernel/tsb.S | 39 ++++++- arch/sparc/mm/fault_64.c | 9 +- arch/sparc/mm/init_64.c | 62 +++++++---- arch/sparc/mm/tlb.c | 11 +- arch/sparc/mm/tsb.c | 2 +- arch/x86/Kconfig | 4 - arch/x86/include/asm/mmzone_32.h | 6 - arch/x86/kernel/cpu/mshyperv.c | 3 +- arch/x86/mm/numa.c | 32 ++---- arch/x86/mm/numa_32.c | 161 --------------------------- arch/x86/mm/numa_internal.h | 6 - arch/x86/power/hibernate_32.c | 2 - arch/x86/xen/spinlock.c | 1 - drivers/base/bus.c | 4 +- drivers/base/dd.c | 2 + drivers/dca/dca-core.c | 5 + drivers/dma/sh/shdma.c | 2 +- drivers/gpio/gpio-em.c | 3 +- drivers/gpu/drm/drm_crtc.c | 3 +- drivers/gpu/drm/drm_edid.c | 12 +- drivers/gpu/drm/drm_usb.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 12 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 9 +- drivers/gpu/drm/i915/intel_crt.c | 14 ++- drivers/gpu/drm/i915/intel_ddi.c | 25 +++-- drivers/gpu/drm/i915/intel_display.c | 68 ++++++----- drivers/gpu/drm/i915/intel_drv.h | 11 +- drivers/gpu/drm/i915/intel_panel.c | 13 ++- drivers/gpu/drm/i915/intel_sprite.c | 8 +- drivers/gpu/drm/radeon/atombios_crtc.c | 6 +- drivers/gpu/drm/radeon/evergreen.c | 13 +++ drivers/gpu/drm/radeon/r600_hdmi.c | 1 - drivers/gpu/drm/radeon/radeon_atpx_handler.c | 73 +++++++++++- drivers/gpu/drm/radeon/radeon_pm.c | 2 +- drivers/gpu/drm/udl/udl_drv.h | 2 + drivers/gpu/drm/udl/udl_fb.c | 48 +++++++- drivers/hid/hid-wiimote-ext.c | 8 +- drivers/iommu/intel-iommu.c | 8 +- drivers/mmc/core/mmc.c | 2 +- drivers/mmc/host/sdhci-esdhc-imx.c | 19 ++-- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- drivers/net/ppp/ppp_generic.c | 8 ++ drivers/net/usb/cdc_ncm.c | 11 +- drivers/net/wireless/b43/dma.h | 2 +- drivers/net/wireless/p54/p54usb.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 9 +- drivers/net/wireless/rtlwifi/usb.c | 49 +++++--- drivers/net/wireless/rtlwifi/usb.h | 3 +- drivers/net/xen-netback/interface.c | 3 +- drivers/net/xen-netback/netback.c | 8 +- drivers/pci/access.c | 2 +- drivers/pcmcia/vrc4171_card.c | 1 + drivers/pps/clients/pps-ldisc.c | 10 +- drivers/pps/pps.c | 47 +++++++- drivers/s390/kvm/kvm_virtio.c | 38 +++++-- drivers/staging/comedi/comedi_fops.c | 5 + drivers/staging/comedi/drivers/ni_labpc.c | 34 +++--- drivers/staging/vt6656/dpc.c | 4 +- drivers/staging/vt6656/rxtx.c | 2 +- drivers/staging/vt6656/usbpipe.c | 28 +++-- drivers/staging/zram/zram_drv.c | 9 +- drivers/staging/zsmalloc/zsmalloc-main.c | 10 +- drivers/tty/n_gsm.c | 42 ++++++- drivers/tty/serial/imx.c | 11 +- drivers/tty/tty_ioctl.c | 4 +- drivers/tty/vt/vt.c | 138 ++++++++++++++++------- drivers/usb/host/ehci-omap.c | 10 +- drivers/usb/musb/am35x.c | 2 +- drivers/usb/musb/blackfin.c | 2 +- drivers/usb/musb/da8xx.c | 7 +- drivers/usb/musb/davinci.c | 7 +- drivers/usb/musb/musb_core.c | 1 + drivers/usb/musb/musb_dsps.c | 2 +- drivers/usb/musb/omap2430.c | 2 +- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/musb/ux500.c | 12 +- drivers/usb/serial/ftdi_sio.c | 20 ++-- drivers/usb/serial/mct_u232.c | 22 ++-- drivers/usb/serial/option.c | 16 ++- drivers/usb/serial/quatech2.c | 18 ++- drivers/usb/serial/sierra.c | 8 +- drivers/usb/serial/ssu100.c | 19 ++-- drivers/usb/serial/usb-serial.c | 14 ++- drivers/usb/serial/usb_wwan.c | 8 +- drivers/usb/storage/initializers.c | 4 +- drivers/usb/storage/unusual_cypress.h | 2 +- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- drivers/video/console/fbcon.c | 47 ++++++-- drivers/video/console/vgacon.c | 22 ++-- drivers/video/fbmem.c | 9 +- drivers/video/fbsysfs.c | 3 + drivers/video/fsl-diu-fb.c | 64 ++++++----- drivers/xen/evtchn.c | 10 ++ fs/block_dev.c | 1 + fs/gfs2/bmap.c | 4 + fs/lockd/clntproc.c | 3 + fs/namespace.c | 29 +++-- fs/nfs/blocklayout/blocklayout.c | 1 + fs/nfs/callback_proc.c | 61 ++-------- fs/nfs/nfs4proc.c | 35 +++--- fs/nfs/objlayout/objio_osd.c | 1 + fs/nfs/pnfs.c | 150 +++++++++++++++++++++---- fs/nfs/pnfs.h | 7 +- fs/notify/inotify/inotify_user.c | 4 - fs/ocfs2/dlmglue.c | 5 +- include/linux/console.h | 2 + include/linux/if_vlan.h | 6 +- include/linux/pps_kernel.h | 17 ++- include/linux/vt_kern.h | 3 + include/net/dst.h | 8 +- include/net/icmp.h | 1 + include/net/inet6_hashtables.h | 8 +- include/net/inet_sock.h | 1 + include/net/ip6_fib.h | 39 ++----- include/net/ipv6.h | 12 ++ include/net/sock.h | 2 +- include/uapi/linux/serial_core.h | 2 +- include/uapi/linux/usb/audio.h | 6 +- kernel/futex.c | 2 - kernel/futex_compat.c | 2 - kernel/hrtimer.c | 36 +++--- kernel/irq/spurious.c | 7 +- kernel/posix-cpu-timers.c | 23 +++- kernel/timeconst.pl | 6 +- kernel/workqueue.c | 2 +- mm/fadvise.c | 18 ++- mm/mmu_notifier.c | 82 +++++++------- mm/shmem.c | 10 +- net/core/dst.c | 1 + net/core/sock_diag.c | 3 + net/ipv4/af_inet.c | 11 +- net/ipv4/icmp.c | 23 ++++ net/ipv4/ping.c | 4 +- net/ipv4/tcp_output.c | 18 +-- net/ipv6/route.c | 8 +- net/ipv6/xfrm6_policy.c | 2 + net/mac80211/mlme.c | 4 +- security/keys/process_keys.c | 2 + sound/drivers/aloop.c | 5 +- sound/pci/ali5451/ali5451.c | 2 +- sound/pci/hda/hda_codec.c | 43 ++++--- sound/pci/hda/hda_codec.h | 3 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/patch_hdmi.c | 18 ++- sound/pci/hda/patch_realtek.c | 1 + sound/pci/rme32.c | 2 +- sound/soc/codecs/arizona.c | 11 +- sound/soc/codecs/wm2200.c | 4 +- sound/usb/quirks-table.h | 2 +- sound/usb/quirks.c | 2 +- tools/perf/Makefile | 4 +- tools/perf/ui/hist.c | 6 +- tools/perf/util/parse-events.y | 1 - tools/perf/util/pmu.y | 1 - 187 files changed, 1605 insertions(+), 970 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/150 x86-32, mm: Rip out x86_32 NUMA remapping code
3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Hansen <[email protected]>
commit f03574f2d5b2d6229dcdf2d322848065f72953c7 upstream.
This code was an optimization for 32-bit NUMA systems.
It has probably been the cause of a number of subtle bugs over the years, although the conditions to excite them would have been hard to trigger. Essentially, we remap part of the kernel linear mapping area, and then sometimes part of that area gets freed back in to the bootmem allocator. If those pages get used by kernel data structures (say mem_map[] or a dentry), there's no big deal. But, if anyone ever tried to use the linear mapping for these pages _and_ cared about their physical address, bad things happen.
For instance, say you passed __GFP_ZERO to the page allocator and then happened to get handed one of these pages, it zero the remapped page, but it would make a pte to the _old_ page. There are probably a hundred other ways that it could screw with things.
We don't need to hang on to performance optimizations for these old boxes any more. All my 32-bit NUMA systems are long dead and buried, and I probably had access to more than most people.
This code is causing real things to break today:
https://lkml.org/lkml/2013/1/9/376
I looked in to actually fixing this, but it requires surgery to way too much brittle code, as well as stuff like per_cpu_ptr_to_phys().
[ hpa: Cc: this for -stable, since it is a memory corruption issue.
However, an alternative is to simply mark NUMA as depends BROKEN rather than EXPERIMENTAL in the X86_32 subclause... ]
--- arch/x86/Kconfig | 4 - arch/x86/mm/numa.c | 3 arch/x86/mm/numa_32.c | 161 -------------------------------------------- arch/x86/mm/numa_internal.h | 6 - 4 files changed, 174 deletions(-)
arch/x86/Kconfig +0 -4
@@ -1253,10 +1253,6 @@ config NODES_SHIFT Specify the maximum number of NUMA Nodes available on the target system. Increases memory reserved to accommodate various tables. -config HAVE_ARCH_ALLOC_REMAP - def_bool y - depends on X86_32 && NUMA - config ARCH_HAVE_MEMORY_PRESENT def_bool y depends on X86_32 && DISCONTIGMEM
arch/x86/mm/numa.c +0 -3
@@ -205,9 +205,6 @@ static void __init setup_node_data(int nif (end && (end - start) <NODE_MIN_SIZE )return ; -/* initialize remap allocator before aligning to ZONE_ALIGN */ -init_alloc_remap (nid, start, end); - start =roundup (start,ZONE_ALIGN ); printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",
arch/x86/mm/numa_32.c +0 -161
167 lines not on this page · raw message
arch/x86/mm/numa_internal.h +0 -6
@@ -21,12 +21,6 @@ void __init numa_reset_distance(void);void __init x86_numa_init (void ); -#ifdef CONFIG_X86_64 -static inline void init_alloc_remap (int nid,u64 start,u64 end) { } -#else -void __init init_alloc_remap (int nid,u64 start,u64 end); -#endif -#ifdef CONFIG_NUMA_EMU void __init numa_emulation (struct numa_meminfo *numa_meminfo,int numa_dist_cnt);
Greg Kroah-Hartman
maintainerPATCH 2/150 x86-32, mm: Remove reference to resume_map_numa_kva()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit bb112aec5ee41427e9b9726e3d57b896709598ed upstream.
Remove reference to removed function resume_map_numa_kva().
--- arch/x86/include/asm/mmzone_32.h | 6 ------ arch/x86/power/hibernate_32.c | 2 -- 2 files changed, 8 deletions(-)
arch/x86/include/asm/mmzone_32.h +0 -6
@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];#include <asm/numaq.h> -extern void resume_map_numa_kva (pgd_t *pgd); - -#else /* !CONFIG_NUMA */ - -static inline void resume_map_numa_kva (pgd_t *pgd) {} -#endif /* CONFIG_NUMA */ #ifdef CONFIG_DISCONTIGMEM
arch/x86/power/hibernate_32.c +0 -2
@@ -129,8 +129,6 @@ static int resume_physical_mapping_init( } } -resume_map_numa_kva (pgd_base); -return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 3/150 x86-32, mm: Remove reference to alloc_remap()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit 07f4207a305c834f528d08428df4531744e25678 upstream.
We have removed the remap allocator for x86-32, and x86-64 never had it (and doesn't need it). Remove residual reference to it.
--- arch/x86/mm/numa.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-)
arch/x86/mm/numa.c +11 -18
@@ -193,7 +193,6 @@ int __init numa_add_memblk(int nid, u64static void __init setup_node_data (int nid,u64 start,u64 end) {const size_t nd_size =roundup (sizeof (pg_data_t),PAGE_SIZE ); -bool remapped = false;u64 nd_pa;void *nd;int tnid;
@@ -211,28 +210,22 @@ static void __init setup_node_data(int n nid, start, end - 1);/* -* Allocate node data. Try remap allocator first, node-local -* memory and then any node. Never allocate in DMA zone. +* Allocate node data. Try node-local memory and then any node. +* Never allocate in DMA zone. */ - nd =alloc_remap (nid, nd_size); -if (nd) { - nd_pa =__pa (nd); - remapped = true; - }else { - nd_pa =memblock_alloc_nid (nd_size,SMP_CACHE_BYTES , nid); -if (!nd_pa) { -pr_err ("Cannot find %zu bytes in node %d\n" , - nd_size, nid); -return ; - } - nd =__va (nd_pa); + nd_pa =memblock_alloc_nid (nd_size,SMP_CACHE_BYTES , nid); +if (!nd_pa) { +pr_err ("Cannot find %zu bytes in node %d\n" , + nd_size, nid); +return ; } + nd =__va (nd_pa);/* report and initialize */ -printk (KERN_INFO " NODE_DATA [mem %#010Lx-%#010Lx]%s\n" , - nd_pa, nd_pa + nd_size -1 , remapped ?" (remapped)" :"" ); +printk (KERN_INFO " NODE_DATA [mem %#010Lx-%#010Lx]\n" , + nd_pa, nd_pa + nd_size -1 ); tnid =early_pfn_to_nid (nd_pa >>PAGE_SHIFT ); -if (!remapped && tnid != nid) +if (tnid != nid)printk (KERN_INFO " NODE_DATA(%d) on node %d\n" , nid, tnid); node_data[nid] = nd;
Greg Kroah-Hartman
maintainerPATCH 4/150 perf tools: Fix build with bison 2.3 and older.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinson Lee <[email protected]>
commit 85df3b3769222894e9692b383c7af124b7721086 upstream.
The %name-prefix "prefix" syntax is not available on bison 2.3 and older. Substitute with the -p "prefix" command-line option for compatibility with older versions of bison.
This patch fixes this build error with older versions of bison.
CC util/sysfs.o
BISON util/pmu-bison.c
util/pmu.y:2.14-24: syntax error, unexpected string, expecting =
make: *** [util/pmu-bison.c] Error 1
--- tools/perf/Makefile | 4 ++-- tools/perf/util/parse-events.y | 1 - tools/perf/util/pmu.y | 1 - 3 files changed, 2 insertions(+), 4 deletions(-)
tools/perf/Makefile +2 -2
@@ -276,13 +276,13 @@ $(OUTPUT)util/parse-events-flex.c: util/ $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/parse-events-flex.h $(PARSER_DEBUG_FLEX) -t util/parse-events.l > $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c: util/parse-events.y - $(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c + $(QUIET_BISON)$(BISON) -v util/parse-events.y -d $(PARSER_DEBUG_BISON) -o $(OUTPUT)util/parse-events-bison.c -p parse_events_ $(OUTPUT)util/pmu-flex.c: util/pmu.l $(OUTPUT)util/pmu-bison.c $(QUIET_FLEX)$(FLEX) --header-file=$(OUTPUT)util/pmu-flex.h -t util/pmu.l > $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c: util/pmu.y - $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c + $(QUIET_BISON)$(BISON) -v util/pmu.y -d -o $(OUTPUT)util/pmu-bison.c -p perf_pmu_ $(OUTPUT)util/parse-events.o: $(OUTPUT)util/parse-events-flex.c $(OUTPUT)util/parse-events-bison.c $(OUTPUT)util/pmu.o: $(OUTPUT)util/pmu-flex.c $(OUTPUT)util/pmu-bison.c
tools/perf/util/parse-events.y +0 -1
@@ -1,5 +1,4 @@ %pure-parser -%name-prefix "parse_events_" %parse-param {void *_data} %parse-param {void *scanner} %lex-param {void* scanner}
tools/perf/util/pmu.y +0 -1
@@ -1,5 +1,4 @@ -%name-prefix "perf_pmu_" %parse-param {struct list_head *format} %parse-param {char *name}
Greg Kroah-Hartman
maintainerPATCH 5/150 perf hists: Fix period symbol_conf.field_sep display
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Olsa <[email protected]>
commit c0d246b85fc7d42688d7a5d999ea671777caf65b upstream.
Currently we don't properly display hist data with symbol_conf.field_sep separator. We need to display either space or separator.
--- tools/perf/ui/hist.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/ui/hist.c +5 -1
@@ -463,11 +463,15 @@ int hist_entry__period_snprintf(struct pif (!perf_hpp__format[i].cond)continue ; +/* +* If there's no field_sep, we still need +* to display initial ' '. +*/ if (!sep || !first) { ret =scnprintf (hpp->buf, hpp->size,"%s" , sep ?:" " );advance_hpp (hpp, ret); + }else first = false; - }if (color && perf_hpp__format[i].color) ret = perf_hpp__format[i].color (hpp, he);
Greg Kroah-Hartman
maintainerPATCH 6/150 timeconst.pl: Eliminate Perl warning
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "H. Peter Anvin" <[email protected]>
commit 63a3f603413ffe82ad775f2d62a5afff87fd94a0 upstream.
defined(@array) is deprecated in Perl and gives off a warning. Restructure the code to remove that warning.
[ hpa: it would be interesting to revert to the timeconst.bc script.
It appears that the failures reported by akpm during testing of that script was due to a known broken version of make, not a problem with bc. The Makefile rules could probably be restructured to avoid the make bug, or it is probably old enough that it doesn't matter. ]
--- kernel/timeconst.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
kernel/timeconst.pl +2 -4
@@ -369,10 +369,8 @@ if ($hz eq '--can') { die "Usage: $0 HZ\n"; } - @val = @{$canned_values{$hz}}; - if (!defined(@val)) { - @val = compute_values($hz); - } + $cv = $canned_values{$hz}; + @val = defined($cv) ? @$cv : compute_values($hz); output($hz, @val); } exit 0;
Greg Kroah-Hartman
maintainerPATCH 7/150 genirq: Avoid deadlock in spurious handling
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit e716efde75267eab919cdb2bef5b2cb77f305326 upstream.
commit 52553ddf(genirq: fix regression in irqfixup, irqpoll) introduced a potential deadlock by calling the action handler with the irq descriptor lock held.
Remove the call and let the handling code run even for an interrupt where only a single action is registered. That matches the goal of the above commit and avoids the deadlock.
Document the confusing action = desc->action reload in the handling loop while at it.
--- kernel/irq/spurious.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/irq/spurious.c +3 -4
@@ -80,13 +80,11 @@ static int try_one_irq(int irq, struct i/* * All handlers must agree on IRQF_SHARED, so we test just the -* first. Check for action->next as well. +* first. */ action = desc->action;if (!action || !(action->flags &IRQF_SHARED ) || - (action->flags & __IRQF_TIMER) || - (action->handler (irq, action->dev_id) ==IRQ_HANDLED ) || - !action->next) + (action->flags & __IRQF_TIMER)) goto out;/* Already running on another processor */
@@ -104,6 +102,7 @@ static int try_one_irq(int irq, struct ido {if (handle_irq_event (desc) ==IRQ_HANDLED ) ret =IRQ_HANDLED ; +/* Make sure that there is still a valid action */ action = desc->action; }while ((desc->istate &IRQS_PENDING ) && action); desc->istate &= ~IRQS_POLL_INPROGRESS ;
Greg Kroah-Hartman
maintainerPATCH 8/150 posix-cpu-timers: Fix nanosleep task_struct leak
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit e6c42c295e071dd74a66b5a9fcf4f44049888ed8 upstream.
The trinity fuzzer triggered a task_struct reference leak via clock_nanosleep with CPU_TIMERs. do_cpu_nanosleep() calls posic_cpu_timer_create(), but misses a corresponding posix_cpu_timer_del() which leads to the task_struct reference leak.
--- kernel/posix-cpu-timers.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
kernel/posix-cpu-timers.c +21 -2
@@ -1401,8 +1401,10 @@ static int do_cpu_nanosleep(const clockiwhile (!signal_pending (current)) {if (timer.it.cpu.expires.sched ==0 ) {/* -* Our timer fired and was reset. +* Our timer fired and was reset, below +* deletion can not fail. */ +posix_cpu_timer_del (&timer);spin_unlock_irq (&timer.it_lock);return 0 ; }
@@ -1420,9 +1422,26 @@ static int do_cpu_nanosleep(const clocki* We were interrupted by a signal. */ sample_to_timespec (which_clock, timer.it.cpu.expires, rqtp); -posix_cpu_timer_set (&timer,0 , &zero_it, it); + error =posix_cpu_timer_set (&timer,0 , &zero_it, it); +if (!error) { +/* +* Timer is now unarmed, deletion can not fail. +*/ +posix_cpu_timer_del (&timer); + }spin_unlock_irq (&timer.it_lock); +while (error ==TIMER_RETRY ) { +/* +* We need to handle case when timer was or is in the +* middle of firing. In other cases we already freed +* resources. +*/ +spin_lock_irq (&timer.it_lock); + error =posix_cpu_timer_del (&timer); +spin_unlock_irq (&timer.it_lock); + } +if ((it->it_value.tv_sec | it->it_value.tv_nsec) ==0 ) {/* * It actually did fire already.
Greg Kroah-Hartman
maintainerPATCH 9/150 hrtimer: Prevent hrtimer_enqueue_reprogram race
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Leonid Shatz <[email protected]>
commit b22affe0aef429d657bc6505aacb1c569340ddd2 upstream.
hrtimer_enqueue_reprogram contains a race which could result in timer.base switch during unlock/lock sequence.
hrtimer_enqueue_reprogram is releasing the lock protecting the timer base for calling raise_softirq_irqsoff() due to a lock ordering issue versus rq->lock.
If during that time another CPU calls __hrtimer_start_range_ns() on the same hrtimer, the timer base might switch, before the current CPU can lock base->lock again and therefor the unlock_timer_base() call will unlock the wrong lock.
[ tglx: Added comment and massaged changelog ]
--- kernel/hrtimer.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
kernel/hrtimer.c +18 -18
@@ -640,21 +640,9 @@ static inline void hrtimer_init_hres(str* and expiry check is done in the hrtimer_interrupt or in the softirq. */ static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) { -if (base->cpu_base->hres_active &&hrtimer_reprogram (timer, base)) { -if (wakeup) { -raw_spin_unlock (&base->cpu_base->lock); -raise_softirq_irqoff (HRTIMER_SOFTIRQ ); -raw_spin_lock (&base->cpu_base->lock); - }else -__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); - -return 1 ; - } - -return 0 ; +return base->cpu_base->hres_active &&hrtimer_reprogram (timer, base); }static inline ktime_t hrtimer_update_base (struct hrtimer_cpu_base *base)
@@ -735,8 +723,7 @@ static inline int hrtimer_switch_to_hresstatic inline void hrtimer_force_reprogram (struct hrtimer_cpu_base *base,int skip_equal) { }static inline int hrtimer_enqueue_reprogram (struct hrtimer *timer, -struct hrtimer_clock_base *base, -int wakeup) +struct hrtimer_clock_base *base) {return 0 ; }
@@ -995,8 +982,21 @@ int __hrtimer_start_range_ns(struct hrti* * XXX send_remote_softirq() ? */ -if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases)) -hrtimer_enqueue_reprogram (timer, new_base, wakeup); +if (leftmost && new_base->cpu_base == &__get_cpu_var (hrtimer_bases) + &&hrtimer_enqueue_reprogram (timer, new_base)) { +if (wakeup) { +/* +* We need to drop cpu_base->lock to avoid a +* lock ordering issue vs. rq->lock. +*/ +raw_spin_unlock (&new_base->cpu_base->lock); +raise_softirq_irqoff (HRTIMER_SOFTIRQ ); +local_irq_restore (flags); +return ret; + }else { +__raise_softirq_irqoff (HRTIMER_SOFTIRQ ); + } + }unlock_hrtimer_base (timer, &flags);
Greg Kroah-Hartman
maintainerPATCH 10/150 x86: Hyper-V: register clocksource only if its advertised
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Olaf Hering <[mailto:[email protected]]>
commit 32068f6527b8f1822a30671dedaf59c567325026 upstream.
Enable hyperv_clocksource only if its advertised as a feature. XenServer 6 returns the signature which is checked in ms_hyperv_platform(), but it does not offer all features. Currently the clocksource is enabled unconditionally in ms_hyperv_init_platform(), and the result is a hanging guest.
Hyper-V spec Bit 1 indicates the availability of Partition Reference Counter. Register the clocksource only if this bit is set.
The guest in question prints this in dmesg:
[ 0.000000] Hypervisor detected: Microsoft HyperV [ 0.000000] HyperV: features 0x70, hints 0x0
This bug can be reproduced easily be setting 'viridian=1' in a HVM domU .cfg file. A workaround without this patch is to boot the HVM guest with 'clocksource=jiffies'.
--- arch/x86/kernel/cpu/mshyperv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/mshyperv.c +2 -1
@@ -68,7 +68,8 @@ static void __init ms_hyperv_init_platfoprintk (KERN_INFO "HyperV: features 0x%x, hints 0x%x\n" , ms_hyperv.features, ms_hyperv.hints); -clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 ); +if (ms_hyperv.features &HV_X64_MSR_TIME_REF_COUNT_AVAILABLE ) +clocksource_register_hz (&hyperv_cs,NSEC_PER_SEC /100 ); }const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
Greg Kroah-Hartman
maintainerPATCH 11/150 workqueue: un-GPL function delayed_work_timer_fn()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Konstantin Khlebnikov <[email protected]>
commit 1438ade5670b56d5386c220e1ad4b5a824a1e585 upstream.
commit d8e794dfd51c368ed3f686b7f4172830b60ae47b ("workqueue: set delayed_work->timer function on initialization") exports function delayed_work_timer_fn() only for GPL modules. This makes delayed-works unusable for non-GPL modules, because initialization macro now requires GPL symbol. For example schedule_delayed_work() available for non-GPL.
--- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/workqueue.c +1 -1
@@ -1352,7 +1352,7 @@ void delayed_work_timer_fn(unsigned long/* should have been called from irqsafe timer with irq already off */ __queue_work (dwork->cpu, cwq->wq, &dwork->work); } -EXPORT_SYMBOL_GPL (delayed_work_timer_fn); +EXPORT_SYMBOL (delayed_work_timer_fn);static void __queue_delayed_work (int cpu,struct workqueue_struct *wq,struct delayed_work *dwork,unsigned long delay)
Greg Kroah-Hartman
maintainerPATCH 12/150 ALSA: ali5451: remove irq enabling in pointer callback
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit dacae5a19b4cbe1b5e3a86de23ea74cbe9ec9652 upstream.
snd_ali_pointer function is called with local interrupts disabled. However it seems very strange to reenable them in such way.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/ali5451/ali5451.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/ali5451/ali5451.c +1 -1
@@ -1435,7 +1435,7 @@ static snd_pcm_uframes_t snd_ali_pointerspin_lock (&codec->reg_lock);if (!pvoice->running) { -spin_unlock_irq (&codec->reg_lock); +spin_unlock (&codec->reg_lock);return 0 ; }outb (pvoice->number,ALI_REG (codec,ALI_GC_CIR ));
Greg Kroah-Hartman
maintainerPATCH 13/150 ALSA: rme32.c irq enabling after spin_lock_irq
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Denis Efremov <[email protected]>
commit f49a59c4471d81a233e09dda45187cc44fda009d upstream.
According to the other code in this driver and similar code in rme96 it seems, that spin_lock_irq in snd_rme32_capture_close function should be paired with spin_unlock_irq.
Found by Linux Driver Verification project (linuxtesting.org).
--- sound/pci/rme32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/rme32.c +1 -1
@@ -1017,7 +1017,7 @@ static int snd_rme32_capture_close(strucspin_lock_irq (&rme32->lock); rme32->capture_substream =NULL ; rme32->capture_periodsize =0 ; -spin_unlock (&rme32->lock); +spin_unlock_irq (&rme32->lock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 14/150 ALSA: aloop: Fix Oops while PM resume
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit edac894389f9c9de2a1368c78809c824b343f3a5 upstream.
snd-aloop driver has no proper PM implementation, thus the PM resume may trigger Oops due to leftover timer instance. This patch adds the missing suspend/resume implementation.
--- sound/drivers/aloop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
sound/drivers/aloop.c +4 -1
@@ -286,12 +286,14 @@ static int loopback_trigger(struct snd_ploopback_active_notify (dpcm);break ;case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +case SNDRV_PCM_TRIGGER_SUSPEND :spin_lock (&cable->lock); cable->pause |= stream;loopback_timer_stop (dpcm);spin_unlock (&cable->lock);break ;case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +case SNDRV_PCM_TRIGGER_RESUME :spin_lock (&cable->lock); dpcm->last_jiffies = jiffies; cable->pause &= ~stream;
@@ -563,7 +565,8 @@ static snd_pcm_uframes_t loopback_pointestatic struct snd_pcm_hardware loopback_pcm_hardware = { .info = (SNDRV_PCM_INFO_INTERLEAVED |SNDRV_PCM_INFO_MMAP | -SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_PAUSE ), +SNDRV_PCM_INFO_MMAP_VALID |SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME ), .formats = (SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S16_BE |SNDRV_PCM_FMTBIT_S32_LE |SNDRV_PCM_FMTBIT_S32_BE |SNDRV_PCM_FMTBIT_FLOAT_LE |SNDRV_PCM_FMTBIT_FLOAT_BE ),
Greg Kroah-Hartman
maintainerPATCH 15/150 tty: Prevent deadlock in n_gsm driver
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dirkjan Bussink <[email protected]>
commit 4d9b109060f690f5c835130ff54165ae157b3087 upstream.
This change fixes a deadlock when the multiplexer is closed while there are still client side ports open.
When the multiplexer is closed and there are active tty's it tries to close them with tty_vhangup. This has a problem though, because tty_vhangup needs the tty_lock. This patch changes it to unlock the tty_lock before attempting the hangup and relocks afterwards. The additional call to tty_port_tty_set is needed because otherwise the port stays active because of the reference counter.
This change also exposed another problem that other code paths don't expect that the multiplexer could have been closed. This patch also adds checks for these cases in the gsmtty_ class of function that could be called.
The documentation explicitly states that "first close all virtual ports before closing the physical port" but we've found this to not always reality in our field situations. The GPRS / UTMS modem sometimes crashes and needs a power cycle in that case which means cleanly shutting down everything is not always possible. This change makes it much more robust for our situation where at least the system is recoverable with this patch and doesn't hang in a deadlock situation inside the kernel.
The patch is against the long term support kernel (3.4.27) and should apply cleanly to more recent branches. Tested with a Telit GE864-QUADV2 and Telit HE910 modem.
--- drivers/tty/n_gsm.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
drivers/tty/n_gsm.c +41 -1
@@ -1689,6 +1689,8 @@ static inline void dlci_put(struct gsm_dtty_port_put (&dlci->port); } +static void gsm_destroy_network (struct gsm_dlci *dlci); +/** * gsm_dlci_release - release DLCI * @dlci: DLCI to destroy
@@ -1702,9 +1704,19 @@ static void gsm_dlci_release(struct gsm_ {struct tty_struct *tty =tty_port_tty_get (&dlci->port);if (tty) { +mutex_lock (&dlci->mutex); +gsm_destroy_network (dlci); +mutex_unlock (&dlci->mutex); + +/* tty_vhangup needs the tty_lock, so unlock and +relock after doing the hangup. */ +tty_unlock (tty);tty_vhangup (tty); +tty_lock (tty); +tty_port_tty_set (&dlci->port,NULL );tty_kref_put (tty); } + dlci->state =DLCI_CLOSED ;dlci_put (dlci); }
@@ -2947,6 +2959,8 @@ static void gsmtty_close(struct tty_struif (dlci ==NULL )return ; +if (dlci->state ==DLCI_CLOSED ) +return ;mutex_lock (&dlci->mutex);gsm_destroy_network (dlci);mutex_unlock (&dlci->mutex);
@@ -2965,6 +2979,8 @@ out:static void gsmtty_hangup (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return ;tty_port_hangup (&dlci->port);gsm_dlci_begin_close (dlci); }
@@ -2972,9 +2988,12 @@ static void gsmtty_hangup(struct tty_strstatic int gsmtty_write (struct tty_struct *tty,const unsigned char *buf,int len) { +int sent;struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;/* Stuff the bytes into the fifo queue */ -int sent =kfifo_in_locked (dlci->fifo, buf, len, &dlci->lock); + sent =kfifo_in_locked (dlci->fifo, buf, len, &dlci->lock);/* Need to kick the channel */ gsm_dlci_data_kick (dlci);return sent;
@@ -2983,18 +3002,24 @@ static int gsmtty_write(struct tty_strucstatic int gsmtty_write_room (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;return TX_SIZE -kfifo_len (dlci->fifo); }static int gsmtty_chars_in_buffer (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;return kfifo_len (dlci->fifo); }static void gsmtty_flush_buffer (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return ;/* Caution needed: If we implement reliable transport classes then the data being transmitted can't simply be junked once it has first hit the stack. Until then we can just blow it
@@ -3013,6 +3038,8 @@ static void gsmtty_wait_until_sent(strucstatic int gsmtty_tiocmget (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;return dlci->modem_rx; }
@@ -3022,6 +3049,8 @@ static int gsmtty_tiocmset(struct tty_ststruct gsm_dlci *dlci = tty->driver_data;unsigned int modem_tx = dlci->modem_tx; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ; modem_tx &= ~clear; modem_tx |= set;
@@ -3040,6 +3069,8 @@ static int gsmtty_ioctl(struct tty_strucstruct gsm_netconfig nc;int index; +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;switch (cmd) {case GSMIOC_ENABLE_NET :if (copy_from_user (&nc, (void __user *)arg,sizeof (nc)))
@@ -3066,6 +3097,9 @@ static int gsmtty_ioctl(struct tty_strucstatic void gsmtty_set_termios (struct tty_struct *tty,struct ktermios *old) { +struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return ;/* For the moment its fixed. In actual fact the speed information for the virtual channel can be propogated in both directions by the RPN control message. This however rapidly gets nasty as we
@@ -3077,6 +3111,8 @@ static void gsmtty_set_termios(struct ttstatic void gsmtty_throttle (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return ;if (tty->termios.c_cflag &CRTSCTS ) dlci->modem_tx &= ~TIOCM_DTR ; dlci->throttled =1 ;
@@ -3087,6 +3123,8 @@ static void gsmtty_throttle(struct tty_sstatic void gsmtty_unthrottle (struct tty_struct *tty) {struct gsm_dlci *dlci = tty->driver_data; +if (dlci->state ==DLCI_CLOSED ) +return ;if (tty->termios.c_cflag &CRTSCTS ) dlci->modem_tx |=TIOCM_DTR ; dlci->throttled =0 ;
@@ -3098,6 +3136,8 @@ static int gsmtty_break_ctl(struct tty_s {struct gsm_dlci *dlci = tty->driver_data;int encode =0 ;/* Off */ +if (dlci->state ==DLCI_CLOSED ) +return -EINVAL ;if (state ==-1 )/* "On indefinitely" - we can't encode this properly */
Greg Kroah-Hartman
maintainerPATCH 16/150 tty: set_termios/set_termiox should not return -EINTR
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 183d95cdd834381c594d3aa801c1f9f9c0c54fa9 upstream.
See https://bugzilla.redhat.com/show_bug.cgi?id=904907
read command causes bash to abort with double free or corruption (out).
A simple test-case from Roman:
// Compile the reproducer and send sigchld ti that process.
// EINTR occurs even if SA_RESTART flag is set.
void handler(int sig)
{
}
main()
{
struct sigaction act;
act.sa_handler = handler;
act.sa_flags = SA_RESTART;
sigaction (SIGCHLD, &act, 0);
struct termio ttp;
ioctl(0, TCGETA, &ttp);
while(1)
{
if (ioctl(0, TCSETAW, ttp) < 0)
{
if (errno == EINTR)
{
fprintf(stderr, "BUG!"); return(1);
}
}
}
}Change set_termios/set_termiox to return -ERESTARTSYS to fix this particular problem.
I didn't dare to change other EINTR's in drivers/tty/, but they look equally wrong.
--- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/tty_ioctl.c +2 -2
@@ -617,7 +617,7 @@ static int set_termios(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }tty_set_termios (tty, &tmp_termios);
@@ -684,7 +684,7 @@ static int set_termiox(struct tty_structif (opt &TERMIOS_WAIT ) {tty_wait_until_sent (tty,0 );if (signal_pending (current)) -return -EINTR ; +return -ERESTARTSYS ; }mutex_lock (&tty->termios_mutex);
Greg Kroah-Hartman
maintainerPATCH 17/150 USB: serial: fix null-pointer dereferences on disconnect
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit b2ca699076573c94fee9a73cb0d8645383b602a0 upstream.
Make sure serial-driver dtr_rts is called with disc_mutex held after checking the disconnected flag.
Due to a bug in the tty layer, dtr_rts may get called after a device has been disconnected and the tty-device unregistered. Some drivers have had individual checks for disconnect to make sure the disconnected interface was not accessed, but this should really be handled in usb-serial core (at least until the long-standing tty-bug has been fixed).
Note that the problem has been made more acute with commit 0998d0631001 ("device-core: Ensure drvdata = NULL when no driver is bound") as the port data is now also NULL when dtr_rts is called resulting in further oopses.
--- drivers/usb/serial/ftdi_sio.c | 20 +++++++++----------- drivers/usb/serial/mct_u232.c | 22 +++++++++------------- drivers/usb/serial/quatech2.c | 18 ++++++++---------- drivers/usb/serial/sierra.c | 8 +------- drivers/usb/serial/ssu100.c | 19 ++++++++----------- drivers/usb/serial/usb-serial.c | 14 ++++++++++++-- drivers/usb/serial/usb_wwan.c | 8 +++----- 7 files changed, 50 insertions(+), 59 deletions(-)
drivers/usb/serial/ftdi_sio.c +9 -11
@@ -1886,24 +1886,22 @@ static void ftdi_dtr_rts(struct usb_seri {struct ftdi_private *priv =usb_get_serial_port_data (port); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* Disable flow control */ -if (!on &&usb_control_msg (port->serial->dev, +/* Disable flow control */ +if (!on) { +if (usb_control_msg (port->serial->dev,usb_sndctrlpipe (port->serial->dev,0 ),FTDI_SIO_SET_FLOW_CTRL_REQUEST ,FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE ,0 , priv->interface,NULL ,0 ,WDR_TIMEOUT ) <0 ) { -dev_err (&port->dev,"error from flowcontrol urb\n" ); +dev_err (&port->dev,"error from flowcontrol urb\n" ); } -/* drop RTS and DTR */ -if (on) -set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); -else -clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); } -mutex_unlock (&port->serial->disc_mutex); +/* drop RTS and DTR */ +if (on) +set_mctrl (port,TIOCM_DTR |TIOCM_RTS ); +else +clear_mctrl (port,TIOCM_DTR |TIOCM_RTS ); }/*
drivers/usb/serial/mct_u232.c +9 -13
@@ -499,19 +499,15 @@ static void mct_u232_dtr_rts(struct usb_unsigned int control_state;struct mct_u232_private *priv =usb_get_serial_port_data (port); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* drop DTR and RTS */ -spin_lock_irq (&priv->lock); -if (on) - priv->control_state |=TIOCM_DTR |TIOCM_RTS ; -else - priv->control_state &= ~(TIOCM_DTR |TIOCM_RTS ); - control_state = priv->control_state; -spin_unlock_irq (&priv->lock); -mct_u232_set_modem_ctrl (port, control_state); - } -mutex_unlock (&port->serial->disc_mutex); +spin_lock_irq (&priv->lock); +if (on) + priv->control_state |=TIOCM_DTR |TIOCM_RTS ; +else + priv->control_state &= ~(TIOCM_DTR |TIOCM_RTS ); + control_state = priv->control_state; +spin_unlock_irq (&priv->lock); + +mct_u232_set_modem_ctrl (port, control_state); }static void mct_u232_close (struct usb_serial_port *port)
drivers/usb/serial/quatech2.c +8 -10
@@ -945,19 +945,17 @@ static void qt2_dtr_rts(struct usb_seriastruct usb_device *dev = port->serial->dev;struct qt2_port_private *port_priv =usb_get_serial_port_data (port); -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* Disable flow control */ -if (!on &&qt2_setregister (dev, port_priv->device_port, +/* Disable flow control */ +if (!on) { +if (qt2_setregister (dev, port_priv->device_port,UART_MCR ,0 ) <0 )dev_warn (&port->dev,"error from flowcontrol urb\n" ); -/* drop RTS and DTR */ -if (on) -update_mctrl (port_priv,TIOCM_DTR |TIOCM_RTS ,0 ); -else -update_mctrl (port_priv,0 ,TIOCM_DTR |TIOCM_RTS ); } -mutex_unlock (&port->serial->disc_mutex); +/* drop RTS and DTR */ +if (on) +update_mctrl (port_priv,TIOCM_DTR |TIOCM_RTS ,0 ); +else +update_mctrl (port_priv,0 ,TIOCM_DTR |TIOCM_RTS ); }static void qt2_update_msr (struct usb_serial_port *port,unsigned char *ch)
drivers/usb/serial/sierra.c +1 -7
@@ -861,19 +861,13 @@ static int sierra_open(struct tty_structstatic void sierra_dtr_rts (struct usb_serial_port *port,int on) { -struct usb_serial *serial = port->serial;struct sierra_port_private *portdata; portdata =usb_get_serial_port_data (port); portdata->rts_state = on; portdata->dtr_state = on; -if (serial->dev) { -mutex_lock (&serial->disc_mutex); -if (!serial->disconnected) -sierra_send_setup (port); -mutex_unlock (&serial->disc_mutex); - } +sierra_send_setup (port); }static int sierra_startup (struct usb_serial *serial)
drivers/usb/serial/ssu100.c +8 -11
@@ -506,19 +506,16 @@ static void ssu100_dtr_rts(struct usb_se {struct usb_device *dev = port->serial->dev; -mutex_lock (&port->serial->disc_mutex); -if (!port->serial->disconnected) { -/* Disable flow control */ -if (!on && -ssu100_setregister (dev,0 ,UART_MCR ,0 ) <0 ) +/* Disable flow control */ +if (!on) { +if (ssu100_setregister (dev,0 ,UART_MCR ,0 ) <0 )dev_err (&port->dev,"error from flowcontrol urb\n" ); -/* drop RTS and DTR */ -if (on) -set_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); -else -clear_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); } -mutex_unlock (&port->serial->disc_mutex); +/* drop RTS and DTR */ +if (on) +set_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); +else +clear_mctrl (dev,TIOCM_DTR |TIOCM_RTS ); }static void ssu100_update_msr (struct usb_serial_port *port,u8 msr)
drivers/usb/serial/usb-serial.c +12 -2
@@ -688,10 +688,20 @@ static int serial_carrier_raised(structstatic void serial_dtr_rts (struct tty_port *port,int on) { struct usb_serial_port *p = container_of(port, struct usb_serial_port, port); -struct usb_serial_driver *drv = p->serial->type; +struct usb_serial *serial = p->serial; +struct usb_serial_driver *drv = serial->type; -if (drv->dtr_rts) +if (!drv->dtr_rts) +return ; +/* +* Work-around bug in the tty-layer which can result in dtr_rts +* being called after a disconnect (and tty_unregister_device +* has returned). Remove once bug has been squashed. +*/ +mutex_lock (&serial->disc_mutex); +if (!serial->disconnected) drv->dtr_rts (p, on); +mutex_unlock (&serial->disc_mutex); }static const struct tty_port_operations serial_port_ops = {
drivers/usb/serial/usb_wwan.c +3 -5
@@ -38,7 +38,6 @@void usb_wwan_dtr_rts (struct usb_serial_port *port,int on) { -struct usb_serial *serial = port->serial;struct usb_wwan_port_private *portdata;struct usb_wwan_intf_private *intfdata;
@@ -48,12 +47,11 @@ void usb_wwan_dtr_rts(struct usb_serial_return ; portdata =usb_get_serial_port_data (port); -mutex_lock (&serial->disc_mutex); +/* FIXME: locking */ portdata->rts_state = on; portdata->dtr_state = on; -if (serial->dev) - intfdata->send_setup (port); -mutex_unlock (&serial->disc_mutex); + + intfdata->send_setup (port); }EXPORT_SYMBOL (usb_wwan_dtr_rts);
Greg Kroah-Hartman
maintainerPATCH 18/150 serial: imx: Fix recursive locking bug
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit 677fe555cbfb188af58cce105f4dae9505e58c31 upstream.
commit 9ec1882df2 (tty: serial: imx: console write routing is unsafe on SMP) introduced a recursive locking bug in imx_console_write().
The callchain is:
imx_rxint()
spin_lock_irqsave(&sport->port.lock,flags);
...
uart_handle_sysrq_char();
sysrq_function();
printk();
imx_console_write();
spin_lock_irqsave(&sport->port.lock,flags); <--- DEADThe bad news is that the kernel debugging facilities can dectect the problem, but the printks never surface on the serial console for obvious reasons.
There is a similar issue with oops_in_progress. If the kernel crashes we really don't want to be stuck on the lock and unable to tell what happened.
In general most UP originated drivers miss these checks and nobody ever notices because CONFIG_PROVE_LOCKING seems to be still ignored by a large number of developers.
The solution is to avoid locking in the sysrq case and trylock in the oops_in_progress case.
This scheme is used in other drivers as well and it would be nice if we could move this to a common place, so the usual copy/paste/modify bugs can be avoided.
Now there is another issue with this scheme:
CPU0 CPU1printk()
rxint()
sysrq_detection() -> sets port->sysrq
return from interrupt
console_write()
if (port->sysrq)
avoid lockingport->sysrq is reset with the next receive character. So as long as the port->sysrq is not reset and this can take an endless amount of time if after the break no futher receive character follows, all console writes happen unlocked.
While the current writer is protected against other console writers by the console sem, it's unprotected against open/close or other operations which fiddle with the port. That's what the above mentioned commit tried to solve.
That's an issue in all drivers which use that scheme and unfortunately there is no easy workaround. The only solution is to have a separate indicator port->sysrq_cpu. uart_handle_sysrq_char() then sets it to smp_processor_id() before calling into handle_sysrq() and resets it to -1 after that. Then change the locking check to:
if (port->sysrq_cpu == smp_processor_id())
locked = 0;
else if (oops_in_progress)
locked = spin_trylock_irqsave(port->lock, flags);
else spin_lock_irqsave(port->lock, flags);
That would force all other cpus into the spin_lock path. Problem solved, but that's way beyond the scope of this fix and really wants to be implemented in a common function which calls the uart specific write function to avoid another gazillion of hard to debug copy/paste/modify bugs.
--- drivers/tty/serial/imx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/tty/serial/imx.c +9 -2
@@ -1213,8 +1213,14 @@ imx_console_write(struct console *co, costruct imx_port_ucrs old_ucr;unsigned int ucr1;unsigned long flags; +int locked =1 ; -spin_lock_irqsave (&sport->port.lock, flags); +if (sport->port.sysrq) + locked =0 ; +else if (oops_in_progress) + locked =spin_trylock_irqsave (&sport->port.lock, flags); +else +spin_lock_irqsave (&sport->port.lock, flags);/* * First, save UCR1/2/3 and then disable interrupts
@@ -1241,7 +1247,8 @@ imx_console_write(struct console *co, coimx_port_ucrs_restore (&sport->port, &old_ucr); -spin_unlock_irqrestore (&sport->port.lock, flags); +if (locked) +spin_unlock_irqrestore (&sport->port.lock, flags); }/*
Greg Kroah-Hartman
maintainerPATCH 19/150 serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Chan <[email protected]>
commit 85f024401bf80746ae08b7fd5809a9b16accf0b1 upstream.
It was mistakenly defined to be 24 instead of the next higher number 25.
--- include/uapi/linux/serial_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/serial_core.h +1 -1
@@ -50,7 +50,7 @@#define PORT_LPC3220 22/* NXP LPC32xx SoC "Standard" UART */ #define PORT_8250_CIR 23/* CIR infrared port, has its own driver */ #define PORT_XR17V35X 24/* Exar XR17V35x UARTs */ -#define PORT_BRCM_TRUMANAGE 24 +#define PORT_BRCM_TRUMANAGE 25#define PORT_MAX_8250 25/* max port ID */ /*
Re: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Quoted 22 lines · Greg Kroah-Hartman
3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Chan <[email protected]>
commit
85f024401bf80746ae08b7fd5809a9b16accf0b1upstream.It was mistakenly defined to be 24 instead of the next higher number 25.
Reported-by Alexander Shishkin <[email protected]>Cc Stephen Hurd <[email protected]>Signed-off-by Michael Chan <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- include/uapi/linux/serial_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/uapi/linux/serial_core.h line 56
Quoted 8 lines
include/uapi/linux/serial_core.h +1
-1@@ -50,7 +50,7 @@#define PORT_LPC3220 22/* NXP LPC32xx SoC "Standard" UART */ #define PORT_8250_CIR 23/* CIR infrared port, has its own driver */ #define PORT_XR17V35X 24/* Exar XR17V35x UARTs */ -#define PORT_BRCM_TRUMANAGE 24 +#define PORT_BRCM_TRUMANAGE 25#define PORT_MAX_8250 25/* max port ID */ /*
Hang on, this is a uapi header - are these numbers actually used by userland or are they really internal to the 8250 drivers?
Ben.
Signature · 3 lines
Ben Hutchings Kids! Bringing about Armageddon can be dangerous. Do not attempt it in your own home. - Terry Pratchett and Neil Gaiman, `Good Omens'
Greg Kroah-Hartman
maintainerRe: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Quoted 30 lines · Ben Hutchings
Quoted 29 lines · Greg Kroah-Hartman
3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Chan <[email protected]>
commit
85f024401bf80746ae08b7fd5809a9b16accf0b1upstream.It was mistakenly defined to be 24 instead of the next higher number 25.
Reported-by Alexander Shishkin <[email protected]>Cc Stephen Hurd <[email protected]>Signed-off-by Michael Chan <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- include/uapi/linux/serial_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/uapi/linux/serial_core.h +1
-1@@ -50,7 +50,7 @@#define PORT_LPC3220 22/* NXP LPC32xx SoC "Standard" UART */ #define PORT_8250_CIR 23/* CIR infrared port, has its own driver */ #define PORT_XR17V35X 24/* Exar XR17V35x UARTs */ -#define PORT_BRCM_TRUMANAGE 24 +#define PORT_BRCM_TRUMANAGE 25#define PORT_MAX_8250 25/* max port ID */
Quoted 4 lines
include/uapi/linux/serial_core.h line 56
Quoted 1 line
include/uapi/linux/serial_core.h +0
-0/* Hang on, this is a uapi header - are these numbers actually used by userland or are they really internal to the 8250 drivers?
Interesting, I think they are internal to the 8250 drivers, as I don't see how the number can be exported to userspace. So they should probably be moved into 8250.c somewhere.
But I could be wrong, this code is so old it's scary, hopefully no one really is using this number in userspace.
Only one way to find out, care to make up a patch for me to apply and queue up for 3.10?
thanks,
greg k-h
Re: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Quoted 2 lines · Greg Kroah-Hartman
Quoted 1 line · Ben Hutchings
On Tue, 2013-02-26 at 15:54 -0800, Greg Kroah-Hartman wrote:
[...]
Quoted 19 lines
Quoted 10 lines
Quoted 10 lines
include/uapi/linux/serial_core.h +1
-1@@ -50,7 +50,7 @@#define PORT_LPC3220 22/* NXP LPC32xx SoC "Standard" UART */ #define PORT_8250_CIR 23/* CIR infrared port, has its own driver */ #define PORT_XR17V35X 24/* Exar XR17V35x UARTs */ -#define PORT_BRCM_TRUMANAGE 24 +#define PORT_BRCM_TRUMANAGE 25#define PORT_MAX_8250 25/* max port ID */ Quoted 4 lines
include/uapi/linux/serial_core.h line 56
Quoted 1 line
include/uapi/linux/serial_core.h +0
-0/* Hang on, this is a uapi header - are these numbers actually used by userland or are they really internal to the 8250 drivers?
Interesting, I think they are internal to the 8250 drivers, as I don't see how the number can be exported to userspace. So they should probably be moved into 8250.c somewhere.
Quoted 5 lines
But I could be wrong, this code is so old it's scary, hopefully no one really is using this number in userspace.
Only one way to find out, care to make up a patch for me to apply and queue up for 3.10?
It looks like they appear in serial_struct::type when the TIOC{G,S}SERIAL ioctls are used. Some of the values are also defined in <linux/serial.h>, which is fine as long as the definitions are token-wise identical.
For backported versions I had better not renumber them... oops, I'll go and fix that now. (Only reason I did so was because it looked like 8250 wouldn't cope with discontiguous numbering.)
Ben.
Signature · 2 lines
Ben Hutchings Time is nature's way of making sure that everything doesn't happen at once.
Re: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
I've queued up the following for 3.2.y. Let me know if you see any issue with this or want to ack it.
Ben.
---
From: Ben Hutchings <[email protected]>
Subject: 8250: use correct value for PORT_BRCM_TRUMANAGE
Date: Sun, 03 Mar 2013 03:24:34 +0000
When backporting commit ebebd49a8eab ('8250/16?50: Add support for Broadcom TruManage redirected serial port') I took the next available port type number for PORT_BRCM_TRUMANAGE (22).
However, the 8250 port type numbers are exposed to userland through the TIOC{G,S}SERIAL ioctls and so must remain stable. Redefine PORT_BRCM_TRUMANAGE as 25, matching mainline as of commit 85f024401bf807.
This leaves port types 22-24 within the valid range for 8250 but not implemented there. Change serial8250_verify_port() to specifically reject these and change serial8250_type() to return "unknown" for them (though I'm not sure why it would ever see them).
---
drivers/tty/serial/8250.c +2 -2
@@ -2695,7 +2695,7 @@ serial8250_verify_port(struct uart_portif (ser->irq >= nr_irqs || ser->irq <0 || ser->baud_base <9600 || ser->type <PORT_UNKNOWN || ser->type >=ARRAY_SIZE (uart_config) || ser->type ==PORT_CIRRUS || - ser->type ==PORT_STARTECH ) + ser->type ==PORT_STARTECH || uart_config[ser->type].name ==NULL )return -EINVAL ;return 0 ; }
@@ -2705,7 +2705,7 @@ serial8250_type(struct uart_port *port) {int type = port->type; -if (type >=ARRAY_SIZE (uart_config)) +if (type >=ARRAY_SIZE (uart_config) || uart_config[type].name ==NULL ) type =0 ;return uart_config[type].name; }
include/linux/serial_core.h +2 -2
@@ -47,8 +47,8 @@#define PORT_U6_16550A 19/* ST-Ericsson U6xxx internal UART */ #define PORT_TEGRA 20/* NVIDIA Tegra internal UART */ #define PORT_XR17D15X 21/* Exar XR17D15x UART */ -#define PORT_BRCM_TRUMANAGE 22 -#define PORT_MAX_8250 22/* max port ID */ +#define PORT_BRCM_TRUMANAGE 25 +#define PORT_MAX_8250 25/* max port ID */ /* * ARM specific type numbers. These are not currently guaranteed
Signature · 2 lines
Ben Hutchings Time is nature's way of making sure that everything doesn't happen at once.
Re: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Quoted 38 lines · Ben Hutchings
I've queued up the following for 3.2.y. Let me know if you see any issue with this or want to ack it.
Ben.
---
From: Ben Hutchings <[email protected]>
Subject: 8250: use correct value forPORT_BRCM_TRUMANAGE
Date: Sun, 03 Mar 2013 03:24:34 +0000When backporting commit
ebebd49a8eab('8250/16?50: Add support for Broadcom TruManage redirected serial port') I took the next available port type number forPORT_BRCM_TRUMANAGE(22).However, the 8250 port type numbers are exposed to userland through the TIOC{G,S}SERIAL ioctls and so must remain stable. Redefine
PORT_BRCM_TRUMANAGEas 25, matching mainline as of commit85f024401bf807.This leaves port types 22-24 within the valid range for 8250 but not implemented there. Change
serial8250_verify_port()to specifically reject these and changeserial8250_type()to return "unknown" for them (though I'm not sure why it would ever see them).Signed-off-by Ben Hutchings <[email protected]>---
drivers/tty/serial/8250.c +1
-1@@ -2695,7 +2695,7 @@ serial8250_verify_port(struct uart_portif (ser->irq >= nr_irqs || ser->irq <0 || ser->baud_base <9600 || ser->type <PORT_UNKNOWN || ser->type >=ARRAY_SIZE (uart_config) || ser->type ==PORT_CIRRUS || - ser->type ==PORT_STARTECH ) + ser->type ==PORT_STARTECH || uart_config[ser->type].name ==NULL )return -EINVAL ;return 0 ; }
drivers/tty/serial/8250.c serial8250_type(struct uart_port *port) · line 2708
Quoted 5 lines
drivers/tty/serial/8250.c +1
-1@@ -2705,7 +2705,7 @@ serial8250_type(struct uart_port *port) {int type = port->type; -if (type >=ARRAY_SIZE (uart_config)) +if (type >=ARRAY_SIZE (uart_config) || uart_config[type].name ==NULL )
I don't think these two changes are really needed, as you point out above, no one should really see, or care, about this. But if you do, these changes should go upstream first, right?
include/linux/serial_core.h line 51
Quoted 13 lines
drivers/tty/serial/8250.c +0
-0type =0 ;return uart_config[type].name; }include/linux/serial_core.h +2
-2@@ -47,8 +47,8 @@#define PORT_U6_16550A 19/* ST-Ericsson U6xxx internal UART */ #define PORT_TEGRA 20/* NVIDIA Tegra internal UART */ #define PORT_XR17D15X 21/* Exar XR17D15x UART */ -#define PORT_BRCM_TRUMANAGE 22 -#define PORT_MAX_8250 22/* max port ID */ +#define PORT_BRCM_TRUMANAGE 25 +#define PORT_MAX_8250 25/* max port ID */
This one is good to have though, I have no objection to this hunk going into 3.2, for it, feel free to add:
Re: [ 019/150] serial_core: Fix type definition for PORT_BRCM_TRUMANAGE.
Quoted 42 lines · Greg Kroah-Hartman
Quoted 41 lines · Ben Hutchings
I've queued up the following for 3.2.y. Let me know if you see any issue with this or want to ack it.
Ben.
---
From: Ben Hutchings <[email protected]>
Subject: 8250: use correct value forPORT_BRCM_TRUMANAGE
Date: Sun, 03 Mar 2013 03:24:34 +0000When backporting commit
ebebd49a8eab('8250/16?50: Add support for Broadcom TruManage redirected serial port') I took the next available port type number forPORT_BRCM_TRUMANAGE(22).However, the 8250 port type numbers are exposed to userland through the TIOC{G,S}SERIAL ioctls and so must remain stable. Redefine
PORT_BRCM_TRUMANAGEas 25, matching mainline as of commit85f024401bf807.This leaves port types 22-24 within the valid range for 8250 but not implemented there. Change
serial8250_verify_port()to specifically reject these and changeserial8250_type()to return "unknown" for them (though I'm not sure why it would ever see them).Signed-off-by Ben Hutchings <[email protected]>---
drivers/tty/serial/8250.c +1
-1@@ -2695,7 +2695,7 @@ serial8250_verify_port(struct uart_portif (ser->irq >= nr_irqs || ser->irq <0 || ser->baud_base <9600 || ser->type <PORT_UNKNOWN || ser->type >=ARRAY_SIZE (uart_config) || ser->type ==PORT_CIRRUS || - ser->type ==PORT_STARTECH ) + ser->type ==PORT_STARTECH || uart_config[ser->type].name ==NULL )return -EINVAL ;return 0 ; }@@ -2705,7 +2705,7 @@ serial8250_type(struct uart_port *port) {int type = port->type;
Quoted 6 lines
drivers/tty/serial/8250.c serial8250_type(struct uart_port *port) · line 2708
Quoted 2 lines
drivers/tty/serial/8250.c +1
-1-if (type >=ARRAY_SIZE (uart_config)) +if (type >=ARRAY_SIZE (uart_config) || uart_config[type].name ==NULL )I don't think these two changes are really needed, as you point out above, no one should really see, or care, about this. But if you do, these changes should go upstream first, right?
The change in serial8250_verify_port() is needed in 3.2 but not mainline because types 22-24 won't be supported in 3.2. I could alternately define the PORT_* macros for these types and explicitly reject each of those here.
The change in serial8250_type() is done for the same reason. It already has a check for out-of-range type which suggests there's some case where the type might not have been validated by serial8250_verify_port(). Again, not needed upstream as all elements in uart_config have a non-null name.
Ben.
Quoted 19 lines
include/linux/serial_core.h line 51
Quoted 13 lines
drivers/tty/serial/8250.c +0
-0type =0 ;return uart_config[type].name; }include/linux/serial_core.h +2
-2@@ -47,8 +47,8 @@#define PORT_U6_16550A 19/* ST-Ericsson U6xxx internal UART */ #define PORT_TEGRA 20/* NVIDIA Tegra internal UART */ #define PORT_XR17D15X 21/* Exar XR17D15x UART */ -#define PORT_BRCM_TRUMANAGE 22 -#define PORT_MAX_8250 22/* max port ID */ +#define PORT_BRCM_TRUMANAGE 25 +#define PORT_MAX_8250 25/* max port ID */ This one is good to have though, I have no objection to this hunk going into 3.2, for it, feel free to add:
Signature · 3 lines
Ben Hutchings Always try to do things in chronological order; it's less confusing that way.
Greg Kroah-Hartman
maintainerPATCH 20/150 b43: Increase number of RX DMA slots
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit ccae0e50c16a7f7adb029c169147400d1ce9f703 upstream.
Bastian Bittorf reported that some of the silent freezes on a Linksys WRT54G were due to overflow of the RX DMA ring buffer, which was created with 64 slots. That finding reminded me that I was seeing similar crashed on a netbook, which also has a relatively slow processor. After increasing the number of slots to 128, runs on the netbook that previously failed now worked; however, I found that 109 slots had been used in one test. For that reason, the number of slots is being increased to 256.
--- drivers/net/wireless/b43/dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/b43/dma.h +1 -1
@@ -169,7 +169,7 @@ struct b43_dmadesc_generic {/* DMA engine tuning knobs */ #define B43_TXRING_SLOTS 256 -#define B43_RXRING_SLOTS 64 +#define B43_RXRING_SLOTS 256#define B43_DMA0_RX_FW598_BUFSIZE (B43_DMA0_RX_FW598_FO + IEEE80211_MAX_FRAME_LEN)#define B43_DMA0_RX_FW351_BUFSIZE (B43_DMA0_RX_FW351_FO + IEEE80211_MAX_FRAME_LEN)
Greg Kroah-Hartman
maintainerPATCH 21/150 rtlwifi: rtl8192cu: Fix NULL dereference BUG when using new_id
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 957f4aca5fa0db69635271bc4621cc0b65b2d590 upstream.
When the new_id entry in /sysfs is used for a foreign USB device, rtlwifi BUGS with a NULL pointer dereference because the per-driver configuration data is not available. The probe function has been restructured as suggested by Ben Hutchings <[email protected]>.
--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 8 +++++++- drivers/net/wireless/rtlwifi/usb.c | 5 +++-- drivers/net/wireless/rtlwifi/usb.h | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-)
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +7 -1
@@ -363,9 +363,15 @@ static struct usb_device_id rtl8192c_usbMODULE_DEVICE_TABLE (usb, rtl8192c_usb_ids); +static int rtl8192cu_probe (struct usb_interface *intf, +const struct usb_device_id *id) +{ +return rtl_usb_probe (intf, id, &rtl92cu_hal_cfg); +} +static struct usb_driver rtl8192cu_driver = { .name ="rtl8192cu" , - .probe = rtl_usb_probe, + .probe = rtl8192cu_probe, .disconnect = rtl_usb_disconnect, .id_table = rtl8192c_usb_ids,
drivers/net/wireless/rtlwifi/usb.c +3 -2
@@ -941,7 +941,8 @@ static struct rtl_intf_ops rtl_usb_ops = };int rtl_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id) +const struct usb_device_id *id, +struct rtl_hal_cfg *rtl_hal_cfg) {int err;struct ieee80211_hw *hw =NULL ;
@@ -976,7 +977,7 @@ int rtl_usb_probe(struct usb_interface *usb_set_intfdata (intf, hw);/* init cfg & intf_ops */ rtlpriv->rtlhal.interface =INTF_USB ; - rtlpriv->cfg = (struct rtl_hal_cfg *)(id->driver_info); + rtlpriv->cfg = rtl_hal_cfg; rtlpriv->intf_ops = &rtl_usb_ops;rtl_dbgp_flag_init (hw);/* Init IO handler */
drivers/net/wireless/rtlwifi/usb.h +2 -1
@@ -157,7 +157,8 @@ struct rtl_usb_priv {int rtl_usb_probe (struct usb_interface *intf, -const struct usb_device_id *id); +const struct usb_device_id *id, +struct rtl_hal_cfg *rtl92cu_hal_cfg);void rtl_usb_disconnect (struct usb_interface *intf);int rtl_usb_suspend (struct usb_interface *pusb_intf,pm_message_t message);int rtl_usb_resume (struct usb_interface *pusb_intf);
Greg Kroah-Hartman
maintainerPATCH 22/150 rtlwifi: rtl8192cu: Add new USB ID
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc upstream.
A new model of the RTL8188CUS has appeared.
--- drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
@@ -285,6 +285,7 @@ static struct usb_device_id rtl8192c_usb {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x817f, rtl92cu_hal_cfg)},/* RTL8188CUS-VL */ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x818a, rtl92cu_hal_cfg)}, + {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x819a, rtl92cu_hal_cfg)},/* 8188 Combo for BC4 */ {RTL_USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8754, rtl92cu_hal_cfg)},
Greg Kroah-Hartman
maintainerPATCH 23/150 rtlwifi: usb: allocate URB control message setup_packet and data buffer separately
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jussi Kivilinna <[email protected]>
commit bc6b89237acb3dee6af6e64e51a18255fef89cc2 upstream.
rtlwifi allocates both setup_packet and data buffer of control message urb, using shared kmalloc in _usbctrl_vendorreq_async_write. Structure used for allocating is:
struct {
u8 data[254];
struct usb_ctrlrequest dr;
};Because 'struct usb_ctrlrequest' is __packed, setup packet is unaligned and DMA mapping of both 'data' and 'dr' confuses ARM/sunxi, leading to memory corruptions and freezes.
Patch changes setup packet to be allocated separately.
[v2]:
- Use WARN_ON_ONCE instead of WARN_ON
--- drivers/net/wireless/rtlwifi/usb.c | 44 +++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 16 deletions(-)
drivers/net/wireless/rtlwifi/usb.c +28 -16
@@ -42,8 +42,12 @@static void usbctrl_async_callback (struct urb *urb) { -if (urb) -kfree (urb->context); +if (urb) { +/* free dr */ +kfree (urb->setup_packet); +/* free databuf */ +kfree (urb->transfer_buffer); + } } static int _usbctrl_vendorreq_async_write(struct usb_device *udev, u8 request,
@@ -55,39 +59,47 @@ static int _usbctrl_vendorreq_async_writu8 reqtype;struct usb_ctrlrequest *dr;struct urb *urb; -struct rtl819x_async_write_data { -u8 data[REALTEK_USB_VENQT_MAX_BUF_SIZE ]; -struct usb_ctrlrequest dr; - } *buf; +const u16 databuf_maxlen =REALTEK_USB_VENQT_MAX_BUF_SIZE ; +u8 *databuf; + +if (WARN_ON_ONCE (len > databuf_maxlen)) + len = databuf_maxlen; pipe =usb_sndctrlpipe (udev,0 );/* write_out */ reqtype =REALTEK_USB_VENQT_WRITE ; - buf =kmalloc (sizeof (*buf),GFP_ATOMIC ); -if (!buf) + dr =kmalloc (sizeof (*dr),GFP_ATOMIC ); +if (!dr)return -ENOMEM ; + databuf =kmalloc (databuf_maxlen,GFP_ATOMIC ); +if (!databuf) { +kfree (dr); +return -ENOMEM ; + } + urb =usb_alloc_urb (0 ,GFP_ATOMIC );if (!urb) { -kfree (buf); +kfree (databuf); +kfree (dr);return -ENOMEM ; } - dr = &buf->dr; - dr->bRequestType = reqtype; dr->bRequest = request; dr->wValue =cpu_to_le16 (value); dr->wIndex =cpu_to_le16 (index); dr->wLength =cpu_to_le16 (len);/* data are already in little-endian order */ -memcpy (buf, pdata, len); +memcpy (databuf, pdata, len);usb_fill_control_urb (urb, udev, pipe, - (unsigned char *)dr, buf, len, - usbctrl_async_callback, buf); + (unsigned char *)dr, databuf, len, + usbctrl_async_callback,NULL ); rc =usb_submit_urb (urb,GFP_ATOMIC ); -if (rc <0 ) -kfree (buf); +if (rc <0 ) { +kfree (databuf); +kfree (dr); + }usb_free_urb (urb);return rc; }
Greg Kroah-Hartman
maintainerPATCH 24/150 tty vt: fix character insertion overflow
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Pitre <[email protected]>
commit a883b70d8e0a88278c0a1f80753b4dc99962b541 upstream.
Commit 81732c3b2fed ("tty vt: Fix line garbage in virtual console on command line edition") broke insert_char() in multiple ways. Then commit b1a925f44a3a ("tty vt: Fix a regression in command line edition") partially fixed it. However, the buffer being moved is still too large and overflowing beyond the end of the current line, corrupting existing characters on the next line.
Example test case:
echo -e "abc\nde\x1b[A\x1b[4h \x1b[4l\x1b[B"
Expected result:
ab c
de
Current result:
ab c
e
Needless to say that this is very annoying when inserting words in the middle of paragraphs with certain text editors.
--- drivers/tty/vt/vt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/vt/vt.c +1 -1
@@ -539,7 +539,7 @@ static void insert_char(struct vc_data * {unsigned short *p = (unsigned short *) vc->vc_pos; -scr_memmovew (p + nr, p, (vc->vc_cols - vc->vc_x) *2 ); +scr_memmovew (p + nr, p, (vc->vc_cols - vc->vc_x - nr) *2 );scr_memsetw (p, vc->vc_video_erase_char, nr *2 ); vc->vc_need_wrap =0 ;if (DO_UPDATE (vc))
Greg Kroah-Hartman
maintainerPATCH 25/150 xen: Send spinlock IPI to all waiters
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Bader <[email protected]>
commit 76eaca031f0af2bb303e405986f637811956a422 upstream.
There is a loophole between Xen's current implementation of pv-spinlocks and the scheduler. This was triggerable through a testcase until v3.6 changed the TLB flushing code. The problem potentially is still there just not observable in the same way.
What could happen was (is):
1. CPU n tries to schedule task x away and goes into a slow wait for the runq lock of CPU n-# (must be one with a lower number).
2. CPU n-#, while processing softirqs, tries to balance domains and goes into a slow wait for its own runq lock (for updating some records). Since this is a spin_lock_irqsave in softirq context, interrupts will be re-enabled for the duration of the poll_irq hypercall used by Xen.
3. Before the runq lock of CPU n-# is unlocked, CPU n-1 receives an interrupt (e.g. endio) and when processing the interrupt, tries to wake up task x. But that is in schedule and still on_cpu, so try_to_wake_up goes into a tight loop.
4. The runq lock of CPU n-# gets unlocked, but the message only gets sent to the first waiter, which is CPU n-# and that is busily stuck.
5. CPU n-# never returns from the nested interruption to take and release the lock because the scheduler uses a busy wait. And CPU n never finishes the task migration because the unlock notification only went to CPU n-#.
To avoid this and since the unlocking code has no real sense of which waiter is best suited to grab the lock, just send the IPI to all of them. This causes the waiters to return from the hyper- call (those not interrupted at least) and do active spinlocking.
--- arch/x86/xen/spinlock.c | 1 - 1 file changed, 1 deletion(-)
arch/x86/xen/spinlock.c +0 -1
@@ -328,7 +328,6 @@ static noinline void xen_spin_unlock_sloif (per_cpu (lock_spinners, cpu) == xl) {ADD_STATS (released_slow_kicked,1 );xen_send_IPI_one (cpu,XEN_SPIN_UNLOCK_VECTOR ); -break ; } } }
Greg Kroah-Hartman
maintainerPATCH 26/150 xen: close evtchn port if binding to irq fails
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Liu <[email protected]>
commit e7e44e444876478d50630f57b0c31d29f6725020 upstream.
--- drivers/xen/evtchn.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/xen/evtchn.c +10 -0
@@ -269,6 +269,14 @@ static int evtchn_bind_to_user(struct pe u->name, (void *)(unsigned long)port);if (rc >=0 ) rc =evtchn_make_refcounted (port); +else { +/* bind failed, should close the port now */ +struct evtchn_close close; + close.port = port; +if (HYPERVISOR_event_channel_op (EVTCHNOP_close, &close) !=0 ) +BUG (); +set_port_user (port,NULL ); + }return rc; }
@@ -277,6 +285,8 @@ static void evtchn_unbind_from_user(stru {int irq =irq_from_evtchn (port); +BUG_ON (irq <0 ); +unbind_from_irqhandler (irq, (void *)(unsigned long )port);set_port_user (port,NULL );
Greg Kroah-Hartman
maintainerPATCH 27/150 pps: Add pps_lookup_dev() function
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit 513b032c98b4b9414aa4e9b4a315cb1bf0380101 upstream.
The PPS serial line discipline wants to attach a PPS device to a tty without changing the tty code to add a struct pps_device * pointer.
Since the number of PPS devices in a typical system is generally very low (n=1 is by far the most common), it's practical to search the entire list of allocated pps devices. (We capture the timestamp before the lookup, so the timing isn't affected.)
It is a bit ugly that this function, which is part of the in-kernel PPS API, has to be in pps.c as opposed to kapi,c, but that's not something that affects users.
--- drivers/pps/pps.c | 33 +++++++++++++++++++++++++++++++++ include/linux/pps_kernel.h | 17 ++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-)
drivers/pps/pps.c +33 -0
@@ -352,11 +352,44 @@ free_idr:void pps_unregister_cdev (struct pps_device *pps) { + pps->lookup_cookie =NULL ;device_destroy (pps_class, pps->dev->devt);cdev_del (&pps->cdev); }/* +* Look up a pps device by magic cookie. +* The cookie is usually a pointer to some enclosing device, but this +* code doesn't care; you should never be dereferencing it. +* +* This is a bit of a kludge that is currently used only by the PPS +* serial line discipline. It may need to be tweaked when a second user +* is found. +* +* There is no function interface for setting the lookup_cookie field. +* It's initialized to NULL when the pps device is created, and if a +* client wants to use it, just fill it in afterward. +* +* The cookie is automatically set to NULL in pps_unregister_source() +* so that it will not be used again, even if the pps device cannot +* be removed from the idr due to pending references holding the minor +* number in use. +*/ +struct pps_device *pps_lookup_dev (void const *cookie) +{ +struct pps_device *pps; +unsigned id; + +rcu_read_lock (); +idr_for_each_entry (&pps_idr, pps, id) +if (cookie == pps->lookup_cookie) +break ; +rcu_read_unlock (); +return pps; +} +EXPORT_SYMBOL (pps_lookup_dev); + +/* * Module stuff */
include/linux/pps_kernel.h +14 -3
@@ -43,7 +43,7 @@ struct pps_source_info { int event, void *data); /* PPS echo function */struct module *owner; -struct device *dev; +struct device *dev;/* Parent device for device_create */ };struct pps_event_time {
@@ -69,6 +69,7 @@ struct pps_device {wait_queue_head_t queue;/* PPS event queue */ unsigned int id;/* PPS source unique ID */ +void const *lookup_cookie;/* pps_lookup_dev only */ struct cdev cdev;struct device *dev;struct fasync_struct *async_queue;/* fasync method */
@@ -82,16 +83,26 @@ struct pps_device {extern struct device_attribute pps_attrs[];/* +* Internal functions. +* +* These are not actually part of the exported API, but this is a +* convenient header file to put them in. +*/ + +extern int pps_register_cdev (struct pps_device *pps); +extern void pps_unregister_cdev (struct pps_device *pps); + +/* * Exported functions */ extern struct pps_device *pps_register_source (struct pps_source_info *info,int default_params);extern void pps_unregister_source (struct pps_device *pps); -extern int pps_register_cdev (struct pps_device *pps); -extern void pps_unregister_cdev (struct pps_device *pps);extern void pps_event (struct pps_device *pps,struct pps_event_time *ts,int event,void *data); +/* Look up a pps device by magic cookie */ +struct pps_device *pps_lookup_dev (void const *cookie);static inline void timespec_to_pps_ktime (struct pps_ktime *kt,struct timespec ts)
Greg Kroah-Hartman
maintainerPATCH 28/150 pps: Use pps_lookup_dev to reduce ldisc coupling
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit 03a7ffe4e542310838bac70ef85acc17536b6d7c upstream.
Now that N_TTY uses tty->disc_data for its private data, 'subclass' ldiscs cannot use ->disc_data for their own private data. (This is a regression is v3.8-rc1)
Use pps_lookup_dev to associate the tty with the pps source instead.
This fixes a crashing regression in 3.8-rc1.
--- drivers/pps/clients/pps-ldisc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/pps/clients/pps-ldisc.c +4 -6
@@ -31,7 +31,7 @@static void pps_tty_dcd_change (struct tty_struct *tty,unsigned int status,struct pps_event_time *ts) { -struct pps_device *pps = (struct pps_device *)tty->disc_data; +struct pps_device *pps =pps_lookup_dev (tty);BUG_ON (pps ==NULL );
@@ -67,9 +67,9 @@ static int pps_tty_open(struct tty_strucpr_err ("cannot register PPS source \"%s\"\n" , info.path);return -ENOMEM ; } - tty->disc_data = pps; + pps->lookup_cookie = tty; -/* Should open N_TTY ldisc too */ +/* Now open the base class N_TTY ldisc */ ret =alias_n_tty_open (tty);if (ret <0 ) {pr_err ("cannot open tty ldisc \"%s\"\n" , info.path);
@@ -81,7 +81,6 @@ static int pps_tty_open(struct tty_strucreturn 0 ; err_unregister: - tty->disc_data =NULL ;pps_unregister_source (pps);return ret; }
@@ -90,11 +89,10 @@ static void (*alias_n_tty_close)(structstatic void pps_tty_close (struct tty_struct *tty) { -struct pps_device *pps = (struct pps_device *)tty->disc_data; +struct pps_device *pps =pps_lookup_dev (tty);alias_n_tty_close (tty); - tty->disc_data =NULL ;dev_info (pps->dev,"removed\n" );pps_unregister_source (pps); }
Greg Kroah-Hartman
maintainerPATCH 29/150 pps: Fix a use-after free bug when unregistering a source.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Spelvin <[email protected]>
commit d953e0e837e65ecc1ddaa4f9560f7925878a0de6 upstream.
Remove the cdev from the system (with cdev_del) *before* deallocating it (in pps_device_destruct, called via kobject_put from device_destroy).
Also prevent deallocating a device with open file handles.
A better long-term fix is probably to remove the cdev from the pps_device entirely, and instead have all devices reference one global cdev. Then the deallocation ordering becomes simpler.
But that's more complex and invasive change, so we leave that for later.
--- drivers/pps/pps.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/pps/pps.c +10 -4
@@ -247,12 +247,15 @@ static int pps_cdev_open(struct inode *istruct pps_device *pps =container_of (inode->i_cdev, struct pps_device, cdev); file->private_data = pps; - +kobject_get (&pps->dev->kobj);return 0 ; }static int pps_cdev_release (struct inode *inode,struct file *file) { +struct pps_device *pps =container_of (inode->i_cdev, + struct pps_device, cdev); +kobject_put (&pps->dev->kobj);return 0 ; }
@@ -274,8 +277,10 @@ static void pps_device_destruct(struct d {struct pps_device *pps =dev_get_drvdata (dev); -/* release id here to protect others from using it while it's -* still in use */ +cdev_del (&pps->cdev); + +/* Now we can release the ID for re-use */ +pr_debug ("deallocating pps%d\n" , pps->id);mutex_lock (&pps_idr_lock);idr_remove (&pps_idr, pps->id);mutex_unlock (&pps_idr_lock);
@@ -332,6 +337,7 @@ int pps_register_cdev(struct pps_device goto del_cdev; } +/* Override the release function with our own */ pps->dev->release = pps_device_destruct; pr_debug("source %s got cdev (%d:%d)\n", pps->info.name,
@@ -352,9 +358,9 @@ free_idr:void pps_unregister_cdev (struct pps_device *pps) { +pr_debug ("unregistering pps%d\n" , pps->id); pps->lookup_cookie =NULL ;device_destroy (pps_class, pps->dev->devt); -cdev_del (&pps->cdev); }/*
Greg Kroah-Hartman
maintainerPATCH 30/150 zram: Fix deadlock bug in partial read/write
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minchan Kim <[email protected]>
commit 7e5a5104c6af709a8d97d5f4711e7c917761d464 upstream.
Now zram allocates new page with GFP_KERNEL in zram I/O path if IO is partial. Unfortunately, It may cause deadlock with reclaim path like below.
write_page from fsfs_lockallocation(GFP_KERNEL)
reclaim
pageout
write_page from fs fs_lock <-- deadlock
This patch fixes it by using GFP_NOIO. In read path, we reorganize code flow so that kmap_atomic is called after the GFP_NOIO allocation.
--- drivers/staging/zram/zram_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/staging/zram/zram_drv.c +5 -4
@@ -228,11 +228,12 @@ static int zram_bvec_read(struct zram *zreturn 0 ; } - user_mem =kmap_atomic (page);if (is_partial_io (bvec))/* Use a temporary buffer to decompress the page */ - uncmem =kmalloc (PAGE_SIZE ,GFP_KERNEL ); -else + uncmem =kmalloc (PAGE_SIZE ,GFP_NOIO ); + + user_mem =kmap_atomic (page); +if (!is_partial_io (bvec)) uncmem = user_mem;if (!uncmem) {
@@ -279,7 +280,7 @@ static int zram_bvec_write(struct zram ** This is a partial IO. We need to read the full page * before to write the changes. */ - uncmem =kmalloc (PAGE_SIZE ,GFP_KERNEL ); + uncmem =kmalloc (PAGE_SIZE ,GFP_NOIO );if (!uncmem) {pr_info ("Error allocating temp memory!\n" ); ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 31/150 Driver core: treat unregistered bus_types as having no devices
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjorn Helgaas <[email protected]>
commit 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7 upstream.
A bus_type has a list of devices (klist_devices), but the list and the subsys_private structure that contains it are not initialized until the bus_type is registered with bus_register().
The panic/reboot path has fixups that look up devices in pci_bus_type. If we panic before registering pci_bus_type, the bus_type exists but the list does not, so mach_reboot_fixups() trips over a null pointer and panics again:
mach_reboot_fixups
pci_get_device
..
bus_find_device(&pci_bus_type, ...)
bus->p is NULLJoonsoo reported a problem when panicking before PCI was initialized. I think this patch should be sufficient to replace the patch he posted
here: https://lkml.org/lkml/2012/12/28/75 ("[PATCH] x86, reboot: skip reboot_fixups in early boot phase")
--- drivers/base/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/bus.c +2 -2
@@ -290,7 +290,7 @@ int bus_for_each_dev(struct bus_type *bustruct device *dev;int error =0 ; -if (!bus) +if (!bus || !bus->p)return -EINVAL ; klist_iter_init_node(&bus->p->klist_devices, &i,
@@ -324,7 +324,7 @@ struct device *bus_find_device(struct bustruct klist_iter i;struct device *dev; -if (!bus) +if (!bus || !bus->p)return NULL ; klist_iter_init_node(&bus->p->klist_devices, &i,
Greg Kroah-Hartman
maintainerPATCH 32/150 mmu_notifier_unregister NULL Pointer deref and multiple ->release() callouts
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Robin Holt <[email protected]>
commit 751efd8610d3d7d67b7bdf7f62646edea7365dd7 upstream.
There is a race condition between mmu_notifier_unregister() and __mmu_notifier_release().
Assume two tasks, one calling mmu_notifier_unregister() as a result of a filp_close() ->flush() callout (task A), and the other calling mmu_notifier_release() from an mmput() (task B).
A B
t1 srcu_read_lock()
t2 if (!hlist_unhashed())
t3 srcu_read_unlock()
t4 srcu_read_lock()
t5 hlist_del_init_rcu()
t6 synchronize_srcu()
t7 srcu_read_unlock()
t8 hlist_del_rcu() <--- NULL pointer deref.
Additionally, the list traversal in __mmu_notifier_release() is not protected by the by the mmu_notifier_mm->hlist_lock which can result in callouts to the ->release() notifier from both mmu_notifier_unregister() and __mmu_notifier_release().
-stable suggestions:
The stable trees prior to 3.7.y need commits 21a92735f660 and 70400303ce0c cherry-picked in that order prior to cherry-picking this commit. The 3.7.y tree already has those two commits.
--- mm/mmu_notifier.c | 82 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)
mm/mmu_notifier.c +42 -40
@@ -37,49 +37,51 @@ static struct srcu_struct srcu;void __mmu_notifier_release (struct mm_struct *mm) {struct mmu_notifier *mn; -struct hlist_node *n;int id;/* -* SRCU here will block mmu_notifier_unregister until -* ->release returns. +* srcu_read_lock() here will block synchronize_srcu() in +* mmu_notifier_unregister() until all registered +* ->release() callouts this function makes have +* returned. */ id =srcu_read_lock (&srcu); -hlist_for_each_entry_rcu (mn, n, &mm->mmu_notifier_mm->list, hlist) -/* -* if ->release runs before mmu_notifier_unregister it -* must be handled as it's the only way for the driver -* to flush all existing sptes and stop the driver -* from establishing any more sptes before all the -* pages in the mm are freed. -*/ -if (mn->ops->release) - mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock);while (unlikely (!hlist_empty (&mm->mmu_notifier_mm->list))) { mn =hlist_entry (mm->mmu_notifier_mm->list.first, struct mmu_notifier, hlist); +/* -* We arrived before mmu_notifier_unregister so -* mmu_notifier_unregister will do nothing other than -* to wait ->release to finish and -* mmu_notifier_unregister to return. +* Unlink. This will prevent mmu_notifier_unregister() +* from also making the ->release() callout. */ hlist_del_init_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); + +/* +* Clear sptes. (see 'release' description in mmu_notifier.h) +*/ +if (mn->ops->release) + mn->ops->release (mn, mm); + +spin_lock (&mm->mmu_notifier_mm->lock); }spin_unlock (&mm->mmu_notifier_mm->lock);/* -* synchronize_srcu here prevents mmu_notifier_release to -* return to exit_mmap (which would proceed freeing all pages -* in the mm) until the ->release method returns, if it was -* invoked by mmu_notifier_unregister. -* -* The mmu_notifier_mm can't go away from under us because one -* mm_count is hold by exit_mmap. +* All callouts to ->release() which we have done are complete. +* Allow synchronize_srcu() in mmu_notifier_unregister() to complete +*/ +srcu_read_unlock (&srcu, id); + +/* +* mmu_notifier_unregister() may have unlinked a notifier and may +* still be calling out to it. Additionally, other notifiers +* may have been active via vmtruncate() et. al. Block here +* to ensure that all notifier callouts for this mm have been +* completed and the sptes are really cleaned up before returning +* to exit_mmap(). */ synchronize_srcu (&srcu); }
@@ -294,31 +296,31 @@ void mmu_notifier_unregister(struct mmu_ {BUG_ON (atomic_read (&mm->mm_count) <=0 ); +spin_lock (&mm->mmu_notifier_mm->lock);if (!hlist_unhashed (&mn->hlist)) { -/* -* SRCU here will force exit_mmap to wait ->release to finish -* before freeing the pages. -*/ int id; - id =srcu_read_lock (&srcu);/* -* exit_mmap will block in mmu_notifier_release to -* guarantee ->release is called before freeing the -* pages. +* Ensure we synchronize up with __mmu_notifier_release(). */ + id =srcu_read_lock (&srcu); + +hlist_del_rcu (&mn->hlist); +spin_unlock (&mm->mmu_notifier_mm->lock); +if (mn->ops->release) mn->ops->release (mn, mm); -srcu_read_unlock (&srcu, id); -spin_lock (&mm->mmu_notifier_mm->lock); -hlist_del_rcu (&mn->hlist); +/* +* Allow __mmu_notifier_release() to complete. +*/ +srcu_read_unlock (&srcu, id); + }else spin_unlock (&mm->mmu_notifier_mm->lock); - }/* -* Wait any running method to finish, of course including -* ->release if it was run by mmu_notifier_relase instead of us. +* Wait for any running method to finish, including ->release() if it +* was run by __mmu_notifier_release() instead of us. */ synchronize_srcu (&srcu);
Greg Kroah-Hartman
maintainerPATCH 33/150 KVM: s390: Handle hosts not supporting s390-virtio.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cornelia Huck <[email protected]>
commit 55c171a6d90dc0574021f9c836127cfd1a7d2e30 upstream.
Running under a kvm host does not necessarily imply the presence of a page mapped above the main memory with the virtio information; however, the code includes a hard coded access to that page.
Instead, check for the presence of the page and exit gracefully before we hit an addressing exception if it does not exist.
--- drivers/s390/kvm/kvm_virtio.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-)
drivers/s390/kvm/kvm_virtio.c +30 -8
@@ -422,6 +422,26 @@ static void kvm_extint_handler(struct ex }/* +* For s390-virtio, we expect a page above main storage containing +* the virtio configuration. Try to actually load from this area +* in order to figure out if the host provides this page. +*/ +static int __init test_devices_support (unsigned long addr) +{ +int ret = -EIO ; + + asmvolatile ( +"0: lura 0,%1\n" +"1: xgr %0,%0\n" +"2:\n" + EX_TABLE(0b,2b) +EX_TABLE (1b ,2b ) + : "+d" (ret) + : "a" (addr) + : "0", "cc"); + return ret; +} +/* * Init function for virtio * devices are in a single page above top of "normal" mem */
@@ -432,21 +452,23 @@ static int __init kvm_devices_init(void)if (!MACHINE_IS_KVM )return -ENODEV ; +if (test_devices_support (real_memory_size) <0 ) +return -ENODEV ; + + rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); +if (rc) +return rc; + + kvm_devices = (void *) real_memory_size; + kvm_root =root_device_register ("kvm_s390" );if (IS_ERR (kvm_root)) { rc =PTR_ERR (kvm_root);printk (KERN_ERR "Could not register kvm_s390 root device" ); +vmem_remove_mapping (real_memory_size,PAGE_SIZE );return rc; } - rc =vmem_add_mapping (real_memory_size,PAGE_SIZE ); -if (rc) { -root_device_unregister (kvm_root); -return rc; - } - - kvm_devices = (void *) real_memory_size; -INIT_WORK (&hotplug_work, hotplug_devices);service_subclass_irq_register ();
Greg Kroah-Hartman
maintainerPATCH 34/150 s390/kvm: Fix store status for ACRS/FPRS
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Borntraeger <[email protected]>
commit 15bc8d8457875f495c59d933b05770ba88d1eacb upstream.
On store status we need to copy the current state of registers into a save area. Currently we might save stale versions:
The sie state descriptor doesnt have fields for guest ACRS,FPRS, those registers are simply stored in the host registers. The host program must copy these away if needed. We do that in vcpu_put/load.
If we now do a store status in KVM code between vcpu_put/load, the saved values are not up-to-date. Lets collect the ACRS/FPRS before saving them.
This also fixes some strange problems with hotplug and virtio-ccw, since the low level machine check handler (on hotplug a machine check will happen) will revalidate all registers with the content of the save area.
--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/s390/kvm/kvm-s390.c +8 -0
@@ -766,6 +766,14 @@ int kvm_s390_vcpu_store_status(struct kv }else prefix =0 ; +/* +* The guest FPRS and ACRS are in the host FPRS/ACRS due to the lazy +* copying in vcpu load/put. Lets update our copies before we save +* it into the save area +*/ +save_fp_regs (&vcpu->arch.guest_fpregs); +save_access_regs (vcpu->run->s.regs.acrs); +if (__guestcopy (vcpu, addr + offsetof(struct save_area , fp_regs), vcpu->arch.guest_fpregs.fprs,128 , prefix))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 35/150 futex: Revert "futex: Mark get_robust_list as deprecated"
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit fe2b05f7ca9f906be61dced5489f63b8b4d7c770 upstream.
This reverts commit ec0c4274e33c0373e476b73e01995c53128f1257.
get_robust_list() is in use and a removal would break existing user space. With the permission checks in place it's not longer a security hole. Remove the deprecation warnings.
--- kernel/futex.c | 2 -- kernel/futex_compat.c | 2 -- 2 files changed, 4 deletions(-)
kernel/futex.c +0 -2
@@ -2471,8 +2471,6 @@ SYSCALL_DEFINE3(get_robust_list, int, piif (!futex_cmpxchg_enabled)return -ENOSYS ; -WARN_ONCE (1 ,"deprecated: get_robust_list will be deleted in 2013.\n" ); -rcu_read_lock (); ret = -ESRCH ;
kernel/futex_compat.c +0 -2
@@ -142,8 +142,6 @@ compat_sys_get_robust_list(int pid, compif (!futex_cmpxchg_enabled)return -ENOSYS ; -WARN_ONCE (1 ,"deprecated: get_robust_list will be deleted in 2013.\n" ); -rcu_read_lock (); ret = -ESRCH ;
Greg Kroah-Hartman
maintainerPATCH 36/150 inotify: remove broken mask checks causing unmount to be EINVAL
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jim Somerville <[email protected]>
commit 676a0675cf9200ac047fb50825f80867b3bb733b upstream.
Running the command:
inotifywait -e unmount /mnt/disk
immediately aborts with a -EINVAL return code. This is however a valid parameter. This abort occurs only if unmount is the sole event parameter. If other event parameters are supplied, then the unmount event wait will work.
The problem was introduced by commit 44b350fc23e ("inotify: Fix mask checks"). In that commit, it states:
The mask checks in inotify_update_existing_watch() and inotify_new_watch() are useless because inotify_arg_to_mask() sets FS_IN_IGNORED and FS_EVENT_ON_CHILD bits anyway.
But instead of removing the useless checks, it did this:
mask = inotify_arg_to_mask(arg); - if (unlikely(!mask)) + if (unlikely(!(mask & IN_ALL_EVENTS))) return -EINVAL;
The problem is that IN_ALL_EVENTS doesn't include IN_UNMOUNT, and other parts of the code keep IN_UNMOUNT separate from IN_ALL_EVENTS. So the check should be:
if (unlikely(!(mask & (IN_ALL_EVENTS | IN_UNMOUNT))))
But inotify_arg_to_mask(arg) always sets the IN_UNMOUNT bit in the mask anyway, so the check is always going to pass and thus should simply be removed. Also note that inotify_arg_to_mask completely controls what mask bits get set from arg, there's no way for invalid bits to get enabled there.
Lets fix it by simply removing the useless broken checks.
--- fs/notify/inotify/inotify_user.c | 4 ---- 1 file changed, 4 deletions(-)
fs/notify/inotify/inotify_user.c +0 -4
@@ -576,8 +576,6 @@ static int inotify_update_existing_watch/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; fsn_mark =fsnotify_find_inode_mark (group, inode);if (!fsn_mark)
@@ -629,8 +627,6 @@ static int inotify_new_watch(struct fsno/* don't allow invalid bits: we don't want flags set */ mask =inotify_arg_to_mask (arg); -if (unlikely (!(mask &IN_ALL_EVENTS ))) -return -EINVAL ; tmp_i_mark =kmem_cache_alloc (inotify_inode_mark_cachep,GFP_KERNEL );if (unlikely (!tmp_i_mark))
Greg Kroah-Hartman
maintainerPATCH 37/150 fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: MITSUNARI Shigeo <[email protected]>
commit 7630b661da330b35dd57b6f5d6d62b386f2dd751 upstream.
We found that bdev->bd_invalidated was left set once revalidate_disk() is called, which results in page cache flush every time that device is open.
Specifically, we found this problem in MD block device. Once we resize a MD device, mdadm --monitor periodically flush all page cache for that device every 60 or 1000 seconds when it opens the device.
This bug lies since at least 3.2.0 till the latest kernel(3.6.2). Patch is attached.
The following steps will reproduce the problem.
1. prepair a block device (eg /dev/sdb).
2. create two partitions:
sudo parted /dev/sdb
mklabel gpt
mkpart primary 0% 50%
mkpart primary 50% 100%
3. create a md device.
sudo mdadm -C /dev/md/hoge -l 1 -n 2 -e 1.2 --assume-clean --auto=md --symlink=no /dev/sdb1 /dev/sdb2
4. create file system and mount it
sudo mkfs.ext3 /dev/md/hoge
sudo mkdir /mnt/test
sudo mount /dev/md/hoge /mnt/test
5. try to resize the device
sudo mdadm -G /dev/md/hoge --size=max
6. create a file to fill file cache.
sudo dd if=/dev/urandom of=/mnt/test/data bs=1M count=10
and verify the current status of file by free command.
7. mdadm monitor will open the md device every 1000 seconds and you will find all file cache on the device are cleared.
The timing can be reduced by the following steps.
a) kill mdadm and restart it with --delay option
/sbin/mdadm --monitor --delay=30 --pid-file /var/run/mdadm/monitor.pid --daemonise --scan --syslog
or open the md device directly.
sudo dd if=/dev/md/hoge of=/dev/null bs=4096 count=1
--- fs/block_dev.c | 1 + 1 file changed, 1 insertion(+)
fs/block_dev.c +1 -0
@@ -994,6 +994,7 @@ int revalidate_disk(struct gendisk *diskmutex_lock (&bdev->bd_mutex);check_disk_size_change (disk, bdev); + bdev->bd_invalidated =0 ;mutex_unlock (&bdev->bd_mutex);bdput (bdev);return ret;
Greg Kroah-Hartman
maintainerPATCH 38/150 ocfs2: unlock super lock if lockres refresh failed
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Junxiao Bi <[email protected]>
commit 3278bb748d2437eb1464765f36429e5d6aa91c38 upstream.
If lockres refresh failed, the super lock will never be released which will cause some processes on other cluster nodes hung forever.
--- fs/ocfs2/dlmglue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/ocfs2/dlmglue.c +4 -1
@@ -2545,6 +2545,7 @@ int ocfs2_super_lock(struct ocfs2_super* everything is up to the caller :) */ status =ocfs2_should_refresh_lock_res (lockres);if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); goto bail; }
@@ -2553,8 +2554,10 @@ int ocfs2_super_lock(struct ocfs2_superocfs2_complete_lock_res_refresh (lockres, status); -if (status <0 ) +if (status <0 ) { +ocfs2_cluster_unlock (osb, lockres, level);mlog_errno (status); + }ocfs2_track_lock_refresh (lockres); } bail:
Greg Kroah-Hartman
maintainerPATCH 39/150 drivers/video/backlight/adp88?0_bl.c: fix resume
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <[email protected]>
commit 5eb02c01bd1f3ef195989ab05e835e2b0711b5a9 upstream.
Clearing the NSTBY bit in the control register also automatically clears the BLEN bit. So we need to make sure to set it again during resume, otherwise the backlight will stay off.
--- drivers/video/backlight/adp8860_bl.c | 2 +- drivers/video/backlight/adp8870_bl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/adp8860_bl.c +1 -1
@@ -783,7 +783,7 @@ static int adp8860_i2c_suspend(struct i2static int adp8860_i2c_resume (struct i2c_client *client) { -adp8860_set_bits (client,ADP8860_MDCR ,NSTBY ); +adp8860_set_bits (client,ADP8860_MDCR ,NSTBY |BLEN );return 0 ; }
drivers/video/backlight/adp8870_bl.c +1 -1
@@ -957,7 +957,7 @@ static int adp8870_i2c_suspend(struct i2static int adp8870_i2c_resume (struct i2c_client *client) { -adp8870_set_bits (client,ADP8870_MDCR ,NSTBY ); +adp8870_set_bits (client,ADP8870_MDCR ,NSTBY |BLEN );return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 40/150 KEYS: Revert one application of "Fix unreachable code" patch
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
commit fe9453a1dcb5fb146f9653267e78f4a558066f6f upstream.
A patch to fix some unreachable code in search_my_process_keyrings() got applied twice by two different routes upstream as commits e67eab39bee2 and b010520ab3d2 (both "fix unreachable code").
Unfortunately, the second application removed something it shouldn't have and this wasn't detected by GIT. This is due to the patch not having sufficient lines of context to distinguish the two places of application.
The effect of this is relatively minor: inside the kernel, the keyring search routines may search multiple keyrings and then prioritise the errors if no keys or negative keys are found in any of them. With the extra deletion, the presence of a negative key in the thread keyring (causing ENOKEY) is incorrectly overridden by an error searching the process keyring.
So revert the second application of the patch.
--- security/keys/process_keys.c | 2 ++ 1 file changed, 2 insertions(+)
security/keys/process_keys.c +2 -0
@@ -367,6 +367,8 @@ key_ref_t search_my_process_keyrings(strswitch (PTR_ERR (key_ref)) {case -EAGAIN :/* no key */ +if (ret) +break ;case -ENOKEY :/* negative key */ ret = key_ref;break ;
Greg Kroah-Hartman
maintainerPATCH 41/150 tmpfs: fix use-after-free of mempolicy object
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Thelen <[email protected]>
commit 5f00110f7273f9ff04ac69a5f85bb535a4fd0987 upstream.
The tmpfs remount logic preserves filesystem mempolicy if the mpol=M option is not specified in the remount request. A new policy can be specified if mpol=M is given.
Before this patch remounting an mpol bound tmpfs without specifying mpol= mount option in the remount request would set the filesystem's mempolicy object to a freed mempolicy object.
To reproduce the problem boot a DEBUG_PAGEALLOC kernel and run:
# mkdir /tmp/x
# mount -t tmpfs -o size=100M,mpol=interleave nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=102400k,mpol=interleave:0-3 0 0# mount -o remount,size=200M nodev /tmp/x
# grep /tmp/x /proc/mounts
nodev /tmp/x tmpfs rw,relatime,size=204800k,mpol=??? 0 0
# note ? garbage in mpol=... output above # dd if=/dev/zero of=/tmp/x/f count=1
# panic herePanic:
BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [< (null)>] (null)
[...]
Oops: 0010 [#1] SMP DEBUG_PAGEALLOC
Call Trace:
mpol_shared_policy_init+0xa5/0x160
shmem_get_inode+0x209/0x270
shmem_mknod+0x3e/0xf0
shmem_create+0x18/0x20
vfs_create+0xb5/0x130
do_last+0x9a1/0xea0
path_openat+0xb3/0x4d0
do_filp_open+0x42/0xa0
do_sys_open+0xfe/0x1e0
compat_sys_open+0x1b/0x20
cstar_dispatch+0x7/0x1fNon-debug kernels will not crash immediately because referencing the dangling mpol will not cause a fault. Instead the filesystem will reference a freed mempolicy object, which will cause unpredictable behavior.
The problem boils down to a dropped mpol reference below if shmem_parse_options() does not allocate a new mpol:
config = *sbinfo
shmem_parse_options(data, &config, true) mpol_put(sbinfo->mpol)
sbinfo->mpol = config.mpol /* BUG: saves unreferenced mpol */
This patch avoids the crash by not releasing the mempolicy if shmem_parse_options() doesn't create a new mpol.
How far back does this issue go? I see it in both 2.6.36 and 3.3. I did not look back further.
--- mm/shmem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/shmem.c +8 -2
@@ -2487,6 +2487,7 @@ static int shmem_remount_fs(struct superunsigned long inodes;int error = -EINVAL ; + config.mpol =NULL ;if (shmem_parse_options (data, &config, true))return error;
@@ -2511,8 +2512,13 @@ static int shmem_remount_fs(struct super sbinfo->max_inodes = config.max_inodes; sbinfo->free_inodes = config.max_inodes - inodes; -mpol_put (sbinfo->mpol); - sbinfo->mpol = config.mpol;/* transfers initial ref */ +/* +* Preserve previous mempolicy unless mpol remount option was specified. +*/ +if (config.mpol) { +mpol_put (sbinfo->mpol); + sbinfo->mpol = config.mpol;/* transfers initial ref */ + } out:spin_unlock (&sbinfo->stat_lock);return error;
Greg Kroah-Hartman
maintainerPATCH 42/150 mm/fadvise.c: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mel Gorman <[email protected]>
commit 67d46b296a1ba1477c0df8ff3bc5e0167a0b0732 upstream.
Rob van der Heij reported the following (paraphrased) on private mail.
The scenario is that I want to avoid backups to fill up the page cache and purge stuff that is more likely to be used again (this is with s390x Linux on z/VM, so I don't give it as much memory that we don't care anymore). So I have something with LD_PRELOAD that intercepts the close() call (from tar, in this case) and issues a posix_fadvise() just before closing the file.
This mostly works, except for small files (less than 14 pages) that remains in page cache after the face.
Unfortunately Rob has not had a chance to test this exact patch but the test program below should be reproducing the problem he described.
The issue is the per-cpu pagevecs for LRU additions. If the pages are added by one CPU but fadvise() is called on another then the pages remain resident as the invalidate_mapping_pages() only drains the local pagevecs via its call to pagevec_release(). The user-visible effect is that a program that uses fadvise() properly is not obeyed.
A possible fix for this is to put the necessary smarts into invalidate_mapping_pages() to globally drain the LRU pagevecs if a pagevec page could not be discarded. The downside with this is that an inode cache shrink would send a global IPI and memory pressure potentially causing global IPI storms is very undesirable.
Instead, this patch adds a check during fadvise(POSIX_FADV_DONTNEED) to check if invalidate_mapping_pages() discarded all the requested pages. If a subset of pages are discarded it drains the LRU pagevecs and tries again. If the second attempt fails, it assumes it is due to the pages being mapped, locked or dirty and does not care. With this patch, an application using fadvise() correctly will be obeyed but there is a downside that a malicious application can force the kernel to send global IPIs and increase overhead.
If accepted, I would like this to be considered as a -stable candidate. It's not an urgent issue but it's a system call that is not working as advertised which is weak.
The following test program demonstrates the problem. It should never report that pages are still resident but will without this patch. It assumes that CPU 0 and 1 exist.
int main() {
int fd;
int pagesize = getpagesize();
ssize_t written = 0, expected;
char *buf;
unsigned char *vec;
int resident, i;
cpu_set_t set;
/* Prepare a buffer for writing */
expected = FILESIZE_PAGES * pagesize;
buf = malloc(expected + 1);
if (buf == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
buf[expected] = 0;
memset(buf, 'a', expected);
/* Prepare the mincore vec */
vec = malloc(FILESIZE_PAGES);
if (vec == NULL) {
printf("ENOMEM\n");
exit(EXIT_FAILURE);
}
/* Bind ourselves to CPU 0 */
CPU_ZERO(&set);
CPU_SET(0, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* open file, unlink and write buffer */
fd = open("fadvise-test-file", O_CREAT|O_EXCL|O_RDWR);
if (fd == -1) {
perror("open");
exit(EXIT_FAILURE);
}
unlink("fadvise-test-file");
while (written < expected) {
ssize_t this_write;
this_write = write(fd, buf + written, expected - written);
if (this_write == -1) {
perror("write");
exit(EXIT_FAILURE);
}
written += this_write;
}
free(buf);
/*
* Force ourselves to another CPU. If fadvise only flushes the local
* CPUs pagevecs then the fadvise will fail to discard all file pages
*/
CPU_ZERO(&set);
CPU_SET(1, &set);
if (sched_setaffinity(getpid(), sizeof(set), &set) == -1) {
perror("sched_setaffinity");
exit(EXIT_FAILURE);
}
/* sync and fadvise to discard the page cache */
fsync(fd);
if (posix_fadvise(fd, 0, expected, POSIX_FADV_DONTNEED) == -1) {
perror("posix_fadvise");
exit(EXIT_FAILURE);
}
/* map the file and use mincore to see which parts of it are resident */
buf = mmap(NULL, expected, PROT_READ, MAP_SHARED, fd, 0);
if (buf == NULL) {
perror("mmap");
exit(EXIT_FAILURE);
}
if (mincore(buf, expected, vec) == -1) {
perror("mincore");
exit(EXIT_FAILURE);
}
/* Check residency */
for (i = 0, resident = 0; i < FILESIZE_PAGES; i++) {
if (vec[i])
resident++;
}
if (resident != 0) {
printf("Nr unexpected pages resident: %d\n", resident);
exit(EXIT_FAILURE);
}
munmap(buf, expected);
close(fd);
free(vec);
exit(EXIT_SUCCESS);
}--- mm/fadvise.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
mm/fadvise.c +16 -2
@@ -17,6 +17,7 @@#include <linux/fadvise.h> #include <linux/writeback.h> #include <linux/syscalls.h> +#include <linux/swap.h> #include <asm/unistd.h>
@@ -120,9 +121,22 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, lof start_index = (offset+(PAGE_CACHE_SIZE -1 )) >>PAGE_CACHE_SHIFT ; end_index = (endbyte >>PAGE_CACHE_SHIFT ); -if (end_index >= start_index) -invalidate_mapping_pages (mapping, start_index, +if (end_index >= start_index) { +unsigned long count =invalidate_mapping_pages (mapping, + start_index, end_index); + +/* +* If fewer pages were invalidated than expected then +* it is possible that some of the pages were on +* a per-cpu pagevec for a remote CPU. Drain all +* pagevecs and try again. +*/ +if (count < (end_index - start_index +1 )) { +lru_add_drain_all (); +invalidate_mapping_pages (mapping, start_index, end_index); + } + }break ;default : ret = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 43/150 drivercore: Fix ordering between deferred_probe and exiting initcalls
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grant Likely <[email protected]>
commit d72cca1eee5b26e313da2a380d4862924e271031 upstream.
One of the side effects of deferred probe is that some drivers which used to be probed before initcalls completed are now happening slightly later. This causes two problems.
- If a console driver gets deferred, then it may not be ready when userspace starts. For example, if a uart depends on pinctrl, then the uart will get deferred and /dev/console will not be available
- __init sections will be discarded before built-in drivers are probed. Strictly speaking, __init functions should not be called in a drivers __probe path, but there are a lot of drivers (console stuff again) that do anyway. In the past it was perfectly safe to do so because all built-in drivers got probed before the end of initcalls.
This patch fixes the problem by forcing the first pass of the deferred list to complete at late_initcall time. This is late enough to catch the drivers that are known to have the above issues.
--- drivers/base/dd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/base/dd.c +2 -0
@@ -172,6 +172,8 @@ static int deferred_probe_initcall(void) driver_deferred_probe_enable = true;driver_deferred_probe_trigger (); +/* Sort as many dependencies as possible before exiting initcalls */ +flush_workqueue (deferred_wq);return 0 ; }late_initcall (deferred_probe_initcall);
Greg Kroah-Hartman
maintainerPATCH 44/150 umount oops when remove blocklayoutdriver first
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: fanchaoting <[email protected]>
commit 5a12cca697aca5dfba42a7d4c3356acc0445a2b0 upstream.
now pnfs client uses block layout, maybe we can remove blocklayoutdriver first. if we umount later,
it can cause oops in unset_pnfs_layoutdriver. because nfss->pnfs_curr_ld->clear_layoutdriver is invalid.
reproduce it:
modprobe blocklayoutdriver
mount -t nfs4 -o minorversion=1 pnfsip:/ /mnt/
rmmod blocklayoutdriver
umount /mnt
then you can see following
CPU 0
Pid: 17023, comm: umount.nfs4 Tainted: GF O 3.7.0-rc6-pnfs #1 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
RIP: 0010:[<ffffffffa04cfe6d>] [<ffffffffa04cfe6d>] unset_pnfs_layoutdriver+0x1d/0x70 [nfsv4] RSP: 0018:ffff8800022d9e48 EFLAGS: 00010286 RAX: ffffffffa04a1b00 RBX: ffff88000b013800 RCX: 0000000000000001 RDX: ffffffff81ae8ee0 RSI: ffff880001ee94b8 RDI: ffff88000b013800 RBP: ffff8800022d9e58 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000000 R12: ffff880001ee9400 R13: ffff8800105978c0 R14: 00007fff25846c08 R15: 0000000001bba550 FS: 00007f45ae7f0700(0000) GS:ffff880012c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: ffffffffa04a1b38 CR3: 0000000002c0c000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process umount.nfs4 (pid: 17023, threadinfo ffff8800022d8000, task ffff880006e48aa0) Stack: ffff8800105978c0 ffff88000b013800 ffff8800022d9e78 ffffffffa04cd0ce ffff8800022d9e78 ffff88000b013800 ffff8800022d9ea8 ffffffffa04755a7 ffff8800022d9ea8 ffff880002f96400 ffff88000b013800 ffff880002f96400 Call Trace: [<ffffffffa04cd0ce>] nfs4_destroy_server+0x1e/0x30 [nfsv4] [<ffffffffa04755a7>] nfs_free_server+0xb7/0x150 [nfs] [<ffffffffa047d4d5>] nfs_kill_super+0x35/0x40 [nfs] [<ffffffff81178d35>] deactivate_locked_super+0x45/0x70 [<ffffffff8117986a>] deactivate_super+0x4a/0x70 [<ffffffff81193ee2>] mntput_no_expire+0xd2/0x130 [<ffffffff81194d62>] sys_umount+0x72/0xe0 [<ffffffff8154af59>] system_call_fastpath+0x16/0x1b Code: 06 e1 b8 ea ff ff ff eb 9e 0f 1f 44 00 00 55 48 89 e5 53 48 83 ec 08 66 66 66 66 90 48 8b 87 80 03 00 00 48 89 fb 48 85 c0 74 29 <48> 8b 40 38 48 85 c0 74 02 ff d0 48 8b 03 3e ff 48 04 0f 94 c2 RIP [<ffffffffa04cfe6d>] unset_pnfs_layoutdriver+0x1d/0x70 [nfsv4] RSP <ffff8800022d9e48> CR2: ffffffffa04a1b38 ---[ end trace 29f75aaedda058bf ]---
--- fs/nfs/blocklayout/blocklayout.c | 1 + fs/nfs/objlayout/objio_osd.c | 1 + 2 files changed, 2 insertions(+)
fs/nfs/blocklayout/blocklayout.c +1 -0
@@ -1273,6 +1273,7 @@ static const struct nfs_pageio_ops bl_pgstatic struct pnfs_layoutdriver_type blocklayout_type = { .id =LAYOUT_BLOCK_VOLUME , .name ="LAYOUT_BLOCK_VOLUME" , + .owner =THIS_MODULE , .read_pagelist = bl_read_pagelist, .write_pagelist = bl_write_pagelist, .alloc_layout_hdr = bl_alloc_layout_hdr,
fs/nfs/objlayout/objio_osd.c +1 -0
@@ -647,6 +647,7 @@ static struct pnfs_layoutdriver_type obj .flags = PNFS_LAYOUTRET_ON_SETATTR | PNFS_LAYOUTRET_ON_ERROR, + .owner = THIS_MODULE, .alloc_layout_hdr = objlayout_alloc_layout_hdr, .free_layout_hdr = objlayout_free_layout_hdr,
Greg Kroah-Hartman
maintainerPATCH 45/150 NLM: Ensure that we resend all pending blocking locks after a reclaim
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit 666b3d803a511fbc9bc5e5ea8ce66010cf03ea13 upstream.
Currently, nlmclnt_lock will break out of the for(;;) loop when the reclaimer wakes up the blocking lock thread by setting nlm_lck_denied_grace_period. This causes the lock request to fail with an ENOLCK error.
The intention was always to ensure that we resend the lock request after the grace period has expired.
--- fs/lockd/clntproc.c | 3 +++ 1 file changed, 3 insertions(+)
fs/lockd/clntproc.c +3 -0
@@ -550,6 +550,9 @@ again: status =nlmclnt_block (block, req,NLMCLNT_POLL_TIMEOUT );if (status <0 )break ; +/* Resend the blocking lock request after a server reboot */ +if (resp->status == nlm_lck_denied_grace_period) +continue ;if (resp->status != nlm_lck_blocked)break ; }
Greg Kroah-Hartman
maintainerPATCH 46/150 NFSv4.1: Fix an ABBA locking issue with session and state serialisation
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit c8da19b9866ea84e9ad1c369393ea95d54ee7845 upstream.
Ensure that if nfs_wait_on_sequence() causes our rpc task to wait for an NFSv4 state serialisation lock, then we also drop the session slot.
--- fs/nfs/nfs4proc.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
fs/nfs/nfs4proc.c +20 -12
@@ -1463,7 +1463,7 @@ static void nfs4_open_prepare(struct rpcstruct nfs4_state_owner *sp = data->owner;if (nfs_wait_on_sequence (data->o_arg.seqid, task) !=0 ) -return ; + goto out_wait;/* * Check if we still need to send an OPEN call, or if we can use * a delegation instead.
@@ -1498,6 +1498,7 @@ unlock_no_action:rcu_read_unlock (); out_no_action: task->tk_action =NULL ; +out_wait:nfs4_sequence_done (task, &data->o_res.seq_res); }
@@ -2150,7 +2151,7 @@ static void nfs4_close_prepare(struct rpdprintk ("%s: begin!\n" , __func__);if (nfs_wait_on_sequence (calldata->arg.seqid, task) !=0 ) -return ; + goto out_wait; task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OPEN_DOWNGRADE ]; calldata->arg.fmode =FMODE_READ |FMODE_WRITE ;
@@ -2172,16 +2173,14 @@ static void nfs4_close_prepare(struct rpif (!call_close) {/* Note: exit _without_ calling nfs4_close_done */ - task->tk_action =NULL ; -nfs4_sequence_done (task, &calldata->res.seq_res); - goto out; + goto out_no_action; }if (calldata->arg.fmode ==0 ) { task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE ];if (calldata->roc &&pnfs_roc_drain (inode, &calldata->roc_barrier, task)) - goto out; + goto out_wait; }nfs_fattr_init (calldata->res.fattr);
@@ -2191,8 +2190,12 @@ static void nfs4_close_prepare(struct rp &calldata->res.seq_res, task) != 0)nfs_release_seqid (calldata->arg.seqid); -out:dprintk ("%s: done!\n" , __func__); +return ; +out_no_action: + task->tk_action =NULL ; +out_wait: +nfs4_sequence_done (task, &calldata->res.seq_res); }static const struct rpc_call_ops nfs4_close_ops = {
@@ -4423,12 +4426,10 @@ static void nfs4_locku_prepare(struct rpstruct nfs4_unlockdata *calldata = data;if (nfs_wait_on_sequence (calldata->arg.seqid, task) !=0 ) -return ; + goto out_wait;if (test_bit (NFS_LOCK_INITIALIZED , &calldata->lsp->ls_flags) ==0 ) {/* Note: exit _without_ running nfs4_locku_done */ - task->tk_action =NULL ; -nfs4_sequence_done (task, &calldata->res.seq_res); -return ; + goto out_no_action; } calldata->timestamp = jiffies; if (nfs4_setup_sequence(calldata->server,
@@ -4436,6 +4437,11 @@ static void nfs4_locku_prepare(struct rp &calldata->res.seq_res, task) != 0)nfs_release_seqid (calldata->arg.seqid); +return ; +out_no_action: + task->tk_action =NULL ; +out_wait: +nfs4_sequence_done (task, &calldata->res.seq_res); }static const struct rpc_call_ops nfs4_locku_ops = {
@@ -4576,7 +4582,7 @@ static void nfs4_lock_prepare(struct rpcdprintk ("%s: begin!\n" , __func__);if (nfs_wait_on_sequence (data->arg.lock_seqid, task) !=0 ) -return ; + goto out_wait;/* Do we need to do an open_to_lock_owner? */ if (!(data->arg.lock_seqid->sequence->flags &NFS_SEQID_CONFIRMED )) {if (nfs_wait_on_sequence (data->arg.open_seqid, task) !=0 ) {
@@ -4596,6 +4602,8 @@ static void nfs4_lock_prepare(struct rpcnfs_release_seqid (data->arg.open_seqid); out_release_lock_seqid:nfs_release_seqid (data->arg.lock_seqid); +out_wait: +nfs4_sequence_done (task, &data->res.seq_res);dprintk ("%s: done!, ret = %d\n" , __func__, data->rpc_status); }
Greg Kroah-Hartman
maintainerPATCH 47/150 NFSv4.1: Fix bulk recall and destroy of layouts
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Trond Myklebust <[email protected]>
commit fd9a8d7160937f94aad36ac80d7255b4988740ac upstream.
The current code in pnfs_destroy_all_layouts() assumes that removing the layout from the server->layouts list is sufficient to make it invisible to other processes. This ignores the fact that most users access the layout through the nfs_inode->layout... There is further breakage due to lack of reference counting of the layouts, meaning that the whole thing Oopses at the drop of a hat.
The code in initiate_bulk_draining() is almost correct, and can be used as a model for pnfs_destroy_all_layouts(), so move that code to pnfs.c, and refactor the code to allow us to choose between a single filesystem bulk recall, and a recall of all layouts. Also note that initiate_bulk_draining() currently calls iput() while holding locks. Fix that too.
--- fs/nfs/callback_proc.c | 61 ++----------------- fs/nfs/pnfs.c | 150 ++++++++++++++++++++++++++++++++++++++++++------- fs/nfs/pnfs.h | 7 +- 3 files changed, 144 insertions(+), 74 deletions(-)
fs/nfs/callback_proc.c +8 -53
@@ -183,60 +183,15 @@ static u32 initiate_file_draining(structstatic u32 initiate_bulk_draining (struct nfs_client *clp,struct cb_layoutrecallargs *args) { -struct nfs_server *server; -struct pnfs_layout_hdr *lo; -struct inode *ino; -u32 rv =NFS4ERR_NOMATCHING_LAYOUT ; -struct pnfs_layout_hdr *tmp; -LIST_HEAD (recall_list); -LIST_HEAD (free_me_list); -struct pnfs_layout_range range = { - .iomode =IOMODE_ANY , - .offset =0 , - .length =NFS4_MAX_UINT64 , - }; +int stat; -spin_lock (&clp->cl_lock); -rcu_read_lock (); -list_for_each_entry_rcu (server, &clp->cl_superblocks, client_link) { -if ((args->cbl_recall_type ==RETURN_FSID ) && -memcmp (&server->fsid, &args->cbl_fsid, -sizeof (struct nfs_fsid ))) -continue ; - -list_for_each_entry (lo, &server->layouts, plh_layouts) { - ino =igrab (lo->plh_inode); -if (!ino) -continue ; -spin_lock (&ino->i_lock); -/* Is this layout in the process of being freed? */ -if (NFS_I (ino)->layout != lo) { -spin_unlock (&ino->i_lock); -iput (ino); -continue ; - } -pnfs_get_layout_hdr (lo); -spin_unlock (&ino->i_lock); -list_add (&lo->plh_bulk_recall, &recall_list); - } - } -rcu_read_unlock (); -spin_unlock (&clp->cl_lock); - -list_for_each_entry_safe (lo, tmp, - &recall_list, plh_bulk_recall) { - ino = lo->plh_inode; -spin_lock (&ino->i_lock); -set_bit (NFS_LAYOUT_BULK_RECALL , &lo->plh_flags); -if (pnfs_mark_matching_lsegs_invalid (lo, &free_me_list, &range)) - rv =NFS4ERR_DELAY ; -list_del_init (&lo->plh_bulk_recall); -spin_unlock (&ino->i_lock); -pnfs_free_lseg_list (&free_me_list); -pnfs_put_layout_hdr (lo); -iput (ino); - } -return rv; +if (args->cbl_recall_type ==RETURN_FSID ) + stat =pnfs_destroy_layouts_byfsid (clp, &args->cbl_fsid, true); +else + stat =pnfs_destroy_layouts_byclid (clp, true); +if (stat !=0 ) +return NFS4ERR_DELAY ; +return NFS4ERR_NOMATCHING_LAYOUT ; } static u32 do_callback_layoutrecall(struct nfs_client *clp,
fs/nfs/pnfs.c +130 -20
174 lines not on this page · raw message
fs/nfs/pnfs.h +6 -1
@@ -132,7 +132,7 @@ struct pnfs_layoutdriver_type {struct pnfs_layout_hdr {atomic_t plh_refcount;struct list_head plh_layouts;/* other client layouts */ -struct list_head plh_bulk_recall;/* clnt list of bulk recalls */ +struct list_head plh_bulk_destroy;struct list_head plh_segs;/* layout segments list */ nfs4_stateid plh_stateid;atomic_t plh_outstanding;/* number of RPCs out */
@@ -196,6 +196,11 @@ struct pnfs_layout_segment *pnfs_layout_void pnfs_free_lseg_list (struct list_head *tmp_list);void pnfs_destroy_layout (struct nfs_inode *);void pnfs_destroy_all_layouts (struct nfs_client *); +int pnfs_destroy_layouts_byfsid (struct nfs_client *clp, +struct nfs_fsid *fsid, +bool is_recall); +int pnfs_destroy_layouts_byclid (struct nfs_client *clp, +bool is_recall);void pnfs_put_layout_hdr (struct pnfs_layout_hdr *lo); void pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,
Greg Kroah-Hartman
maintainerPATCH 48/150 NFSv4.1: Dont decode skipped layoutgets
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weston Andros Adamson <[email protected]>
commit 085b7a45c63d3da5be155faab9249a5cab224561 upstream.
layoutget's prepare hook can call rpc_exit with status = NFS4_OK (0). Because of this, nfs4_proc_layoutget can't depend on a 0 status to mean that the RPC was successfully sent, received and parsed.
To fix this, use the result's len member to see if parsing took place.
This fixes the following OOPS -- calling xdr_init_decode() with a buffer length 0 doesn't set the stream's 'p' member and ends up using uninitialized memory in filelayout_decode_layout.
BUG: unable to handle kernel paging request at 0000000000008050 IP: [<ffffffff81282e78>] memcpy+0x18/0x120 PGD 0 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/pci0000:00/0000:00:11.0/0000:02:01.0/irq CPU 1 Modules linked in: nfs_layout_nfsv41_files nfs lockd fscache auth_rpcgss nfs_acl autofs4 sunrpc ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables ipv6 dm_mirror dm_region_hash dm_log dm_mod ppdev parport_pc parport snd_ens1371 snd_rawmidi snd_ac97_codec ac97_bus snd_seq snd_seq_device snd_pcm snd_timer snd soundcore snd_page_alloc e1000 microcode vmware_balloon i2c_piix4 i2c_core sg shpchp ext4 mbcache jbd2 sr_mod cdrom sd_mod crc_t10dif pata_acpi ata_generic ata_piix mptspi mptscsih mptbase scsi_transport_spi [last unloaded: speedstep_lib]
Pid: 1665, comm: flush-0:22 Not tainted 2.6.32-356-test-2 #2 VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform
RIP: 0010:[<ffffffff81282e78>] [<ffffffff81282e78>] memcpy+0x18/0x120 RSP: 0018:ffff88003dfab588 EFLAGS: 00010206 RAX: ffff88003dc42000 RBX: ffff88003dfab610 RCX: 0000000000000009 RDX: 000000003f807ff0 RSI: 0000000000008050 RDI: ffff88003dc42000 RBP: ffff88003dfab5b0 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000080 R12: 0000000000000024 R13: ffff88003dc42000 R14: ffff88003f808030 R15: ffff88003dfab6a0 FS: 0000000000000000(0000) GS:ffff880003420000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000008050 CR3: 000000003bc92000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process flush-0:22 (pid: 1665, threadinfo ffff88003dfaa000, task ffff880037f77540) Stack: ffffffffa0398ac1 ffff8800397c5940 ffff88003dfab610 ffff88003dfab6a0 <d> ffff88003dfab5d0 ffff88003dfab680 ffffffffa01c150b ffffea0000d82e70 <d> 000000508116713b 0000000000000000 0000000000000000 0000000000000000 Call Trace: [<ffffffffa0398ac1>] ? xdr_inline_decode+0xb1/0x120 [sunrpc] [<ffffffffa01c150b>] filelayout_decode_layout+0xeb/0x350 [nfs_layout_nfsv41_files] [<ffffffffa01c17fc>] filelayout_alloc_lseg+0x8c/0x3c0 [nfs_layout_nfsv41_files] [<ffffffff8150e6ce>] ? __wait_on_bit+0x7e/0x90
--- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfs/nfs4proc.c +2 -1
@@ -6142,7 +6142,8 @@ nfs4_proc_layoutget(struct nfs4_layoutge status =nfs4_wait_for_completion_rpc_task (task);if (status ==0 ) status = task->tk_status; -if (status ==0 ) +/* if layoutp->len is 0, nfs4_layoutget_prepare called rpc_exit */ +if (status ==0 && lgp->res.layoutp->len) lseg =pnfs_layout_process (lgp);rpc_put_task (task);dprintk ("<-- %s status=%d\n" , __func__, status);
Greg Kroah-Hartman
maintainerPATCH 49/150 p54usb: corrected USB ID for T-Com Sinus 154 data II
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomasz Guszkowski <[email protected]>
commit 008e33f733ca51acb2dd9d88ea878693b04d1d2a upstream.
Corrected USB ID for T-Com Sinus 154 data II. ISL3887-based. The device was tested in managed mode with no security, WEP 128 bit and WPA-PSK (TKIP) with firmware 2.13.1.0.lm87.arm (md5sum:7d676323ac60d6e1a3b6d61e8c528248). It works.
--- drivers/net/wireless/p54/p54usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -84,8 +84,8 @@ static struct usb_device_id p54u_table[] {USB_DEVICE(0x06b9, 0x0121)}, /* Thomson SpeedTouch 121g */ {USB_DEVICE(0x0707, 0xee13)}, /* SMC 2862W-G version 2 */ {USB_DEVICE(0x0803, 0x4310)}, /* Zoom 4410a */ - {USB_DEVICE(0x083a, 0x4503)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0x4521)}, /* Siemens Gigaset USB Adapter 54 version 2 */ + {USB_DEVICE(0x083a, 0x4531)}, /* T-Com Sinus 154 data II */ {USB_DEVICE(0x083a, 0xc501)}, /* Zoom Wireless-G 4410 */ {USB_DEVICE(0x083a, 0xf503)}, /* Accton FD7050E ver 1010ec */ {USB_DEVICE(0x0846, 0x4240)}, /* Netgear WG111 (v2) */
Greg Kroah-Hartman
maintainerPATCH 50/150 ALSA: usb-audio: fix Roland A-PRO support
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 7da58046482fceb17c4a0d4afefd9507ec56de7f upstream.
The quirk for the Roland/Cakewalk A-PRO keyboards accidentally used the wrong interface number, which prevented the driver from attaching to the device.
--- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks-table.h +1 -1
@@ -1750,7 +1750,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {/* .vendor_name = "Roland", */ /* .product_name = "A-PRO", */ - .ifnum =1 , + .ifnum =0 , .type =QUIRK_MIDI_FIXED_ENDPOINT , .data = & (const struct snd_usb_midi_endpoint_info ) { .out_cables =0x0003 ,
Greg Kroah-Hartman
maintainerPATCH 51/150 ALSA: usb/quirks, fix out-of-bounds access
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jiri Slaby <[email protected]>
commit 4909a0caabb8b4352efcea223e58b86f8bc1f98b upstream.
bootresponse in snd_usb_mbox2_boot_quirk is only 12 (decimal) u8's long, but i9s passed to snd_usb_ctl_msg as it would be 0x12 (hexa) long. Fix that by having proper size of the array, i.e. 0x12.
--- sound/usb/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/quirks.c +1 -1
@@ -533,7 +533,7 @@ static int snd_usb_mbox2_boot_quirk(stru {struct usb_host_config *config = dev->actconfig;int err; -u8 bootresponse[12 ]; +u8 bootresponse[0x12 ];int fwsize;int count;
Greg Kroah-Hartman
maintainerPATCH 52/150 ALSA: usb: Fix Processing Unit Descriptor parsers
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pawel Moll <[email protected]>
commit b531f81b0d70ffbe8d70500512483227cc532608 upstream.
Commit 99fc86450c439039d2ef88d06b222fd51a779176 "ALSA: usb-mixer:
parse descriptors with structs" introduced a set of useful parsers for descriptors. Unfortunately the parses for the Processing Unit Descriptor came with a very subtle bug...
Functions uac_processing_unit_iProcessing() and uac_processing_unit_specific() were indexing the baSourceID array forgetting the fields before the iProcessing and process-specific descriptors.
The problem was observed with Sound Blaster Extigy mixer, where nNrModes in Up/Down-mix Processing Unit Descriptor was accessed at offset 10 of the descriptor (value 0) instead of offset 15 (value 7). In result the resulting control had interesting limit values:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - -1
Mono: -1 [100%]
Fixed by starting from the bmControls, which was calculated correctly, instead of baSourceID.
Now the mentioned control is fine:
Simple mixer control 'Channel Routing Mode Select',0
Capabilities: volume volume-joined penum Playback channels: Mono
Capture channels: Mono
Limits: 0 - 6
Mono: 0 [0%]
--- include/uapi/linux/usb/audio.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/usb/audio.h +4 -2
@@ -384,14 +384,16 @@ static inline __u8 uac_processing_unit_i int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return desc->baSourceID[desc->bNrInPins + control_size]; +return *(uac_processing_unit_bmControls (desc, protocol) + + control_size); }static inline __u8 *uac_processing_unit_specific (struct uac_processing_unit_descriptor *desc,int protocol) {__u8 control_size =uac_processing_unit_bControlSize (desc, protocol); -return &desc->baSourceID[desc->bNrInPins + control_size +1 ]; +return uac_processing_unit_bmControls (desc, protocol) + + control_size +1 ; }/* 4.5.2 Class-Specific AS Interface Descriptor */
Greg Kroah-Hartman
maintainerPATCH 53/150 ALSA: hda - Disable runtime PM for Intel 5 Series/3400
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 2c1350fdeaefefe1a149d3b083383409f43f0daa upstream.
We've got a regression report wrt the IRQ issue related with the power-save on a Dell machine, and disabling runtime PM works around.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=53441
--- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_intel.c +1 -1
@@ -3624,7 +3624,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH },/* 5 Series/3400 */ { PCI_DEVICE(0x8086, 0x3b56), - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH }, + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, /* Poulsbo */ { PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
Greg Kroah-Hartman
maintainerPATCH 54/150 ALSA: hda - Release assigned pin/cvt at error path of hdmi_pcm_open()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 2ad779b7329d6894a80df94e693e72eaa0d56790 upstream.
If the driver detects and invalid ELD, it gives an open error. But it forgot to release the assigned pin, converter and spdif ctls before returning.
--- sound/pci/hda/patch_hdmi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
sound/pci/hda/patch_hdmi.c +5 -1
@@ -1100,8 +1100,12 @@ static int hdmi_pcm_open(struct hda_pcm_if (!static_hdmi_pcm && eld->eld_valid) {snd_hdmi_eld_update_pcm_info (eld, hinfo);if (hinfo->channels_min > hinfo->channels_max || - !hinfo->rates || !hinfo->formats) + !hinfo->rates || !hinfo->formats) { + per_cvt->assigned =0 ; + hinfo->nid =0 ; +snd_hda_spdif_ctls_unassign (codec, pin_idx);return -ENODEV ; + } }/* Store the updated parameters */
Greg Kroah-Hartman
maintainerPATCH 55/150 ALSA: hda - Fix default multichannel HDMI mapping regression
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anssi Hannula <[email protected]>
commit 20608731f479d48be6bcb88e727f360ddf98ddaf upstream.
Commit d45e6889ee69456a4d5b1bbb32252f460cd48fa9 ("ALSA: hda - Provide the proper channel mapping for generic HDMI driver") added support for custom channel maps in the HDA HDMI driver. Due to a mistake in an 'if' condition the custom map is always used even when no such map has been set. This causes incorrect channel mapping for multichannel audio by default.
Pass per_pin->chmap_set to hdmi_setup_channel_mapping() as a parameter so that it can use it for detecting if a custom map has been set instead of checking if map is NULL (which is never the case).
--- sound/pci/hda/patch_hdmi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
sound/pci/hda/patch_hdmi.c +7 -4
@@ -714,9 +714,10 @@ static void hdmi_setup_fake_chmap(unsignstatic void hdmi_setup_channel_mapping (struct hda_codec *codec,hda_nid_t pin_nid,bool non_pcm,int ca, -int channels,unsigned char *map) +int channels,unsigned char *map, +bool chmap_set) { -if (!non_pcm && map) { +if (!non_pcm && chmap_set) {hdmi_manual_setup_channel_mapping (codec, pin_nid, channels, map); }else {
@@ -905,7 +906,8 @@ static void hdmi_setup_audio_infoframe(s pin_nid, channels);hdmi_setup_channel_mapping (codec, pin_nid, non_pcm, ca, - channels, per_pin->chmap); + channels, per_pin->chmap, + per_pin->chmap_set);hdmi_stop_infoframe_trans (codec, pin_nid);hdmi_fill_audio_infoframe (codec, pin_nid, ai.bytes,sizeof (ai));
@@ -915,7 +917,8 @@ static void hdmi_setup_audio_infoframe(s* accordingly */ if (per_pin->non_pcm != non_pcm)hdmi_setup_channel_mapping (codec, pin_nid, non_pcm, ca, - channels, per_pin->chmap); + channels, per_pin->chmap, + per_pin->chmap_set); } per_pin->non_pcm = non_pcm;
Greg Kroah-Hartman
maintainerPATCH 56/150 ALSA: hda - Workaround for silent output on Sony Vaio VGC-LN51JGB with ALC889
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fernando Luis Vazquez Cao <[email protected]>
commit 12e31a78c70dc12897fda2489113f445c0e94a18 upstream.
Some Vaio all-in-one desktop PCs (for example VGC-LN51JGB) are affected by the same issue that caused Vaio Z laptops to become silent: the speaker pin must be connected to the first DAC even though the codec itself advertises flexible routing through any of the DACs.
Use the no-primary-hp fixup for choosing the speaker pin as the primary so that the right DAC is assigned on this device.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -5394,6 +5394,7 @@ static const struct snd_pci_quirk alc882SND_PCI_QUIRK (0x1043 ,0x835f ,"Asus Eee 1601" ,ALC888_FIXUP_EEE1601 ),SND_PCI_QUIRK (0x104d ,0x9047 ,"Sony Vaio TT" ,ALC889_FIXUP_VAIO_TT ),SND_PCI_QUIRK (0x104d ,0x905a ,"Sony Vaio Z" ,ALC882_FIXUP_NO_PRIMARY_HP ), +SND_PCI_QUIRK (0x104d ,0x9043 ,"Sony Vaio VGC-LN51JGB" ,ALC882_FIXUP_NO_PRIMARY_HP ),/* All Apple entries are in codec SSIDs */ SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF),
Greg Kroah-Hartman
maintainerPATCH 57/150 ALSA: hda - Fix broken workaround for HDMI/SPDIF conflicts
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit ea9b43addc4d90ca5b029f47f85ca152320a1e8d upstream.
The commit [dcda58061: ALSA: hda - Add workaround for conflicting IEC958 controls] introduced a workaround for cards that have both SPDIF and HDMI devices for giving device=1 to SPDIF control elements. It turned out, however, that this workaround doesn't work well -
- The workaround checks only conflicts in a single codec, but SPDIF and HDMI are provided by multiple codecs in many cases, and
- ALSA mixer abstraction doesn't care about the device number in ctl elements, thus you'll get errors from amixer such as
% amixer scontrols -c 0
ALSA lib simple_none.c:1551:(simple_add1) helem (MIXER,'IEC958 Playback Switch',0,1,0) appears twice or more
amixer: Mixer hw:0 load error: Invalid argument
This patch fixes the previous broken workaround. Instead of changing the device number of SPDIF ctl elements, shift the element indices of such controls up to 16. Also, the conflict check is performed over all codecs found on the bus.
HDMI devices will be put to dev=0,index=0 as before. Only the conflicting SPDIF device is moved to a different place. The new place of SPDIF device is supposed by the updated alsa-lib HDA-Intel.conf, respectively.
--- sound/pci/hda/hda_codec.c | 43 +++++++++++++++++++++---------------------- sound/pci/hda/hda_codec.h | 3 ++- 2 files changed, 23 insertions(+), 23 deletions(-)
sound/pci/hda/hda_codec.c +21 -22
@@ -2160,11 +2160,12 @@ struct snd_kcontrol *snd_hda_find_mixer_EXPORT_SYMBOL_HDA (snd_hda_find_mixer_ctl);static int find_empty_mixer_ctl_idx (struct hda_codec *codec,const char *name, -int dev) +int start_idx) { -int idx; -for (idx =0 ; idx <16 ; idx++) {/* 16 ctlrs should be large enough */ -if (!find_mixer_ctl (codec, name, dev, idx)) +int i, idx; +/* 16 ctlrs should be large enough */ +for (i =0 , idx = start_idx; i <16 ; i++, idx++) { +if (!find_mixer_ctl (codec, name,0 , idx))return idx; }return -EBUSY ;
@@ -3132,30 +3133,29 @@ int snd_hda_create_dig_out_ctls(struct hint err;struct snd_kcontrol *kctl;struct snd_kcontrol_new *dig_mix; -int idx, dev =0 ; -const int spdif_pcm_dev =1 ; +int idx =0 ; +const int spdif_index =16 ;struct hda_spdif_out *spdif; +struct hda_bus *bus = codec->bus; -if (codec->primary_dig_out_type ==HDA_PCM_TYPE_HDMI && +if (bus->primary_dig_out_type ==HDA_PCM_TYPE_HDMI && type ==HDA_PCM_TYPE_SPDIF ) { - dev = spdif_pcm_dev; - }else if (codec->primary_dig_out_type ==HDA_PCM_TYPE_SPDIF && + idx = spdif_index; + }else if (bus->primary_dig_out_type ==HDA_PCM_TYPE_SPDIF && type ==HDA_PCM_TYPE_HDMI ) { -for (idx =0 ; idx < codec->spdif_out.used; idx++) { - spdif =snd_array_elem (&codec->spdif_out, idx); -for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { - kctl =find_mixer_ctl (codec, dig_mix->name,0 , idx); -if (!kctl) -break ; - kctl->id.device = spdif_pcm_dev; - } +/* suppose a single SPDIF device */ +for (dig_mix = dig_mixes; dig_mix->name; dig_mix++) { + kctl =find_mixer_ctl (codec, dig_mix->name,0 ,0 ); +if (!kctl) +break ; + kctl->id.index = spdif_index; } - codec->primary_dig_out_type =HDA_PCM_TYPE_HDMI ; + bus->primary_dig_out_type =HDA_PCM_TYPE_HDMI ; } -if (!codec->primary_dig_out_type) - codec->primary_dig_out_type = type; +if (!bus->primary_dig_out_type) + bus->primary_dig_out_type = type; - idx =find_empty_mixer_ctl_idx (codec,"IEC958 Playback Switch" , dev); + idx =find_empty_mixer_ctl_idx (codec,"IEC958 Playback Switch" , idx);if (idx <0 ) {printk (KERN_ERR "hda_codec: too many IEC958 outputs\n" );return -EBUSY ;
@@ -3165,7 +3165,6 @@ int snd_hda_create_dig_out_ctls(struct h kctl =snd_ctl_new1 (dig_mix, codec);if (!kctl)return -ENOMEM ; - kctl->id.device = dev; kctl->id.index = idx; kctl->private_value = codec->spdif_out.used -1 ; err =snd_hda_ctl_add (codec, associated_nid, kctl);
sound/pci/hda/hda_codec.h +2 -1
@@ -671,6 +671,8 @@ struct hda_bus { unsigned int response_reset:1; /* controller was reset */ unsigned int in_reset:1; /* during reset operation */ unsigned int power_keep_link_on:1; /* don't power off HDA link */ + +int primary_dig_out_type;/* primary digital out PCM type */ };/*
@@ -837,7 +839,6 @@ struct hda_codec {struct mutex hash_mutex;struct snd_array spdif_out;unsigned int spdif_in_enable;/* SPDIF input enable? */ -int primary_dig_out_type;/* primary digital out PCM type */ const hda_nid_t *slave_dig_outs;/* optional digital out slave widgets */ struct snd_array init_pins;/* initial (BIOS) pin configurations */ struct snd_array driver_pins;/* pin configs set by codec parser */
Greg Kroah-Hartman
maintainerPATCH 58/150 ALSA: hda - hdmi: ELD shouldnt be valid after unplug
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit bbfd8a19b6913f50a362457c34d49bfafe5e456e upstream.
Currently, eld_valid is never set to false, except at kernel module load time. This patch makes sure that eld is no longer valid when the cable is (hot-)unplugged.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -1172,6 +1172,7 @@ static void hdmi_present_sense(struct hd"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n" , codec->addr, pin_nid, eld->monitor_present, eld_valid); + eld->eld_valid = false;if (eld_valid) {if (!snd_hdmi_get_eld (eld, codec, pin_nid))snd_hdmi_show_eld (eld);
Greg Kroah-Hartman
maintainerPATCH 59/150 GFS2: Get a block reservation before resizing a file
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bob Peterson <[email protected]>
commit d2b47cfb26fe06002b8011707baac71a9ae8166f upstream.
This patch allocates a block reservation structure before growing or shrinking a file. Without this structure, the grow or shink code can reference the bad pointer.
--- fs/gfs2/bmap.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/gfs2/bmap.c +4 -0
@@ -1286,6 +1286,10 @@ int gfs2_setattr_size(struct inode *inodinode_dio_wait (inode); + ret =gfs2_rs_alloc (GFS2_I (inode)); +if (ret) +return ret; + oldsize = inode->i_size;if (newsize >= oldsize)return do_grow (inode, newsize);
Greg Kroah-Hartman
maintainerPATCH 60/150 sparc64: Fix gfp_flags setting in tsb_grow().
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit a55ee1ff751f88252207160087d8197bb7538d4c ]
We should "|= more_flags" rather than "= more_flags".
--- arch/sparc/mm/tsb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/mm/tsb.c +1 -1
@@ -314,7 +314,7 @@ void tsb_grow(struct mm_struct *mm, unsi retry_tsb_alloc: gfp_flags =GFP_KERNEL ;if (new_size > (PAGE_SIZE *2 )) - gfp_flags = __GFP_NOWARN | __GFP_NORETRY; + gfp_flags |= __GFP_NOWARN | __GFP_NORETRY; new_tsb =kmem_cache_alloc_node (tsb_caches[new_cache_index], gfp_flags,numa_node_id ());
Greg Kroah-Hartman
maintainerPATCH 61/150 sparc64: Handle hugepage TSB being NULL.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit bcd896bae0166b4443503482a26ecf84d9ba60ab ]
Accomodate the possibility that the TSB might be NULL at the point that update_mmu_cache() is invoked. This is necessary because we will sometimes need to defer the TSB allocation to the first fault that happens in the 'mm'.
Seperate out the hugepage PTE test into a seperate function so that the logic is clearer.
--- arch/sparc/mm/init_64.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-)
arch/sparc/mm/init_64.c +22 -16
@@ -314,16 +314,31 @@ static void __update_mmu_tsb_insert(strustruct tsb *tsb = mm->context.tsb_block[tsb_index].tsb;unsigned long tag; +if (unlikely (!tsb)) +return ; + tsb += ((address >> tsb_hash_shift) & (mm->context.tsb_block[tsb_index].tsb_nentries -1UL )); tag = (address >>22UL );tsb_insert (tsb, tag, tte); } +#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) +static inline bool is_hugetlb_pte (pte_t pte) +{ +if ((tlb_type == hypervisor && + (pte_val (pte) & _PAGE_SZALL_4V) == _PAGE_SZHUGE_4V) || + (tlb_type != hypervisor && + (pte_val (pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) +return true; +return false; +} +#endif +void update_mmu_cache (struct vm_area_struct *vma,unsigned long address,pte_t *ptep) { -unsigned long tsb_index, tsb_hash_shift, flags;struct mm_struct *mm; +unsigned long flags;pte_t pte = *ptep;if (tlb_type != hypervisor) {
@@ -335,25 +350,16 @@ void update_mmu_cache(struct vm_area_str mm = vma->vm_mm; - tsb_index =MM_TSB_BASE ; - tsb_hash_shift =PAGE_SHIFT ; -spin_lock_irqsave (&mm->context.lock, flags);#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) -if (mm->context.tsb_block[MM_TSB_HUGE ].tsb !=NULL ) { -if ((tlb_type == hypervisor && - (pte_val (pte) & _PAGE_SZALL_4V) == _PAGE_SZHUGE_4V) || - (tlb_type != hypervisor && - (pte_val (pte) & _PAGE_SZALL_4U) == _PAGE_SZHUGE_4U)) { - tsb_index =MM_TSB_HUGE ; - tsb_hash_shift =HPAGE_SHIFT ; - } - } +if (mm->context.huge_pte_count &&is_hugetlb_pte (pte)) +__update_mmu_tsb_insert (mm,MM_TSB_HUGE ,HPAGE_SHIFT , + address,pte_val (pte)); + else#endif - -__update_mmu_tsb_insert (mm, tsb_index, tsb_hash_shift, - address,pte_val (pte)); +__update_mmu_tsb_insert (mm,MM_TSB_BASE ,PAGE_SHIFT , + address,pte_val (pte));spin_unlock_irqrestore (&mm->context.lock, flags); }
Greg Kroah-Hartman
maintainerPATCH 62/150 sparc64: Fix tsb_grow() in atomic context.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 0fbebed682ff2788dee58e8d7f7dda46e33aa10b ]
If our first THP installation for an MM is via the set_pmd_at() done during khugepaged's collapsing we'll end up in tsb_grow() trying to do a GFP_KERNEL allocation with several locks held.
Simply using GFP_ATOMIC in this situation is not the best option because we really can't have this fail, so we'd really like to keep this an order 0 GFP_KERNEL allocation if possible.
Also, doing the TSB allocation from khugepaged is a really bad idea because we'll allocate it potentially from the wrong NUMA node in that context.
So what we do is defer the hugepage TSB allocation until the first TLB miss we take on a hugepage. This is slightly tricky because we have to handle two unusual cases:
1) Taking the first hugepage TLB miss in the window trap handler. We'll call the winfix_trampoline when that is detected.
2) An initial TSB allocation via TLB miss races with a hugetlb fault on another cpu running the same MM. We handle this by unconditionally loading the TSB we see into the current cpu even if it's non-NULL at hugetlb_setup time.
--- arch/sparc/include/asm/hugetlb.h | 1 - arch/sparc/include/asm/page_64.h | 4 ++-- arch/sparc/kernel/tsb.S | 39 +++++++++++++++++++++++++++++++++++---- arch/sparc/mm/fault_64.c | 9 +++++++-- arch/sparc/mm/init_64.c | 24 +++++++++++++++++++----- arch/sparc/mm/tlb.c | 11 +++++++++-- 6 files changed, 72 insertions(+), 16 deletions(-)
arch/sparc/include/asm/hugetlb.h +0 -1
@@ -12,7 +12,6 @@ pte_t huge_ptep_get_and_clear(struct mm_static inline void hugetlb_prefault_arch_hook (struct mm_struct *mm) { -hugetlb_setup (mm); } static inline int is_hugepage_only_range(struct mm_struct *mm,
arch/sparc/include/asm/page_64.h +2 -2
@@ -27,8 +27,8 @@#ifndef __ASSEMBLY__#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) -struct mm_struct ; -extern void hugetlb_setup (struct mm_struct *mm); +struct pt_regs ; +extern void hugetlb_setup (struct pt_regs *regs);#endif #define WANT_PAGE_VIRTUAL
arch/sparc/kernel/tsb.S +35 -4
@@ -136,12 +136,43 @@ tsb_miss_page_table_walk_sun4v_fastpath: nop /* It is a huge page, use huge page TSB entry address we - * calculated above. + * calculated above. If the huge page TSB has not been + * allocated, setup a trap stack and call hugetlb_setup() + * to do so, then return from the trap to replay the TLB + * miss. + * + * This is necessary to handle the case of transparent huge + * pages where we don't really have a non-atomic context + * in which to allocate the hugepage TSB hash table. When + * the 'mm' faults in the hugepage for the first time, we + * thus handle it here. This also makes sure that we can + * allocate the TSB hash table on the correct NUMA node. */ TRAP_LOAD_TRAP_BLOCK(%g7, %g2) - ldx [%g7 + TRAP_PER_CPU_TSB_HUGE_TEMP], %g2 - cmp %g2, -1 - movne %xcc, %g2, %g1 + ldx [%g7 + TRAP_PER_CPU_TSB_HUGE_TEMP], %g1 + cmp %g1, -1 + bne,pt %xcc, 60f + nop + +661: rdpr %pstate, %g5 + wrpr %g5, PSTATE_AG | PSTATE_MG, %pstate + .section .sun4v_2insn_patch, "ax" + .word 661b + SET_GL(1) + nop + .previous + + rdpr %tl, %g3 + cmp %g3, 1 + bne,pn %xcc, winfix_trampoline + nop + ba,pt %xcc, etrap + rd %pc, %g7 + call hugetlb_setup + add %sp, PTREGS_OFF, %o0 + ba,pt %xcc, rtrap + nop + 60: #endif
arch/sparc/mm/fault_64.c +7 -2
@@ -472,8 +472,13 @@ good_area:#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) mm_rss = mm->context.huge_pte_count;if (unlikely (mm_rss > - mm->context.tsb_block[MM_TSB_HUGE ].tsb_rss_limit)) -tsb_grow (mm,MM_TSB_HUGE , mm_rss); + mm->context.tsb_block[MM_TSB_HUGE ].tsb_rss_limit)) { +if (mm->context.tsb_block[MM_TSB_HUGE ].tsb) +tsb_grow (mm,MM_TSB_HUGE , mm_rss); +else +hugetlb_setup (regs); + + }#endif return ;
arch/sparc/mm/init_64.c +19 -5
@@ -2718,14 +2718,28 @@ static void context_reload(void *__data)load_secondary_context (mm); } -void hugetlb_setup (struct mm_struct *mm) +void hugetlb_setup (struct pt_regs *regs) { -struct tsb_config *tp = &mm->context.tsb_block[MM_TSB_HUGE ]; +struct mm_struct *mm = current->mm; +struct tsb_config *tp; -if (likely (tp->tsb !=NULL )) -return ; +if (in_atomic () || !mm) { +const struct exception_table_entry *entry; + + entry =search_exception_tables (regs->tpc); +if (entry) { + regs->tpc = entry->fixup; + regs->tnpc = regs->tpc +4 ; +return ; + } +pr_alert ("Unexpected HugeTLB setup in atomic context.\n" ); +die_if_kernel ("HugeTSB in atomic" , regs); + } + + tp = &mm->context.tsb_block[MM_TSB_HUGE ]; +if (likely (tp->tsb ==NULL )) +tsb_grow (mm,MM_TSB_HUGE ,0 ); -tsb_grow (mm,MM_TSB_HUGE ,0 );tsb_context_switch (mm);smp_tsb_sync (mm);
arch/sparc/mm/tlb.c +9 -2
@@ -135,8 +135,15 @@ void set_pmd_at(struct mm_struct *mm, un mm->context.huge_pte_count++; else mm->context.huge_pte_count--; -if (mm->context.huge_pte_count ==1 ) -hugetlb_setup (mm); + +/* Do not try to allocate the TSB hash table if we +* don't have one already. We have various locks held +* and thus we'll end up doing a GFP_KERNEL allocation +* in an atomic context. +* +* Instead, we let the first TLB miss on a hugepage +* take care of this. +*/ }if (!pmd_none (orig)) {
Greg Kroah-Hartman
maintainerPATCH 63/150 sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "David S. Miller" <[email protected]>
[ Upstream commit 76968ad2eac6456270353de168b21f04f4b3d1d3 ]
When we set the sun4u version of the PTE execute bit, it's:
or REG, _PAGE_EXEC_4U, REG
_PAGE_EXEC_4U is 0x1000, unfortunately the immedate field of the 'or' instruction is a signed 13-bit value. So the above actually assembles into:
or REG, -4096, REG
completely corrupting the final PTE value.
Set it with a:
sethi %hi(_PAGE_EXEC_4U), TMP or REG, TMP, REG
sequence instead.
This fixes "git gc" crashes on sun4u machines.
--- arch/sparc/include/asm/tsb.h | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
arch/sparc/include/asm/tsb.h +19 -9
@@ -157,17 +157,26 @@ extern struct tsb_phys_patch_entry __tsb andn REG2, 0x7, REG2; \add REG1 ,REG2 ,REG1 ; -/* This macro exists only to make the PMD translator below easier -* to read. It hides the ELF section switch for the sun4v code -* patching. +/* These macros exists only to make the PMD translator below +* easier to read. It hides the ELF section switch for the +* sun4v code patching. */ -#define OR_PTE_BIT (REG ,NAME ) \ +#define OR_PTE_BIT_1INSN (REG ,NAME ) \ 661: or REG, _PAGE_##NAME##_4U, REG; \ .section .sun4v_1insn_patch, "ax"; \ .word 661b; \ or REG, _PAGE_##NAME##_4V, REG; \ .previous; +#define OR_PTE_BIT_2INSN (REG ,TMP ,NAME ) \ +661: sethi %hi(_PAGE_##NAME##_4U), TMP; \ + or REG, TMP, REG; \ + .section .sun4v_2insn_patch, "ax"; \ + .word 661b; \ + mov -1, TMP; \ + or REG, _PAGE_##NAME##_4V, REG; \ + .previous; +/* Load into REG the PTE value for VALID, CACHE, and SZHUGE. */ #define BUILD_PTE_VALID_SZHUGE_CACHE (REG ) \ 661: sethi %uhi(_PAGE_VALID|_PAGE_SZHUGE_4U), REG; \
@@ -214,12 +223,13 @@ extern struct tsb_phys_patch_entry __tsbandn REG1 ,PMD_HUGE_PROTBITS ,REG2 ; \sllx REG2 ,PMD_PADDR_SHIFT ,REG2 ; \/* REG2 now holds PFN << PAGE_SHIFT */ \ - andcc REG1, PMD_HUGE_EXEC, %g0; \ - bne,a,pt %xcc,1f ; \ -OR_PTE_BIT (REG2 ,EXEC ); \ -1: andcc REG1, PMD_HUGE_WRITE, %g0; \ + andcc REG1, PMD_HUGE_WRITE, %g0; \ bne,a,pt %xcc,1f ; \ -OR_PTE_BIT (REG2 ,W ); \ +OR_PTE_BIT_1INSN (REG2 ,W ); \ +1: andcc REG1, PMD_HUGE_EXEC, %g0; \ + be,pt %xcc,1f ; \ + nop; \ +OR_PTE_BIT_2INSN (REG2 ,REG1 ,EXEC ); \/* REG1 can now be clobbered, build final PTE */ \ 1: BUILD_PTE_VALID_SZHUGE_CACHE(REG1); \ ba,pt %xcc,PTE_LABEL ; \
Greg Kroah-Hartman
maintainerPATCH 64/150 drm/radeon/dce6: fix display powergating
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 0e3d50bfcbd338254795a700dcff429a96cba1a6 upstream.
Only enable it when we disable the display rather than at DPMS time since enabling it requires a full modeset to restore the display state. Fixes blank screens in certain cases.
--- drivers/gpu/drm/radeon/atombios_crtc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/atombios_crtc.c +2 -4
@@ -252,8 +252,6 @@ void atombios_crtc_dpms(struct drm_crtc radeon_crtc->enabled = true;/* adjust pm to dpms changes BEFORE enabling crtcs */ radeon_pm_compute_clocks (rdev); -if (ASIC_IS_DCE6 (rdev) && !radeon_crtc->in_mode_set) -atombios_powergate_crtc (crtc,ATOM_DISABLE );atombios_enable_crtc (crtc,ATOM_ENABLE );if (ASIC_IS_DCE3 (rdev) && !ASIC_IS_DCE6 (rdev))atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );
@@ -271,8 +269,6 @@ void atombios_crtc_dpms(struct drm_crtcatombios_enable_crtc_memreq (crtc,ATOM_DISABLE );atombios_enable_crtc (crtc,ATOM_DISABLE ); radeon_crtc->enabled = false; -if (ASIC_IS_DCE6 (rdev) && !radeon_crtc->in_mode_set) -atombios_powergate_crtc (crtc,ATOM_ENABLE );/* adjust pm to dpms changes AFTER disabling crtcs */ radeon_pm_compute_clocks (rdev);break ;
@@ -1844,6 +1840,8 @@ static void atombios_crtc_disable(structint i;atombios_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); +if (ASIC_IS_DCE6 (rdev)) +atombios_powergate_crtc (crtc,ATOM_ENABLE );for (i =0 ; i < rdev->num_crtc; i++) { if (rdev->mode_info.crtcs[i] &&
Greg Kroah-Hartman
maintainerPATCH 65/150 drm/radeon: fix multi-head power profile stability on BTC+ asics
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 7ae764b11ed63279e9dcf25be972ff4ca21a9875 upstream.
vddci needs to track mclk for multi-head.
--- drivers/gpu/drm/radeon/evergreen.c | 13 +++++++++++++ drivers/gpu/drm/radeon/radeon_pm.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/evergreen.c +13 -0
@@ -403,6 +403,19 @@ void evergreen_pm_misc(struct radeon_dev rdev->pm.current_vddc = voltage->voltage;DRM_DEBUG ("Setting: vddc: %d\n" , voltage->voltage); } + +/* starting with BTC, there is one state that is used for both +* MH and SH. Difference is that we always use the high clock index for +* mclk and vddci. +*/ +if ((rdev->pm.pm_method ==PM_METHOD_PROFILE ) && + (rdev->family >=CHIP_BARTS ) && + rdev->pm.active_crtc_count && + ((rdev->pm.profile_index ==PM_PROFILE_MID_MH_IDX ) || + (rdev->pm.profile_index ==PM_PROFILE_LOW_MH_IDX ))) + voltage = &rdev->pm.power_state[req_ps_idx]. + clock_info[rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX ].dpms_on_cm_idx].voltage; +/* 0xff01 is a flag rather then an actual voltage */ if (voltage->vddci ==0xff01 )return ;
drivers/gpu/drm/radeon/radeon_pm.c +1 -1
@@ -169,7 +169,7 @@ static void radeon_set_power_state(struc/* starting with BTC, there is one state that is used for both * MH and SH. Difference is that we always use the high clock index for -* mclk. +* mclk and vddci. */ if ((rdev->pm.pm_method == PM_METHOD_PROFILE) && (rdev->family >= CHIP_BARTS) &&
Greg Kroah-Hartman
maintainerPATCH 66/150 drm/radeon: remove overzealous warning in hdmi handling
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit c944b2abb067130542055666f23409fd5e1afc8e upstream.
hdmi audio works fine. The warning just confuses users.
fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=44341
--- drivers/gpu/drm/radeon/r600_hdmi.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/radeon/r600_hdmi.c +0 -1
@@ -544,7 +544,6 @@ void r600_hdmi_disable(struct drm_encode/* Called for ATOM_ENCODER_MODE_HDMI only */ if (!dig || !dig->afmt) { -WARN_ON (1 );return ; }if (!dig->afmt->enabled)
Greg Kroah-Hartman
maintainerPATCH 67/150 drm/radeon: properly validate the atpx interface
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 43a23aa450cc19fe8996caf09e7e21ae5f6e56e8 upstream.
Some bioses don't set the function mask correctly
which caused required functions to be disabled.
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=53111
--- drivers/gpu/drm/radeon/radeon_atpx_handler.c | 73 ++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_atpx_handler.c +71 -2
@@ -43,6 +43,12 @@ struct atpx_verify_interface {u32 function_bits;/* supported functions bit vector */ } __packed; +struct atpx_px_params { +u16 size;/* structure size in bytes (includes size field) */ +u32 valid_flags;/* which flags are valid */ +u32 flags;/* flags */ +} __packed; +struct atpx_power_control {u16 size;u8 dgpu_state;
@@ -123,9 +129,61 @@ static void radeon_atpx_parse_functions( }/** +* radeon_atpx_validate_functions - validate ATPX functions +* +* @atpx: radeon atpx struct +* +* Validate that required functions are enabled (all asics). +* returns 0 on success, error on failure. +*/ +static int radeon_atpx_validate (struct radeon_atpx *atpx) +{ +/* make sure required functions are enabled */ +/* dGPU power control is required */ + atpx->functions.power_cntl = true; + +if (atpx->functions.px_params) { +union acpi_object *info; +struct atpx_px_params output; +size_t size; +u32 valid_bits; + + info =radeon_atpx_call (atpx->handle,ATPX_FUNCTION_GET_PX_PARAMETERS ,NULL ); +if (!info) +return -EIO ; + +memset (&output,0 ,sizeof (output)); + + size = *(u16 *) info->buffer.pointer; +if (size <10 ) { +printk ("ATPX buffer is too small: %zu\n" , size); +kfree (info); +return -EINVAL ; + } + size =min (sizeof (output), size); + +memcpy (&output, info->buffer.pointer, size); + + valid_bits = output.flags & output.valid_flags; +/* if separate mux flag is set, mux controls are required */ +if (valid_bits &ATPX_SEPARATE_MUX_FOR_I2C ) { + atpx->functions.i2c_mux_cntl = true; + atpx->functions.disp_mux_cntl = true; + } +/* if any outputs are muxed, mux controls are required */ +if (valid_bits & (ATPX_CRT1_RGB_SIGNAL_MUXED | +ATPX_TV_SIGNAL_MUXED | +ATPX_DFP_SIGNAL_MUXED )) + atpx->functions.disp_mux_cntl = true; + +kfree (info); + } +return 0 ; +} + +/** * radeon_atpx_verify_interface - verify ATPX * -* @handle: acpi handle * @atpx: radeon atpx struct * * Execute the ATPX_FUNCTION_VERIFY_INTERFACE ATPX function
@@ -406,8 +464,19 @@ static bool radeon_atpx_pci_probe_handle*/ static int radeon_atpx_init (void ) { +int r; +/* set up the ATPX handle */ -return radeon_atpx_verify_interface (&radeon_atpx_priv.atpx); + r =radeon_atpx_verify_interface (&radeon_atpx_priv.atpx); +if (r) +return r; + +/* validate the atpx setup */ + r =radeon_atpx_validate (&radeon_atpx_priv.atpx); +if (r) +return r; + +return 0 ; }/**
Greg Kroah-Hartman
maintainerPATCH 68/150 drm/udl: make usage as a console safer
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit bcb39af4486be07e896fc374a2336bad3104ae0a upstream.
Okay you don't really want to use udl devices as your console, but if you are unlucky enough to do so, you run into a lot of schedule while atomic due to printk being called from all sorts of funky places. So check if we are in an atomic context, and queue the damage for later, the next printk should cause it to appear. This isn't ideal, but it is simple, and seems to work okay in my testing here.
(dirty area idea came from xenfb)
fixes a bunch of sleeping while atomic issues running fbcon on udl devices.
--- drivers/gpu/drm/udl/udl_drv.h | 2 + drivers/gpu/drm/udl/udl_fb.c | 44 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-)
drivers/gpu/drm/udl/udl_drv.h +2 -0
@@ -75,6 +75,8 @@ struct udl_framebuffer {struct drm_framebuffer base;struct udl_gem_object *obj;bool active_16;/* active on the 16-bit channel */ +int x1, y1, x2, y2;/* dirty rect */ +spinlock_t dirty_lock; };#define to_udl_fb (x) container_of(x, struct udl_framebuffer, base)
drivers/gpu/drm/udl/udl_fb.c +40 -4
79 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 69/150 drm/udl: disable fb_defio by default
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 677d23b70bf949f75746c80cbae92c233c6b5e2a upstream.
There seems to be a bad interaction between gem/shmem and defio on top, I get list corruption on the page lru in the shmem code.
Turn it off for now until we get some more digging done.
--- drivers/gpu/drm/udl/udl_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/udl/udl_fb.c +2 -2
@@ -22,9 +22,9 @@#include <drm/drm_fb_helper.h> -#define DL_DEFIO_WRITE_DELAY 5/* fb_deferred_io.delay in jiffies */ +#define DL_DEFIO_WRITE_DELAY (HZ/20)/* fb_deferred_io.delay in jiffies */ -static int fb_defio =1 ;/* Optionally enable experimental fb_defio mmap support */ +static int fb_defio =0 ;/* Optionally enable experimental fb_defio mmap support */ static int fb_bpp =16 ;module_param (fb_bpp, int,S_IWUSR |S_IRUSR |S_IWGRP |S_IRGRP );
Greg Kroah-Hartman
maintainerPATCH 70/150 vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 2a2483072393b27f4336ab068a1f48ca19ff1c1e upstream.
When we switch from 256->512 byte font rendering mode, it means the current contents of the screen is being reinterpreted. The bit that holds the high bit of the 9-bit font, may have been previously set, and thus the new font misrenders.
The problem case we see is grub2 writes spaces with the bit set, so it ends up with data like 0x820, which gets reinterpreted into 0x120 char which the font translates into G with a circumflex. This flashes up on screen at boot and is quite ugly.
A current side effect of this patch though is that any rendering on the screen changes color to a slightly darker color, but at least the screen no longer corrupts.
v2: as suggested by hpa, always clear the attribute space, whether we are are going to or from 512 chars.
--- drivers/tty/vt/vt.c | 2 +- drivers/video/console/vgacon.c | 22 +++++++++++++++------- include/linux/vt_kern.h | 1 + 3 files changed, 17 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +1 -1
@@ -638,7 +638,7 @@ static inline void save_screen(struct vc* Redrawing of screen */ -static void clear_buffer_attributes (struct vc_data *vc) +void clear_buffer_attributes (struct vc_data *vc) {unsigned short *p = (unsigned short *)vc->vc_origin;int count = vc->vc_screenbuf_size /2 ;
drivers/video/console/vgacon.c +15 -7
@@ -1064,7 +1064,7 @@ static int vgacon_do_font_op(struct vgasunsigned short video_port_status = vga_video_port_reg +6 ;int font_select =0x00 , beg, i;char *charmap; - +bool clear_attribs = false;if (vga_video_type !=VIDEO_TYPE_EGAM ) { charmap = (char *)VGA_MAP_MEM (colourmap,0 ); beg =0x0e ;
@@ -1169,12 +1169,6 @@ static int vgacon_do_font_op(struct vgas/* if 512 char mode is already enabled don't re-enable it. */ if ((set) && (ch512 != vga_512_chars)) { -/* attribute controller */ -for (i =0 ; i <MAX_NR_CONSOLES ; i++) { -struct vc_data *c = vc_cons[i].d; -if (c && c->vc_sw == &vga_con) - c->vc_hi_font_mask = ch512 ?0x0800 :0 ; - } vga_512_chars = ch512;/* 256-char: enable intensity bit 512-char: disable intensity bit */
@@ -1185,8 +1179,22 @@ static int vgacon_do_font_op(struct vgasit means, but it works, and it appears necessary */ inb_p (video_port_status);vga_wattr (state->vgabase,VGA_AR_ENABLE_DISPLAY ,0 ); + clear_attribs = true; }raw_spin_unlock_irq (&vga_lock); + +if (clear_attribs) { +for (i =0 ; i <MAX_NR_CONSOLES ; i++) { +struct vc_data *c = vc_cons[i].d; +if (c && c->vc_sw == &vga_con) { +/* force hi font mask to 0, so we always clear +the bit on either transition */ + c->vc_hi_font_mask =0x00 ; +clear_buffer_attributes (c); + c->vc_hi_font_mask = ch512 ?0x0800 :0 ; + } + } + }return 0 ; }
include/linux/vt_kern.h +1 -0
@@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cint con_get_cmap (unsigned char __user *cmap);void scrollback (struct vc_data *vc,int lines);void scrollfront (struct vc_data *vc,int lines); +void clear_buffer_attributes (struct vc_data *vc);void update_region (struct vc_data *vc,unsigned long start,int count);void redraw_screen (struct vc_data *vc,int is_switch);#define update_screen (x) redraw_screen(x, 0)
Greg Kroah-Hartman
maintainerPATCH 71/150 PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Williamson <[email protected]>
commit 969daa349f4821a02936af7202b51a9affc7b6da upstream.
PCI_EXP_FLAGS_TYPE is a mask, not an offset. Fix it.
Previously, pcie_capability_read_word(..., PCI_EXP_FLAGS, ...) would fail.
--- drivers/pci/access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/access.c +1 -1
@@ -515,7 +515,7 @@ static bool pcie_capability_reg_implemenreturn false;switch (pos) { -case PCI_EXP_FLAGS_TYPE : +case PCI_EXP_FLAGS :return true;case PCI_EXP_DEVCAP :case PCI_EXP_DEVCTL :
Greg Kroah-Hartman
maintainerPATCH 72/150 drm: dont add inferred modes for monitors that dont support them
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Zanoni <[email protected]>
commit 196e077dc165a307efbd9e7569f81bbdbcf18f65 upstream.
If bit 0 of the features byte (0x18) is set to 0, then, according to the EDID spec, "the display is non-continuous frequency (multi-mode) and is only specified to accept the video timing formats that are listed in Base EDID and certain Extension Blocks".
For more information, please see the EDID spec, check the notes of the table that explains the "Feature Support" byte (18h) and also the notes on the tables of the section that explains "Display Range Limits & Additional Timing Description Definition (tag #FDh)".
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45729
--- drivers/gpu/drm/drm_edid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_edid.c +2 -1
@@ -2020,7 +2020,8 @@ int drm_add_edid_modes(struct drm_connec num_modes +=add_cvt_modes (connector, edid); num_modes +=add_standard_modes (connector, edid); num_modes +=add_established_modes (connector, edid); - num_modes +=add_inferred_modes (connector, edid); +if (edid->features &DRM_EDID_FEATURE_DEFAULT_GTF ) + num_modes +=add_inferred_modes (connector, edid); num_modes +=add_cea_modes (connector, edid);if (quirks & (EDID_QUIRK_PREFER_LARGE_60 |EDID_QUIRK_PREFER_LARGE_75 ))
Greg Kroah-Hartman
maintainerPATCH 73/150 drm: shut up invalid edid messages
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
commit f934ec8c34b9dcefb5a4f35b0bda33bca289cbe6 upstream.
My cheapo monitor has an invalid block 1, resulting in a lot of dmesg spam every few seconds.
I get it the first time that the entire block is all 0xff..
--- drivers/gpu/drm/drm_edid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_edid.c +5 -1
@@ -357,10 +357,14 @@ drm_do_get_edid(struct drm_connector *cobreak ; } } -if (i ==4 ) + +if (i ==4 && print_bad_edid) {dev_warn (connector->dev->dev,"%s: Ignoring invalid EDID block %d.\n" ,drm_get_connector_name (connector), j); + + connector->bad_edid_counter++; + } }if (valid_extensions != block[0x7e ]) {
Greg Kroah-Hartman
maintainerPATCH 74/150 drm: Fill depth/bits_per_pixel for C8 format
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Syrjälä <[email protected]>
commit c51a6bc5f6d328926a9a4a1247c5030faf190a80 upstream.
Set depth/bits_per_pixel to 8 for C8 format.
--- drivers/gpu/drm/drm_crtc.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/drm_crtc.c +1 -0
@@ -3702,6 +3702,7 @@ void drm_fb_get_bpp_depth(uint32_t forma int *bpp) {switch (format) { +case DRM_FORMAT_C8 :case DRM_FORMAT_RGB332 :case DRM_FORMAT_BGR233 : *depth =8 ;
Greg Kroah-Hartman
maintainerPATCH 75/150 drm: Use C8 instead of RGB332 when determining the format from depth/bpp
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ville Syrjälä <[email protected]>
commit d84f031bd230fdf9c3b7734940c859bf28b90219 upstream.
Support for real RGB332 is a rarity, most hardware only really support C8. So use C8 instead of RGB332 when determining the format based on depth/bpp.
This fixes 8bpp fbcon on i915, since i915 will only accept C8 and not RGB332.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59572
--- drivers/gpu/drm/drm_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_crtc.c +1 -1
@@ -2089,7 +2089,7 @@ uint32_t drm_mode_legacy_fb_format(uint3switch (bpp) {case 8 : - fmt =DRM_FORMAT_RGB332 ; + fmt =DRM_FORMAT_C8 ;break ;case 16 :if (depth ==15 )
Greg Kroah-Hartman
maintainerPATCH 76/150 Revert "drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S"
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit db3985e5ca8f50fc17606855ba394783d11683a5 upstream.
This reverts commit 6f33814bd4d9cfe76033a31b1c0c76c960cd8e4b.
The quirk cause a regression, and it looks like the original bug was simply a lack of FIFO bandwidth on the i915G of the reporter. Which should eventually be fixed as soon as we get around to implemented DSPARB FIFO reassignment on gen 3.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=52281
--- drivers/gpu/drm/drm_edid.c | 3 --- 1 file changed, 3 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -3
@@ -87,9 +87,6 @@ static struct edid_quirk {int product_id;u32 quirks; } edid_quirk_list[] = { -/* ASUS VW222S */ - { "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING }, -/* Acer AL1706 */ { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 },/* Acer F51 */
Greg Kroah-Hartman
maintainerPATCH 77/150 drm/usb: bind driver to correct device
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit 9f23de52b64f7fb801fd76f3dd8651a0dc89187b upstream.
While looking at plymouth on udl I noticed that plymouth was trying to use its fb plugin not its drm one, it was trying to drmOpen a driver called usb not udl, noticed that we actually had out driver pointing at the wrong device.
--- drivers/gpu/drm/drm_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_usb.c +1 -1
@@ -18,7 +18,7 @@ int drm_get_usb_dev(struct usb_interface usbdev =interface_to_usbdev (interface); dev->usbdev = usbdev; - dev->dev = &usbdev->dev; + dev->dev = &interface->dev;mutex_lock (&drm_global_mutex);
Greg Kroah-Hartman
maintainerPATCH 78/150 intel/iommu: force writebuffer-flush quirk on Gen 4 Chipsets
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit 210561ffd72d00eccf12c0131b8024d5436bae95 upstream.
We already have the quirk entry for the mobile platform, but also reports on some desktop versions. So be paranoid and set it everywhere.
References: http://www.mail-archive.com/[email protected]/msg33138.html
--- drivers/iommu/intel-iommu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/intel-iommu.c +7 -1
@@ -4253,13 +4253,19 @@ static void quirk_iommu_rwbf(struct pci_ {/* * Mobile 4 Series Chipset neglects to set RWBF capability, -* but needs it: +* but needs it. Same seems to hold for the desktop versions. */ printk (KERN_INFO "DMAR: Forcing write-buffer flush capability\n" ); rwbf_quirk =1 ; }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2a40 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e00 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e10 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e20 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e30 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e40 , quirk_iommu_rwbf); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x2e90 , quirk_iommu_rwbf);#define GGC 0x52#define GGC_MEMORY_SIZE_MASK (0xf << 8)
Greg Kroah-Hartman
maintainerPATCH 79/150 get rid of unprotected dereferencing of mnt->mnt_ns
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
commit 9b40bc90abd126bcc5da5658059b8e72e285e559 upstream.
It's safe only under namespace_sem or vfsmount_lock; all places in fs/namespace.c that want mnt->mnt_ns->user_ns actually want to use current->nsproxy->mnt_ns->user_ns (note the calls of check_mnt() in there).
--- fs/namespace.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
fs/namespace.c +17 -12
@@ -1237,6 +1237,14 @@ static int do_umount(struct mount *mnt,return retval; } +/* +* Is the caller allowed to modify his namespace? +*/ +static inline bool may_mount (void ) +{ +return ns_capable (current->nsproxy->mnt_ns->user_ns,CAP_SYS_ADMIN ); +} +/* * Now umount can handle mount points as well as block devices. * This is important for filesystems which use unnamed block devices.
@@ -1255,6 +1263,9 @@ SYSCALL_DEFINE2(umount, char __user *, nif (flags & ~(MNT_FORCE |MNT_DETACH |MNT_EXPIRE |UMOUNT_NOFOLLOW ))return -EINVAL ; +if (!may_mount ()) +return -EPERM ; +if (!(flags &UMOUNT_NOFOLLOW )) lookup_flags |=LOOKUP_FOLLOW ;
@@ -1268,10 +1279,6 @@ SYSCALL_DEFINE2(umount, char __user *, nif (!check_mnt (mnt)) goto dput_and_out; - retval = -EPERM ; -if (!ns_capable (mnt->mnt_ns->user_ns,CAP_SYS_ADMIN )) - goto dput_and_out; - retval =do_umount (mnt, flags); dput_and_out:/* we mustn't call path_put() as that would clear mnt_expiry_mark */
@@ -1295,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user *static int mount_is_safe (struct path *path) { -if (ns_capable (real_mount (path->mnt)->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (may_mount ())return 0 ;return -EPERM ;#ifdef notyet
@@ -1633,7 +1640,7 @@ static int do_change_type(struct path *pint type;int err =0 ; -if (!ns_capable (mnt->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ;if (path->dentry != path->mnt->mnt_root)
@@ -1797,7 +1804,7 @@ static int do_move_mount(struct path *pastruct mount *p;struct mount *old;int err =0 ; -if (!ns_capable (real_mount (path->mnt)->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ;if (!old_name || !*old_name)return -EINVAL ;
@@ -1933,16 +1940,14 @@ static int do_new_mount(struct path *pat int mnt_flags, const char *name, void *data) { struct file_system_type *type; -struct user_namespace *user_ns; +struct user_namespace *user_ns = current->nsproxy->mnt_ns->user_ns;struct vfsmount *mnt;int err;if (!fstype)return -EINVAL ; -/* we need capabilities... */ - user_ns =real_mount (path->mnt)->mnt_ns->user_ns; -if (!ns_capable (user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ; type =get_fs_type (fstype);
@@ -2567,7 +2572,7 @@ SYSCALL_DEFINE2(pivot_root, const char _struct mount *new_mnt, *root_mnt;int error; -if (!ns_capable (current->nsproxy->mnt_ns->user_ns,CAP_SYS_ADMIN )) +if (!may_mount ())return -EPERM ; error =user_path_dir (new_root, &new);
Greg Kroah-Hartman
maintainerPATCH 80/150 drm/i915: Preserve the DDI link reversal configuration
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Lespiau <[email protected]>
commit 876a8cdf92b23d268275cdce4397df0c37dac3fe upstream.
Similarly to:
commit 6a0d1df3d3a0d2370541164eb0595fe35dcd6de3
Author: Damien Lespiau <[email protected]>
Date: Tue Dec 11 15:18:28 2012 +0000
drm/i915: Preserve the FDI line reversal override bit on CPT
DDI port support lane reversal to easy the PCB layouting work. Let's preserve the bit configured by the BIOS (until we find how to correctly retrieve the information from the VBT, but this does sound more fragile then just relying on the BIOS that has, hopefully, been validated already.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 19 ++++++++++++++++--- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 18 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4524,6 +4524,7 @@#define DDI_BUF_EMP_800MV_0DB_HSW (7<<24)/* Sel7 */ #define DDI_BUF_EMP_800MV_3_5DB_HSW (8<<24)/* Sel8 */ #define DDI_BUF_EMP_MASK (0xf<<24) +#define DDI_BUF_PORT_REVERSAL (1<<16)#define DDI_BUF_IS_IDLE (1<<7)#define DDI_A_4_LANES (1<<4)#define DDI_PORT_WIDTH_X1 (0<<1)
drivers/gpu/drm/i915/intel_ddi.c +16 -3
@@ -203,7 +203,10 @@ void hsw_fdi_link_train(struct drm_crtcDP_TP_CTL_LINK_TRAIN_PAT1 | DP_TP_CTL_ENABLE); -/* Configure and enable DDI_BUF_CTL for DDI E with next voltage */ +/* Configure and enable DDI_BUF_CTL for DDI E with next voltage. +* DDI E does not support port reversal, the functionality is +* achieved on the PCH side in FDI_RX_CTL, so no need to set the +* port reversal bit */ I915_WRITE(DDI_BUF_CTL(PORT_E), DDI_BUF_CTL_ENABLE | ((intel_crtc->fdi_lanes - 1) << 1) |
@@ -677,8 +680,11 @@ static void intel_ddi_mode_set(struct drif (type ==INTEL_OUTPUT_DISPLAYPORT || type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +struct intel_digital_port *intel_dig_port = +enc_to_dig_port (encoder); - intel_dp->DP =DDI_BUF_CTL_ENABLE |DDI_BUF_EMP_400MV_0DB_HSW ; + intel_dp->DP = intel_dig_port->port_reversal | +DDI_BUF_CTL_ENABLE |DDI_BUF_EMP_400MV_0DB_HSW ;switch (intel_dp->lane_count) {case 1 : intel_dp->DP |=DDI_PORT_WIDTH_X1 ;
@@ -1291,11 +1297,15 @@ static void intel_enable_ddi(struct inteint type = intel_encoder->type;if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_digital_port *intel_dig_port = +enc_to_dig_port (encoder); +/* In HDMI/DVI mode, the port width, and swing/emphasis values * are ignored so nothing special needs to be done besides * enabling the port. */ -I915_WRITE (DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ); +I915_WRITE (DDI_BUF_CTL (port), + intel_dig_port->port_reversal |DDI_BUF_CTL_ENABLE ); }else if (type ==INTEL_OUTPUT_EDP ) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);
@@ -1457,6 +1467,7 @@ static const struct drm_encoder_helper_fvoid intel_ddi_init (struct drm_device *dev,enum port port) { +struct drm_i915_private *dev_priv = dev->dev_private;struct intel_digital_port *intel_dig_port;struct intel_encoder *intel_encoder;struct drm_encoder *encoder;
@@ -1497,6 +1508,8 @@ void intel_ddi_init(struct drm_device *d intel_encoder->get_hw_state = intel_ddi_get_hw_state; intel_dig_port->port = port; + intel_dig_port->port_reversal =I915_READ (DDI_BUF_CTL (port)) & +DDI_BUF_PORT_REVERSAL ;if (hdmi_connector) intel_dig_port->hdmi.sdvox_reg =DDI_BUF_CTL (port);else
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -377,6 +377,7 @@ struct intel_dp {struct intel_digital_port {struct intel_encoder base;enum port port; +u32 port_reversal;struct intel_dp dp;struct intel_hdmi hdmi; };
Greg Kroah-Hartman
maintainerPATCH 81/150 drm/i915: Preserve the FDI line reversal override bit on CPT
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Lespiau <[email protected]>
commit 3e68320ef84528604d971afc3cadfbe208bef001 upstream.
The FDI link has supported link reversal to make the PCB layout engineer's life easier for quite a while and we have always presered this bit as we programmed FDI_RX_CTL with a read/modify/write sequence.
We're trying to take a bit more control over what the BIOS leaves in various register and with the introduction of DDI, started to program FDI_RX_CTL fully.
There's a fused bit to indicate DMI link reversal and FDI defaults to mirroring that configuration. We have a bit to override that behaviour that we need to preserve from the BIOS.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_crt.c | 14 +++++++++----- drivers/gpu/drm/i915/intel_ddi.c | 6 ++---- 4 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -919,7 +919,7 @@ typedef struct drm_i915_private {bool hw_contexts_disabled;uint32_t hw_context_size; -bool fdi_rx_polarity_reversed; +u32 fdi_rx_config;struct i915_suspend_saved_registers regfile;
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -3927,7 +3927,7 @@#define FDI_10BPC (1<<16)#define FDI_6BPC (2<<16)#define FDI_12BPC (3<<16) -#define FDI_LINK_REVERSE_OVERWRITE (1<<15) +#define FDI_RX_LINK_REVERSAL_OVERRIDE (1<<15)#define FDI_DMI_LINK_REVERSE_MASK (1<<14)#define FDI_RX_PLL_ENABLE (1<<13)#define FDI_FS_ERR_CORRECT_ENABLE (1<<11)
drivers/gpu/drm/i915/intel_crt.c +9 -5
@@ -800,10 +800,14 @@ void intel_crt_init(struct drm_device *d dev_priv->hotplug_supported_mask |=CRT_HOTPLUG_INT_STATUS ;/* -* TODO: find a proper way to discover whether we need to set the -* polarity reversal bit or not, instead of relying on the BIOS. +* TODO: find a proper way to discover whether we need to set the the +* polarity and link reversal bits or not, instead of relying on the +* BIOS. */ -if (HAS_PCH_LPT (dev)) - dev_priv->fdi_rx_polarity_reversed = - !!(I915_READ (_FDI_RXA_CTL) &FDI_RX_POLARITY_REVERSED_LPT ); +if (HAS_PCH_LPT (dev)) { +u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT | +FDI_RX_LINK_REVERSAL_OVERRIDE ; + + dev_priv->fdi_rx_config =I915_READ (_FDI_RXA_CTL) & fdi_config; + } }
drivers/gpu/drm/i915/intel_ddi.c +2 -4
@@ -178,10 +178,8 @@ void hsw_fdi_link_train(struct drm_crtc FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);/* Enable the PCH Receiver FDI PLL */ - rx_ctl_val =FDI_RX_PLL_ENABLE |FDI_RX_ENHANCE_FRAME_ENABLE | - ((intel_crtc->fdi_lanes -1 ) <<19 ); -if (dev_priv->fdi_rx_polarity_reversed) - rx_ctl_val |=FDI_RX_POLARITY_REVERSED_LPT ; + rx_ctl_val = dev_priv->fdi_rx_config |FDI_RX_ENHANCE_FRAME_ENABLE | +FDI_RX_PLL_ENABLE | ((intel_crtc->fdi_lanes -1 ) <<19 );I915_WRITE (_FDI_RXA_CTL, rx_ctl_val);POSTING_READ (_FDI_RXA_CTL);udelay (220 );
Greg Kroah-Hartman
maintainerPATCH 82/150 drm/i915: Only run idle processing from i915_gem_retire_requests_worker
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit 725a5b54028916cd2511a251c5b5b13d1715addc upstream.
When adding the fb idle detection to mark-inactive, it was forgotten that userspace can drive the processing of retire-requests. We assumed that it would be principally driven by the retire requests worker, running once every second whilst active and so we would get the deferred timer for free. Instead we spend too many CPU cycles reclocking the LVDS preventing real work from being done.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58843
--- drivers/gpu/drm/i915/i915_gem.c | 3 --- drivers/gpu/drm/i915/intel_display.c | 12 +++--------- drivers/gpu/drm/i915/intel_drv.h | 3 +-- 3 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +0 -3
@@ -1918,9 +1918,6 @@ i915_gem_object_move_to_inactive(structBUG_ON (obj->base.write_domain & ~I915_GEM_GPU_DOMAINS );BUG_ON (!obj->active); -if (obj->pin_count)/* are we a framebuffer? */ -intel_mark_fb_idle (obj); -list_move_tail (&obj->mm_list, &dev_priv->mm.inactive_list);list_del_init (&obj->ring_list);
drivers/gpu/drm/i915/intel_display.c +3 -9
@@ -6993,11 +6993,6 @@ void intel_mark_busy(struct drm_device *void intel_mark_idle (struct drm_device *dev) { -} - -void intel_mark_fb_busy (struct drm_i915_gem_object *obj) -{ -struct drm_device *dev = obj->base.dev;struct drm_crtc *crtc;if (!i915_powersave)
@@ -7007,12 +7002,11 @@ void intel_mark_fb_busy(struct drm_i915_if (!crtc->fb)continue ; -if (to_intel_framebuffer (crtc->fb)->obj == obj) -intel_increase_pllclock (crtc); +intel_decrease_pllclock (crtc); } } -void intel_mark_fb_idle (struct drm_i915_gem_object *obj) +void intel_mark_fb_busy (struct drm_i915_gem_object *obj) {struct drm_device *dev = obj->base.dev;struct drm_crtc *crtc;
@@ -7025,7 +7019,7 @@ void intel_mark_fb_idle(struct drm_i915_continue ;if (to_intel_framebuffer (crtc->fb)->obj == obj) -intel_decrease_pllclock (crtc); +intel_increase_pllclock (crtc); } }
drivers/gpu/drm/i915/intel_drv.h +1 -2
@@ -440,9 +440,8 @@ extern bool intel_sdvo_init(struct drm_dextern void intel_dvo_init (struct drm_device *dev);extern void intel_tv_init (struct drm_device *dev);extern void intel_mark_busy (struct drm_device *dev); -extern void intel_mark_idle (struct drm_device *dev);extern void intel_mark_fb_busy (struct drm_i915_gem_object *obj); -extern void intel_mark_fb_idle (struct drm_i915_gem_object *obj); +extern void intel_mark_idle (struct drm_device *dev);extern bool intel_lvds_init (struct drm_device *dev);extern void intel_dp_init (struct drm_device *dev,int output_reg,enum port port);
Greg Kroah-Hartman
maintainerPATCH 83/150 drm/i915: Fix CAGF for HSW
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Widawsky <[email protected]>
commit f82855d342b6c8483c56e6d2e200a71731509a39 upstream.
The shift changed, hurray.
--- drivers/gpu/drm/i915/i915_debugfs.c | 10 +++++++--- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -3
@@ -888,7 +888,7 @@ static int i915_cur_delayinfo(struct sequ32 gt_perf_status =I915_READ (GEN6_GT_PERF_STATUS );u32 rp_state_limits =I915_READ (GEN6_RP_STATE_LIMITS );u32 rp_state_cap =I915_READ (GEN6_RP_STATE_CAP ); -u32 rpstat; +u32 rpstat, cagf;u32 rpupei, rpcurup, rpprevup;u32 rpdownei, rpcurdown, rpprevdown;int max_freq;
@@ -907,6 +907,11 @@ static int i915_cur_delayinfo(struct seq rpdownei =I915_READ (GEN6_RP_CUR_DOWN_EI ); rpcurdown =I915_READ (GEN6_RP_CUR_DOWN ); rpprevdown =I915_READ (GEN6_RP_PREV_DOWN ); +if (IS_HASWELL (dev)) + cagf = (rpstat &HSW_CAGF_MASK ) >>HSW_CAGF_SHIFT ; +else + cagf = (rpstat &GEN6_CAGF_MASK ) >>GEN6_CAGF_SHIFT ; + cagf *=GT_FREQUENCY_MULTIPLIER ;gen6_gt_force_wake_put (dev_priv);mutex_unlock (&dev->struct_mutex);
@@ -919,8 +924,7 @@ static int i915_cur_delayinfo(struct seq gt_perf_status & 0xff);seq_printf (m,"Render p-state limit: %d\n" , rp_state_limits &0xff ); -seq_printf (m,"CAGF: %dMHz\n" , ((rpstat &GEN6_CAGF_MASK ) >> -GEN6_CAGF_SHIFT ) *GT_FREQUENCY_MULTIPLIER ); +seq_printf (m,"CAGF: %dMHz\n" , cagf);seq_printf (m,"RP CUR UP EI: %dus\n" , rpupei &GEN6_CURICONT_MASK ); seq_printf(m, "RP CUR UP: %dus\n", rpcurup &
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -4211,7 +4211,9 @@#define GEN6_RP_INTERRUPT_LIMITS 0xA014#define GEN6_RPSTAT1 0xA01C#define GEN6_CAGF_SHIFT 8 +#define HSW_CAGF_SHIFT 7#define GEN6_CAGF_MASK (0x7f << GEN6_CAGF_SHIFT) +#define HSW_CAGF_MASK (0x7f << HSW_CAGF_SHIFT)#define GEN6_RP_CONTROL 0xA024#define GEN6_RP_MEDIA_TURBO (1<<11)#define GEN6_RP_MEDIA_MODE_MASK (3<<9)
Greg Kroah-Hartman
maintainerPATCH 84/150 drm/i915: Fix RC6VIDS encode/decode
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ben Widawsky <[email protected]>
commit 7083e05072b88d503d257b6f012ce56367f3ac97 upstream.
The RC6 VIDS has a linear ramp starting at 250mv, which means any values below 250 are invalid. The old buggy macros tried to adjust for this to be more flexible, but there is no need. As Dan pointed out the ENCODE only ever has one value. The only invalid value for decode is an input of 0 which means something is really wonky, and the cases where DECODE are used either don't matter (debug values), or would be implicitly correct (the check for less than 450).
This patch makes simpler, easier to read macros which are actually correct. Maybe this patch can actually fix some bugs now.
Thanks to Dan for catching this. /me hides
--- drivers/gpu/drm/i915/i915_reg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +2 -2
@@ -4282,8 +4282,8 @@#define GEN6_PCODE_READ_MIN_FREQ_TABLE 0x9#define GEN6_PCODE_WRITE_RC6VIDS 0x4#define GEN6_PCODE_READ_RC6VIDS 0x5 -#define GEN6_ENCODE_RC6_VID (mv) (((mv) / 5) - 245) < 0 ?: 0 -#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) > 0 ? ((vids) * 5) + 245 : 0) +#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5) +#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8
Greg Kroah-Hartman
maintainerPATCH 85/150 drm/i915: write backlight harder
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit cf0a6584aa6d382f802f2c3cacac23ccbccde0cd upstream.
770c12312ad617172b1a65b911d3e6564fc5aca8 is the first bad commit commit 770c12312ad617172b1a65b911d3e6564fc5aca8
Author: Takashi Iwai <[email protected]> Date: Sat Aug 11 08:56:42 2012 +0200
drm/i915: Fix blank panel at reopening lid
changed the register write sequence for restoring the backlight, which helped prevent non-working backlights on some machines. Turns out that the original sequence was the right thing to do for a different set of machines. Worse, setting the backlight level _after_ enabling it seems to reset it somehow. So we need to make that one conditional upon the backlight having been reset to zero, and add the old one back.
Cargo-culting at it's best, but it seems to work.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47941
--- drivers/gpu/drm/i915/intel_panel.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +8 -5
@@ -321,6 +321,9 @@ void intel_panel_enable_backlight(structif (dev_priv->backlight_level ==0 ) dev_priv->backlight_level =intel_panel_get_max_backlight (dev); + dev_priv->backlight_enabled = true; +intel_panel_actually_set_backlight (dev, dev_priv->backlight_level); +if (INTEL_INFO (dev)->gen >=4 ) {uint32_t reg, tmp;
@@ -356,12 +359,12 @@ void intel_panel_enable_backlight(struct } set_level: -/* Call below after setting BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1. -* BLC_PWM_CPU_CTL may be cleared to zero automatically when these -* registers are set. +/* Check the current backlight level and try to set again if it's zero. +* On some machines, BLC_PWM_CPU_CTL is cleared to zero automatically +* when BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1 are written. */ - dev_priv->backlight_enabled = true; -intel_panel_actually_set_backlight (dev, dev_priv->backlight_level); +if (!intel_panel_get_backlight (dev)) +intel_panel_actually_set_backlight (dev, dev_priv->backlight_level); }static void intel_panel_init_backlight (struct drm_device *dev)
Greg Kroah-Hartman
maintainerPATCH 86/150 drm/i915: disable shared panel fitter for pipe
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mika Kuoppala <[email protected]>
commit 24a1f16de97c4cf0029d9acd04be06db32208726 upstream.
If encoder is switched off by BIOS, but the panel fitter is left on, we never try to turn off the panel fitter and leave it still attached to the pipe - which can cause blurry output elsewhere.
Based on work by Chris Wilson <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58867
[danvet: Remove the redundant HAS_PCH_SPLIT check and add a tiny comment.]
--- drivers/gpu/drm/i915/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_display.c +8 -0
@@ -3686,6 +3686,7 @@ static void i9xx_crtc_disable(struct drmstruct intel_encoder *encoder;int pipe = intel_crtc->pipe;int plane = intel_crtc->plane; +u32 pctl;if (!intel_crtc->active)
@@ -3705,6 +3706,13 @@ static void i9xx_crtc_disable(struct drmintel_disable_plane (dev_priv, plane, pipe);intel_disable_pipe (dev_priv, pipe); + +/* Disable pannel fitter if it is on this pipe. */ + pctl =I915_READ (PFIT_CONTROL ); +if ((pctl &PFIT_ENABLE ) && + ((pctl &PFIT_PIPE_MASK ) >>PFIT_PIPE_SHIFT ) == pipe) +I915_WRITE (PFIT_CONTROL ,0 ); +intel_disable_pll (dev_priv, pipe); intel_crtc->active = false;
Greg Kroah-Hartman
maintainerPATCH 87/150 drm/i915: Set i9xx sdvo clock limits according to specifications
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Patrik Jakobsson <[email protected]>
commit 4f7dfb6788dd022446847fbbfbe45e13bedb5be2 upstream.
The Intel PRM says the M1 and M2 divisors must be in the range of 10-20 and 5-9. Since we do all calculations based on them being register values (which are subtracted by 2) we need to specify them accordingly.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56359
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -154,8 +154,8 @@ static const intel_limit_t intel_limits_ .vco = { .min = 1400000, .max = 2800000 }, .n = { .min = 1, .max = 6 }, .m = { .min = 70, .max = 120 }, - .m1 = { .min = 10, .max = 22 }, - .m2 = { .min = 5, .max = 9 }, + .m1 = { .min = 8, .max = 18 }, + .m2 = { .min = 3, .max = 7 }, .p = { .min = 5, .max = 80 }, .p1 = { .min = 1, .max = 8 }, .p2 = { .dot_limit = 200000,
Greg Kroah-Hartman
maintainerPATCH 88/150 drm/i915: add missing \n to UTS_RELEASE in the error_state
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jani Nikula <[email protected]>
commit fdfa175d0a9cfa2082ce24e67e284e5acbba452a upstream.
Amending
commit 4518f611ba21ba165ea3714055938a8984a44ff9
Author: Daniel Vetter <[email protected]> Date: Wed Jan 23 16:16:35 2013 +0100
drm/i915: dump UTS_RELEASE into the error_state
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -691,7 +691,7 @@ static int i915_error_state(struct seq_fseq_printf (m,"Time: %ld s %ld us\n" , error->time.tv_sec, error->time.tv_usec); -seq_printf (m,"Kernel: " UTS_RELEASE ); +seq_printf (m,"Kernel: " UTS_RELEASE "\n" );seq_printf (m,"PCI ID: 0x%04x\n" , dev->pci_device);seq_printf (m,"EIR: 0x%08x\n" , error->eir);seq_printf (m,"IER: 0x%08x\n" , error->ier);
Greg Kroah-Hartman
maintainerPATCH 89/150 drm/i915: Use HAS_L3_GPU_CACHE in i915_gem_l3_remap
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit eb32e4584d8e9d6cbec20550d4f91396de2cdb55 upstream.
Yet another remnant ... this might explain why l3 remapping didn't really work on HSW.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57441
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -3845,7 +3845,7 @@ void i915_gem_l3_remap(struct drm_deviceu32 misccpctl;int i; -if (!IS_IVYBRIDGE (dev)) +if (!HAS_L3_GPU_CACHE (dev))return ;if (!dev_priv->l3_parity.remap_info)
Greg Kroah-Hartman
maintainerPATCH 90/150 drm/i915: inverted brightness quirk for Acer Aspire 4736Z
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit ac4199e0f047546aa40172785e26c82b54bbe811 upstream.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=53881
--- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_display.c +3 -0
@@ -8890,6 +8890,9 @@ static struct intel_quirk intel_quirks[]/* Acer Aspire 5734Z must invert backlight brightness */ { 0x2a42, 0x1025, 0x0459, quirk_invert_brightness }, + +/* Acer Aspire 4736Z */ + { 0x2a42, 0x1025, 0x0260, quirk_invert_brightness }, };static void intel_init_quirks (struct drm_device *dev)
Greg Kroah-Hartman
maintainerPATCH 91/150 drm/i915: Handle untiled planes when computing their offsets
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit bc752862170c135d6c09fb22d79eeb451023568e upstream.
We trim the fb to fit the CRTC by computing the offset of that CRTC to its nearest tile_row origin. This allows us to use framebuffers that are larger than the CRTC limits without additional work.
However, we failed to compute the offset for a linear framebuffer correctly as we treated its x-advance in whole tiles (instead of the linear increment expected), leaving the CRTC misaligned with its contents.
Fixes regression from commit c2c75131244507c93f812862fdbd4f3a37139401
Author: Daniel Vetter <[email protected]> Date: Thu Jul 5 12:17:30 2012 +0200
drm/i915: adjust framebuffer base address on gen4+
v2: Adjust relative x-coordinate after linear alignment (vsyrjala)
v3: Repaint with pokadots (vsyrjala)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61152
--- drivers/gpu/drm/i915/intel_display.c | 41 ++++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_drv.h | 7 +++-- drivers/gpu/drm/i915/intel_sprite.c | 8 +++--- 3 files changed, 34 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_display.c +26 -15
@@ -2017,18 +2017,29 @@ void intel_unpin_fb_obj(struct drm_i915_/* Computes the linear offset to the base tile and adjusts x, y. bytes per pixel * is assumed to be a power-of-two. */ -unsigned long intel_gen4_compute_offset_xtiled (int *x,int *y, -unsigned int bpp, -unsigned int pitch) +unsigned long intel_gen4_compute_page_offset (int *x,int *y, +unsigned int tiling_mode, +unsigned int cpp, +unsigned int pitch) { -int tile_rows, tiles; +if (tiling_mode !=I915_TILING_NONE ) { +unsigned int tile_rows, tiles; - tile_rows = *y /8 ; - *y %=8 ; - tiles = *x / (512 /bpp); - *x %=512 /bpp; + tile_rows = *y /8 ; + *y %=8 ; -return tile_rows * pitch *8 + tiles *4096 ; + tiles = *x / (512 /cpp); + *x %=512 /cpp; + +return tile_rows * pitch *8 + tiles *4096 ; + }else { +unsigned int offset; + + offset = *y * pitch + *x * cpp; + *y =0 ; + *x = (offset &4095 ) / cpp; +return offset &-4096 ; + } } static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
@@ -2105,9 +2116,9 @@ static int i9xx_update_plane(struct drm_if (INTEL_INFO (dev)->gen >=4 ) { intel_crtc->dspaddr_offset = -intel_gen4_compute_offset_xtiled (&x, &y, - fb->bits_per_pixel /8 , - fb->pitches[0 ]); +intel_gen4_compute_page_offset (&x, &y, obj->tiling_mode, + fb->bits_per_pixel /8 , + fb->pitches[0 ]); linear_offset -= intel_crtc->dspaddr_offset; }else { intel_crtc->dspaddr_offset = linear_offset;
@@ -2198,9 +2209,9 @@ static int ironlake_update_plane(struct linear_offset = y * fb->pitches[0 ] + x * (fb->bits_per_pixel /8 ); intel_crtc->dspaddr_offset = -intel_gen4_compute_offset_xtiled (&x, &y, - fb->bits_per_pixel /8 , - fb->pitches[0 ]); +intel_gen4_compute_page_offset (&x, &y, obj->tiling_mode, + fb->bits_per_pixel /8 , + fb->pitches[0 ]); linear_offset -= intel_crtc->dspaddr_offset; DRM_DEBUG_KMS("Writing base %08X %08lX %d %d %d\n",
drivers/gpu/drm/i915/intel_drv.h +4 -3
@@ -627,9 +627,10 @@ extern void intel_update_sprite_watermarextern void intel_update_linetime_watermarks (struct drm_device *dev,int pipe,struct drm_display_mode *mode); -extern unsigned long intel_gen4_compute_offset_xtiled (int *x,int *y, -unsigned int bpp, -unsigned int pitch); +extern unsigned long intel_gen4_compute_page_offset (int *x,int *y, +unsigned int tiling_mode, +unsigned int bpp, +unsigned int pitch);extern int intel_sprite_set_colorkey (struct drm_device *dev,void *data,struct drm_file *file_priv);
drivers/gpu/drm/i915/intel_sprite.c +4 -4
@@ -122,8 +122,8 @@ ivb_update_plane(struct drm_plane *plane linear_offset = y * fb->pitches[0 ] + x * pixel_size; sprsurf_offset = -intel_gen4_compute_offset_xtiled (&x, &y, - pixel_size, fb->pitches[0 ]); +intel_gen4_compute_page_offset (&x, &y, obj->tiling_mode, + pixel_size, fb->pitches[0 ]); linear_offset -= sprsurf_offset;/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET
@@ -287,8 +287,8 @@ ilk_update_plane(struct drm_plane *plane linear_offset = y * fb->pitches[0 ] + x * pixel_size; dvssurf_offset = -intel_gen4_compute_offset_xtiled (&x, &y, - pixel_size, fb->pitches[0 ]); +intel_gen4_compute_page_offset (&x, &y, obj->tiling_mode, + pixel_size, fb->pitches[0 ]); linear_offset -= dvssurf_offset;if (obj->tiling_mode !=I915_TILING_NONE )
Greg Kroah-Hartman
maintainerPATCH 92/150 staging: zsmalloc: Fix TLB coherency and build problem
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Minchan Kim <[email protected]>
commit 9915518887e83764269d5b617d01782893877ed3 upstream.
Recently, Matt Sealey reported he fail to build zsmalloc caused by using of local_flush_tlb_kernel_range which are architecture dependent function so !CONFIG_SMP in ARM couldn't implement it so it ends up build error following as.
MODPOST 216 modules
LZMA arch/arm/boot/compressed/piggy.lzma
AS arch/arm/boot/compressed/lib1funcs.o
ERROR: "v7wbi_flush_kern_tlb_range"
[drivers/staging/zsmalloc/zsmalloc.ko] undefined!
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
make: *** Waiting for unfinished jobs....
The reason we used that function is copy method by [1] was really slow in ARM but at that time.
More severe problem is ARM can prefetch speculatively on other CPUs so under us, other TLBs can have an entry only if we do flush local CPU. Russell King pointed that. Thanks!
We don't have many choices except using flush_tlb_kernel_range.
My experiment in ARMv7 processor 4 core didn't make any difference with zsmapbench[2] between local_flush_tlb_kernel_range and flush_tlb_kernel_range but still page-table based is much better than copy-based.
* bigger is better.
1. local_flush_tlb_kernel_range: 3918795 mappings
2. flush_tlb_kernel_range : 3989538 mappings
3. copy-based: 635158 mappings
This patch replace local_flush_tlb_kernel_range with flush_tlb_kernel_range which are avaialbe in all architectures because we already have used it in vmalloc allocator which are generic one so build problem should go away and performane loss shoud be void.
[1] f553646, zsmalloc: add page table mapping method
[2] https://github.com/spartacus06/zsmapbench
--- drivers/staging/zsmalloc/zsmalloc-main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/zsmalloc/zsmalloc-main.c +4 -6
@@ -222,11 +222,9 @@ struct zs_pool {/* * By default, zsmalloc uses a copy-based object mapping method to access * allocations that span two pages. However, if a particular architecture -* 1) Implements local_flush_tlb_kernel_range() and 2) Performs VM mapping -* faster than copying, then it should be added here so that -* USE_PGTABLE_MAPPING is defined. This causes zsmalloc to use page table -* mapping rather than copying -* for object mapping. +* performs VM mapping faster than copying, then it should be added here +* so that USE_PGTABLE_MAPPING is defined. This causes zsmalloc to use +* page table mapping rather than copying for object mapping. */ #if defined(CONFIG_ARM )#define USE_PGTABLE_MAPPING
@@ -663,7 +661,7 @@ static inline void __zs_unmap_object(strflush_cache_vunmap (addr, end);unmap_kernel_range_noflush (addr,PAGE_SIZE *2 ); - local_flush_tlb_kernel_range(addr, end); + flush_tlb_kernel_range(addr, end); }#else /* USE_PGTABLE_MAPPING */
Greg Kroah-Hartman
maintainerPATCH 93/150 staging: comedi: disallow COMEDI_DEVCONFIG on non-board minors
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 754ab5c0e55dd118273ca2c217c4d95e9fbc8259 upstream.
Comedi has two sorts of minor devices:
(a) normal board minor devices in the range 0 to COMEDI_NUM_BOARD_MINORS-1 inclusive; and
(b) special subdevice minor devices in the range COMEDI_NUM_BOARD_MINORS upwards that are used to open the same underlying comedi device as the normal board minor devices, but with non-default read and write subdevices for asynchronous commands.
The special subdevice minor devices get created when a board supporting asynchronous commands is attached to a normal board minor device, and destroyed when the board is detached from the normal board minor device. One way to attach or detach a board is by using the COMEDI_DEVCONFIG ioctl. This should only be used on normal board minors as the special subdevice minors are too ephemeral. In particular, the change introduced in commit 7d3135af399e92cf4c9bbc5f86b6c140aab3b88c ("staging:
comedi: prevent auto-unconfig of manually configured devices") breaks horribly for special subdevice minor devices.
Since there's no legitimate use for the COMEDI_DEVCONFIG ioctl on a special subdevice minor device node, disallow it and return -ENOTTY.
--- drivers/staging/comedi/comedi_fops.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/comedi/comedi_fops.c +5 -0
@@ -1547,6 +1547,11 @@ static long comedi_unlocked_ioctl(struct/* Device config is special, because it must work on * an unconfigured device. */ if (cmd ==COMEDI_DEVCONFIG ) { +if (minor >=COMEDI_NUM_BOARD_MINORS ) { +/* Device config not appropriate on non-board minors. */ + rc = -ENOTTY ; + goto done; + } rc =do_devconfig_ioctl (dev, (struct comedi_devconfig __user *)arg);if (rc ==0 )
Greg Kroah-Hartman
maintainerPATCH 94/150 staging: comedi: ni_labpc: set up command4 register *after* command3
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 22056e2b46246d97ff0f7c6e21a77b8daa07f02c upstream.
Tuomas <tvainikk _at_ gmail _dot_ com> reported problems getting meaningful output from a Lab-PC+ in differential mode for AI cmds, but AI insn reads gave correct readings. He tracked it down to two problems, one of which is addressed by this patch.
It seems that writing to the command3 register after writing to the command4 register in labpc_ai_cmd() messes up the differential reference bit setting in the command4 register. Set up the command4 register after the command3 register (as in labpc_ai_rinsn()) to avoid the problem.
Thanks to Tuomas for suggesting the fix.
--- drivers/staging/comedi/drivers/ni_labpc.c | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/staging/comedi/drivers/ni_labpc.c +16 -15
@@ -1217,21 +1217,6 @@ static int labpc_ai_cmd(struct comedi_de devpriv->write_byte (devpriv->command1_bits, dev->iobase +COMMAND1_REG ); } -/* setup any external triggering/pacing (command4 register) */ - devpriv->command4_bits =0 ; -if (cmd->convert_src !=TRIG_EXT ) - devpriv->command4_bits |=EXT_CONVERT_DISABLE_BIT ; -/* XXX should discard first scan when using interval scanning -* since manual says it is not synced with scan clock */ -if (labpc_use_continuous_mode (cmd, mode) ==0 ) { - devpriv->command4_bits |=INTERVAL_SCAN_EN_BIT ; -if (cmd->scan_begin_src ==TRIG_EXT ) - devpriv->command4_bits |=EXT_SCAN_EN_BIT ; - } -/* single-ended/differential */ -if (aref ==AREF_DIFF ) - devpriv->command4_bits |=ADC_DIFF_BIT ; - devpriv->write_byte (devpriv->command4_bits, dev->iobase +COMMAND4_REG ); devpriv->write_byte (cmd->chanlist_len, dev->iobase +INTERVAL_COUNT_REG );
@@ -1311,6 +1296,22 @@ static int labpc_ai_cmd(struct comedi_de devpriv->command3_bits &= ~ADC_FNE_INTR_EN_BIT ; devpriv->write_byte (devpriv->command3_bits, dev->iobase +COMMAND3_REG ); +/* setup any external triggering/pacing (command4 register) */ + devpriv->command4_bits =0 ; +if (cmd->convert_src !=TRIG_EXT ) + devpriv->command4_bits |=EXT_CONVERT_DISABLE_BIT ; +/* XXX should discard first scan when using interval scanning +* since manual says it is not synced with scan clock */ +if (labpc_use_continuous_mode (cmd, mode) ==0 ) { + devpriv->command4_bits |=INTERVAL_SCAN_EN_BIT ; +if (cmd->scan_begin_src ==TRIG_EXT ) + devpriv->command4_bits |=EXT_SCAN_EN_BIT ; + } +/* single-ended/differential */ +if (aref ==AREF_DIFF ) + devpriv->command4_bits |=ADC_DIFF_BIT ; + devpriv->write_byte (devpriv->command4_bits, dev->iobase +COMMAND4_REG ); +/* startup acquisition */ /* command2 reg */
Greg Kroah-Hartman
maintainerPATCH 95/150 staging: comedi: ni_labpc: correct differential channel sequence for AI commands
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Abbott <[email protected]>
commit 4c4bc25d0fa6beaf054c0b4c3b324487f266c820 upstream.
Tuomas <tvainikk _at_ gmail _dot_ com> reported problems getting meaningful output from a Lab-PC+ in differential mode for AI cmds, but AI insn reads gave correct readings. He tracked it down to two problems, one of which is addressed by this patch.
It seems the setting of the channel bits for particular scanning modes was incorrect for differential mode. (Only half the number of channels are available in differential mode; comedi refers to them as channels 0, 1, 2 and 3, but the hardware documentation refers to them as channels 0, 2, 4 and 6.) In differential mode, the setting of the channel enable bits in the command1 register should depend on whether the scan enable bit is set. Effectively, we need to double the comedi channel number when the scan enable bit is not set in differential mode. The scan enable bit gets set when the AI scan mode is MODE_MULT_CHAN_UP or MODE_MULT_CHAN_DOWN, and gets cleared when the AI scan mode is MODE_SINGLE_CHAN or MODE_SINGLE_CHAN_INTERVAL. The existing test for whether the comedi channel number needs to be doubled in differential mode is incorrect in labpc_ai_cmd(). This patch corrects the test.
Thanks to Tuomas for suggesting the fix.
--- drivers/staging/comedi/drivers/ni_labpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_labpc.c +2 -1
@@ -1202,7 +1202,8 @@ static int labpc_ai_cmd(struct comedi_deelse channel =CR_CHAN (cmd->chanlist[0 ]);/* munge channel bits for differential / scan disabled mode */ -if (mode !=MODE_SINGLE_CHAN && aref ==AREF_DIFF ) +if ((mode ==MODE_SINGLE_CHAN || mode ==MODE_SINGLE_CHAN_INTERVAL ) && + aref ==AREF_DIFF ) channel *=2 ; devpriv->command1_bits |=ADC_CHAN_BITS (channel); devpriv->command1_bits |= thisboard->ai_range_code[range];
Greg Kroah-Hartman
maintainerPATCH 96/150 staging: vt6656: revert : 64 bit- Correctly address void structure.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit d61ac98a4bd86b3217f0c6e058bd0b3a3282899b upstream.
The patch is wrong and is partially reverted.
The NULL check of pTransmitKey->pvKeyTable is kept.
The problem was ultimately fixed by upstream commit. 1ee4c55fc9620451b2a825d793042a7e0775391b
staging: vt6656: Fix inconsistent structure packing
--- drivers/staging/vt6656/rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6656/rxtx.c +1 -1
@@ -1454,7 +1454,7 @@ s_bPacketToWirelessUsb( pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd =NULL ;if (bNeedEncryption && pTransmitKey->pvKeyTable) { -if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE) +if (((PSKeyTable )pTransmitKey->pvKeyTable)->bSoftWEP == TRUE) bSoftWEP = TRUE;/* WEP 256 */ }
Greg Kroah-Hartman
maintainerPATCH 97/150 staging: vt6656: Revert: 64bit fixes: dpc.c incorrect addressing of void structure.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit 392c6ff87f568d573239b763855160d1f06114de upstream.
The patch was totally wrong and is reverted.
The problem was ultimately fixed by upstream commit. 1ee4c55fc9620451b2a825d793042a7e0775391b
staging: vt6656: Fix inconsistent structure packing
--- drivers/staging/vt6656/dpc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vt6656/dpc.c +2 -2
@@ -1190,7 +1190,7 @@ static BOOL s_bHandleRxEncryption (if (byDecMode ==KEY_CTL_WEP ) {// handle WEP if ((pDevice->byLocalID <=REV_ID_VT3253_A1 ) || - (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE)) { + (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE)) {// Software WEP // 1. 3253A // 2. WEP 256
@@ -1299,7 +1299,7 @@ static BOOL s_bHostWepRxEncryption (// handle WEP DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "byDecMode == KEY_CTL_WEP\n" );if ((pDevice->byLocalID <=REV_ID_VT3253_A1 ) || - (((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE) || + (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) || (bOnFly == FALSE)) {// Software WEP // 1. 3253A
Greg Kroah-Hartman
maintainerPATCH 98/150 staging: vt6656: Fix URB submitted while active warning.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Malcolm Priestley <[email protected]>
commit ae5943de8c8c4438cbac5cda599ff0b88c224468 upstream.
This error happens because PIPEnsControlOut and PIPEnsControlIn unlock the spin lock for delay, letting in another thread.
The patch moves the current MP_SET_FLAG to before filling of sUsbCtlRequest for pControlURB and clears it in event of failing.
Any thread calling either function while fMP_CONTROL_READS or fMP_CONTROL_WRITES flags set will return STATUS_FAILURE.
--- drivers/staging/vt6656/usbpipe.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/staging/vt6656/usbpipe.c +20 -8
@@ -165,6 +165,11 @@ int PIPEnsControlOut(if (pDevice->Flags & fMP_CONTROL_WRITES)return STATUS_FAILURE ; +if (pDevice->Flags & fMP_CONTROL_READS) +return STATUS_FAILURE ; + +MP_SET_FLAG (pDevice, fMP_CONTROL_WRITES); + pDevice->sUsbCtlRequest.bRequestType =0x40 ; pDevice->sUsbCtlRequest.bRequest = byRequest; pDevice->sUsbCtlRequest.wValue =cpu_to_le16p (&wValue);
@@ -179,12 +184,13 @@ int PIPEnsControlOut( ntStatus =usb_submit_urb (pDevice->pControlURB,GFP_ATOMIC );if (ntStatus !=0 ) { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "control send request submission failed: %d\n" , ntStatus); +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO +"control send request submission failed: %d\n" , + ntStatus); +MP_CLEAR_FLAG (pDevice, fMP_CONTROL_WRITES);return STATUS_FAILURE ; } -else { -MP_SET_FLAG (pDevice, fMP_CONTROL_WRITES); - } +spin_unlock_irq (&pDevice->lock);for (ii =0 ; ii <=USB_CTL_WAIT ; ii ++) {
@@ -224,6 +230,11 @@ int PIPEnsControlIn(if (pDevice->Flags & fMP_CONTROL_READS)return STATUS_FAILURE ; +if (pDevice->Flags & fMP_CONTROL_WRITES) +return STATUS_FAILURE ; + +MP_SET_FLAG (pDevice, fMP_CONTROL_READS); + pDevice->sUsbCtlRequest.bRequestType =0xC0 ; pDevice->sUsbCtlRequest.bRequest = byRequest; pDevice->sUsbCtlRequest.wValue =cpu_to_le16p (&wValue);
@@ -237,10 +248,11 @@ int PIPEnsControlIn( ntStatus =usb_submit_urb (pDevice->pControlURB,GFP_ATOMIC );if (ntStatus !=0 ) { -DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "control request submission failed: %d\n" , ntStatus); - }else { -MP_SET_FLAG (pDevice, fMP_CONTROL_READS); - } +DBG_PRT (MSG_LEVEL_DEBUG ,KERN_INFO +"control request submission failed: %d\n" , ntStatus); +MP_CLEAR_FLAG (pDevice, fMP_CONTROL_READS); +return STATUS_FAILURE ; + }spin_unlock_irq (&pDevice->lock);for (ii =0 ; ii <=USB_CTL_WAIT ; ii ++) {
Greg Kroah-Hartman
maintainerPATCH 99/150 ASoC: wm2200: correct IN2L and IN3L digital mute
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Rattray <[email protected]>
commit 0d2b6422529a26ac4dee06196524ba9da70cf735 upstream.
--- sound/soc/codecs/wm2200.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm2200.c +2 -2
@@ -1126,9 +1126,9 @@ SOC_DOUBLE_R_TLV("IN3 Volume", WM2200_INSOC_DOUBLE_R ("IN1 Digital Switch" ,WM2200_ADC_DIGITAL_VOLUME_1L ,WM2200_ADC_DIGITAL_VOLUME_1R ,WM2200_IN1L_MUTE_SHIFT ,1 ,1 ), -SOC_DOUBLE_R ("IN2 Digital Switch" ,WM2200_ADC_DIGITAL_VOLUME_1L , +SOC_DOUBLE_R ("IN2 Digital Switch" ,WM2200_ADC_DIGITAL_VOLUME_2L ,WM2200_ADC_DIGITAL_VOLUME_2R ,WM2200_IN2L_MUTE_SHIFT ,1 ,1 ), -SOC_DOUBLE_R ("IN3 Digital Switch" ,WM2200_ADC_DIGITAL_VOLUME_1L , +SOC_DOUBLE_R ("IN3 Digital Switch" ,WM2200_ADC_DIGITAL_VOLUME_3L ,WM2200_ADC_DIGITAL_VOLUME_3R ,WM2200_IN3L_MUTE_SHIFT ,1 ,1 ), SOC_DOUBLE_R_TLV("IN1 Digital Volume", WM2200_ADC_DIGITAL_VOLUME_1L,
Greg Kroah-Hartman
maintainerPATCH 100/150 ASoC: arizona: Fixed a bug in FLL fractional calculation
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryo Tsutsui <[email protected]>
commit 01f58153aefc158fd690b337d29ad140e963959d upstream.
Previously arizona_calc_fll() was checking if the target frequency is exactly divisible by reference frequency, but should have been product of the ratio and the reference frequency.
Also scale down the Lamba and Theta coefficients be under 16-bits in order to match the registers.
--- sound/soc/codecs/arizona.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
sound/soc/codecs/arizona.c +10 -1
@@ -910,7 +910,7 @@ static int arizona_calc_fll(struct arizo cfg->n = target / (ratio * Fref); -if (target % Fref) { +if (target % (ratio * Fref)) { gcd_fll =gcd (target, ratio * Fref);arizona_fll_dbg (fll,"GCD=%u\n" , gcd_fll);
@@ -922,6 +922,15 @@ static int arizona_calc_fll(struct arizo cfg->lambda =0 ; } +/* Round down to 16bit range with cost of accuracy lost. +* Denominator must be bigger than numerator so we only +* take care of it. +*/ +while (cfg->lambda >= (1 <<16 )) { + cfg->theta >>=1 ; + cfg->lambda >>=1 ; + } +arizona_fll_dbg (fll,"N=%x THETA=%x LAMBDA=%x\n" , cfg->n, cfg->theta, cfg->lambda); arizona_fll_dbg(fll, "FRATIO=%x(%d) OUTDIV=%x REFCLK_DIV=%x\n",
Greg Kroah-Hartman
maintainerPATCH 101/150 ARM: 7635/1: versatile: fix the PCI IRQ regression
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Walleij <[email protected]>
commit e3e92a7be6936dff1de80e66b0b683d54e9e02d8 upstream.
The PCI IRQs were regressing due to two things:
- The PCI glue layer was using an hard-coded IRQ 27 offset. This caused the immediate regression.
- The SIC IRQ mask was inverted (i.e. a bit was indeed set to one for each valid IRQ on the SIC, but accidentally inverted in the init call). This has been around forever, but we have been saved by some other forgiving code that would reserve IRQ descriptors in this range, as the versatile is non-sparse.
When the IRQs were bumped up 32 steps so as to avoid using IRQ zero and avoid touching the 16 legacy IRQs, things broke.
Introduce an explicit valid mask for the IRQs that are active on the PIC/SIC, and pass that. Use the BIT() macro from <linux/bitops.h> to make sure we hit the right bits, readily defined in <mach/platform.h>.
--- arch/arm/mach-versatile/core.c | 15 ++++++++++++++- arch/arm/mach-versatile/pci.c | 11 ++++++----- 2 files changed, 20 insertions(+), 6 deletions(-)
arch/arm/mach-versatile/core.c +14 -1
@@ -36,6 +36,7 @@#include <linux/gfp.h> #include <linux/clkdev.h> #include <linux/mtd/physmap.h> +#include <linux/bitops.h> #include <asm/irq.h> #include <asm/hardware/arm_timer.h>
@@ -65,16 +66,28 @@#define VA_VIC_BASE __io_address(VERSATILE_VIC_BASE)#define VA_SIC_BASE __io_address(VERSATILE_SIC_BASE) +/* These PIC IRQs are valid in each configuration */ +#define PIC_VALID_ALL BIT(SIC_INT_KMI0) | BIT(SIC_INT_KMI1) | \ + BIT(SIC_INT_SCI3) | BIT(SIC_INT_UART3) | \ + BIT(SIC_INT_CLCD) | BIT(SIC_INT_TOUCH) | \ + BIT(SIC_INT_KEYPAD) | BIT(SIC_INT_DoC) | \ + BIT(SIC_INT_USB) | BIT(SIC_INT_PCI0) | \ + BIT(SIC_INT_PCI1) | BIT(SIC_INT_PCI2) | \ + BIT(SIC_INT_PCI3)#if 1 #define IRQ_MMCI0A IRQ_VICSOURCE22#define IRQ_AACI IRQ_VICSOURCE24#define IRQ_ETH IRQ_VICSOURCE25#define PIC_MASK 0xFFD00000 +#define PIC_VALID PIC_VALID_ALL#else #define IRQ_MMCI0A IRQ_SIC_MMCI0A#define IRQ_AACI IRQ_SIC_AACI#define IRQ_ETH IRQ_SIC_ETH#define PIC_MASK 0 +#define PIC_VALID PIC_VALID_ALL | BIT(SIC_INT_MMCI0A) | \ + BIT(SIC_INT_MMCI1A) | BIT(SIC_INT_AACI) | \ + BIT(SIC_INT_ETH)#endif /* Lookup table for finding a DT node that represents the vic instance */
@@ -102,7 +115,7 @@ void __init versatile_init_irq(void) VERSATILE_SIC_BASE);fpga_irq_init (VA_SIC_BASE ,"SIC" ,IRQ_SIC_START , -IRQ_VICSOURCE31 , ~PIC_MASK , np); +IRQ_VICSOURCE31 ,PIC_VALID , np);/* * Interrupts on secondary controller from 0 to 8 are routed to
arch/arm/mach-versatile/pci.c +6 -5
@@ -23,6 +23,7 @@#include <linux/io.h> #include <mach/hardware.h> +#include <mach/irqs.h> #include <asm/irq.h> #include <asm/mach/pci.h>
@@ -327,12 +328,12 @@ static int __init versatile_map_irq(consint irq;/* slot, pin, irq -* 24 1 27 -* 25 1 28 -* 26 1 29 -* 27 1 30 +* 24 1 IRQ_SIC_PCI0 +* 25 1 IRQ_SIC_PCI1 +* 26 1 IRQ_SIC_PCI2 +* 27 1 IRQ_SIC_PCI3 */ - irq =27 + ((slot -24 + pin -1 ) &3 ); + irq =IRQ_SIC_PCI0 + ((slot -24 + pin -1 ) &3 );return irq; }
Greg Kroah-Hartman
maintainerPATCH 102/150 ARM: PXA3xx: program the CSMSADRCFG register
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Igor Grinberg <[email protected]>
commit d107a204154ddd79339203c2deeb7433f0cf6777 upstream.
The Chip Select Configuration Register must be programmed to 0x2 in order to achieve the correct behavior of the Static Memory Controller.
Without this patch devices wired to DFI and accessed through SMC cannot be accessed after resume from S2.
Do not rely on the boot loader to program the CSMSADRCFG register by programming it in the kernel smemc module.
--- arch/arm/mach-pxa/include/mach/smemc.h | 1 + arch/arm/mach-pxa/smemc.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
arch/arm/mach-pxa/include/mach/smemc.h +1 -0
@@ -37,6 +37,7 @@#define CSADRCFG1 (SMEMC_VIRT + 0x84)/* Address Configuration Register for CS1 */ #define CSADRCFG2 (SMEMC_VIRT + 0x88)/* Address Configuration Register for CS2 */ #define CSADRCFG3 (SMEMC_VIRT + 0x8C)/* Address Configuration Register for CS3 */ +#define CSMSADRCFG (SMEMC_VIRT + 0xA0)/* Chip Select Configuration Register */ /* * More handy macros for PCMCIA
arch/arm/mach-pxa/smemc.c +14 -1
@@ -40,6 +40,8 @@ static void pxa3xx_smemc_resume(void)__raw_writel (csadrcfg[1 ],CSADRCFG1 );__raw_writel (csadrcfg[2 ],CSADRCFG2 );__raw_writel (csadrcfg[3 ],CSADRCFG3 ); +/* CSMSADRCFG wakes up in its default state (0), so we need to set it */ +__raw_writel (0x2 ,CSMSADRCFG ); }static struct syscore_ops smemc_syscore_ops = {
@@ -49,8 +51,19 @@ static struct syscore_ops smemc_syscore_static int __init smemc_init (void ) { -if (cpu_is_pxa3xx ()) +if (cpu_is_pxa3xx ()) { +/* +* The only documentation we have on the +* Chip Select Configuration Register (CSMSADRCFG) is that +* it must be programmed to 0x2. +* Moreover, in the bit definitions, the second bit +* (CSMSADRCFG[1]) is called "SETALWAYS". +* Other bits are reserved in this register. +*/ +__raw_writel (0x2 ,CSMSADRCFG ); +register_syscore_ops (&smemc_syscore_ops); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 103/150 ARM: at91/DT: remove atmel,use-dma-* from 9x5 and 9n12 USART nodes
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolas Ferre <[email protected]>
commit c3f0f282d950a1e87496a2633ed9e924e275ff8c upstream.
Fix the use of USART on both at91sam9x5 and at91sam9n12. In DTS, the atmel,use-dma-[rx|tx] property is present but a DMA channel cannot be used. Indeed the connexion between the DMA engine and the slave is not implemented yet in Device Tree.
Note however that this property is also used for PDC (private DMA) on older SoCs. This is why the driver alone cannot determine the validity of this property.
--- arch/arm/boot/dts/at91sam9n12.dtsi | 8 -------- arch/arm/boot/dts/at91sam9x5.dtsi | 6 ------ 2 files changed, 14 deletions(-)
arch/arm/boot/dts/at91sam9n12.dtsi +0 -8
@@ -324,8 +324,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf801c000 0x4000>; interrupts = <5 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart0>; status = "disabled";
@@ -335,8 +333,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf8020000 0x4000>; interrupts = <6 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart1>; status = "disabled";
@@ -346,8 +342,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf8024000 0x4000>; interrupts = <7 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart2>; status = "disabled";
@@ -357,8 +351,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf8028000 0x4000>; interrupts = <8 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart3>; status = "disabled";
arch/arm/boot/dts/at91sam9x5.dtsi +0 -6
@@ -402,8 +402,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf801c000 0x200>; interrupts = <5 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart0>; status = "disabled";
@@ -413,8 +411,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf8020000 0x200>; interrupts = <6 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart1>; status = "disabled";
@@ -424,8 +420,6 @@ compatible = "atmel,at91sam9260-usart"; reg = <0xf8024000 0x200>; interrupts = <7 4 5>; - atmel,use-dma-rx; - atmel,use-dma-tx; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usart2>; status = "disabled";
Greg Kroah-Hartman
maintainerPATCH 104/150 ARM: samsung: fix assembly syntax for new gas
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit 2815774bb38445006074e16251b9ef5123bdc616 upstream.
Recent assembler versions complain about extraneous whitespace inside [] brackets. This fixes all of these instances for the samsung platforms. We should backport this to all kernels that might need to be built with new binutils.
arch/arm/kernel/entry-armv.S: Assembler messages:arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r2,[ r6,#(0x10)]'arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x14)]'arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r2,[ r6,#(0x10)]'arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x14)]'arch/arm/mach-s3c24xx/sleep-s3c2410.S: Assembler messages:arch/arm/mach-s3c24xx/sleep-s3c2410.S:48: Error: ARM register expected -- `ldr r7,[ r4 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:49: Error: ARM register expected -- `ldr r8,[ r5 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:50: Error: ARM register expected -- `ldr r9,[ r6 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:64: Error: ARM register expected -- `streq r7,[ r4 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:65: Error: ARM register expected -- `streq r8,[ r5 ]'arch/arm/mach-s3c24xx/sleep-s3c2410.S:66: Error: ARM register expected -- `streq r9,[ r6 ]'arch/arm/kernel/debug.S: Assembler messages:arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r2,#((0x0B0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-((0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))]' arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r2,#((0x0B0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-((0)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))]' arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/mach-s3c24xx/pm-h1940.S: Assembler messages:arch/arm/mach-s3c24xx/pm-h1940.S:33: Error: ARM register expected -- `ldr pc,[ r0,#((0x0B8)+(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000))))-(((0x56000000)-(0x50000000))+(0xF6000000+(0x01000000)))]' arch/arm/mach-s3c24xx/sleep-s3c2412.S: Assembler messages:arch/arm/mach-s3c24xx/sleep-s3c2412.S:60: Error: ARM register expected -- `ldrne r9,[ r1 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:61: Error: ARM register expected -- `strne r9,[ r1 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:62: Error: ARM register expected -- `ldrne r9,[ r2 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:63: Error: ARM register expected -- `strne r9,[ r2 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:64: Error: ARM register expected -- `ldrne r9,[ r3 ]'arch/arm/mach-s3c24xx/sleep-s3c2412.S:65: Error: ARM register expected -- `strne r9,[ r3 ]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x08)]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:83: Error: ARM register expected -- `ldr r2,[ r3,#(0x10)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x08)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x18)]'arch/arm/kernel/debug.S:85: Error: ARM register expected -- `ldr r2,[ r3,#(0x10)]'
--- arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 12 ++++++------ arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 4 ++-- arch/arm/mach-s3c24xx/pm-h1940.S | 2 +- arch/arm/mach-s3c24xx/sleep-s3c2410.S | 12 ++++++------ arch/arm/mach-s3c24xx/sleep-s3c2412.S | 12 ++++++------ arch/arm/plat-samsung/include/plat/debug-macro.S | 18 +++++++++--------- 6 files changed, 30 insertions(+), 30 deletions(-)
arch/arm/mach-s3c24xx/include/mach/debug-macro.S +6 -6
@@ -40,17 +40,17 @@ addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) bic \rd, \rd, #0xff000 - ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] + ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)] and \rd, \rd, #0x00ff0000 teq \rd, #0x00440000 @ is it 2440? 1004: - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] moveq \rd, \rd, lsr #SHIFT_2440TXF tst \rd, #S3C2410_UFSTAT_TXFULL .endm .macro fifo_full_s3c2410 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S3C2410_UFSTAT_TXFULL .endm
@@ -68,18 +68,18 @@ addeq \rd, \rx, #(S3C24XX_PA_GPIO - S3C24XX_PA_UART) addne \rd, \rx, #(S3C24XX_VA_GPIO - S3C24XX_VA_UART) bic \rd, \rd, #0xff000 - ldr \rd, [ \rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0) ] + ldr \rd, [\rd, # S3C2410_GSTATUS1 - S3C2410_GPIOREG(0)] and \rd, \rd, #0x00ff0000 teq \rd, #0x00440000 @ is it 2440? 10000: - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] andne \rd, \rd, #S3C2410_UFSTAT_TXMASK andeq \rd, \rd, #S3C2440_UFSTAT_TXMASK .endm .macro fifo_level_s3c2410 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S3C2410_UFSTAT_TXMASK .endm
arch/arm/mach-s3c24xx/include/mach/entry-macro.S +2 -2
@@ -31,10 +31,10 @@ @@ try the interrupt offset register, since it is there - ldr \irqstat, [ \base, #INTPND ] + ldr \irqstat, [\base, #INTPND ] teq \irqstat, #0 beq 1002f - ldr \irqnr, [ \base, #INTOFFSET ] + ldr \irqnr, [\base, #INTOFFSET ] mov \tmp, #1 tst \irqstat, \tmp, lsl \irqnr bne 1001f
arch/arm/mach-s3c24xx/pm-h1940.S +1 -1
@@ -30,4 +30,4 @@ h1940_pm_return: mov r0, #S3C2410_PA_GPIO - ldr pc, [ r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO ] + ldr pc, [r0, #S3C2410_GSTATUS3 - S3C24XX_VA_GPIO]
arch/arm/mach-s3c24xx/sleep-s3c2410.S +6 -6
@@ -45,9 +45,9 @@ ENTRY(s3c2410_cpu_suspend) ldr r4, =S3C2410_REFRESH ldr r5, =S3C24XX_MISCCR ldr r6, =S3C2410_CLKCON - ldr r7, [ r4 ] @ get REFRESH (and ensure in TLB) - ldr r8, [ r5 ] @ get MISCCR (and ensure in TLB) - ldr r9, [ r6 ] @ get CLKCON (and ensure in TLB) + ldr r7, [r4] @ get REFRESH (and ensure in TLB) + ldr r8, [r5] @ get MISCCR (and ensure in TLB) + ldr r9, [r6] @ get CLKCON (and ensure in TLB) orr r7, r7, #S3C2410_REFRESH_SELF @ SDRAM sleep command orr r8, r8, #S3C2410_MISCCR_SDSLEEP @ SDRAM power-down signals
@@ -61,8 +61,8 @@ ENTRY(s3c2410_cpu_suspend) @@ align next bit of code to cache line .align 5 s3c2410_do_sleep: - streq r7, [ r4 ] @ SDRAM sleep command - streq r8, [ r5 ] @ SDRAM power-down config - streq r9, [ r6 ] @ CPU sleep + streq r7, [r4] @ SDRAM sleep command + streq r8, [r5] @ SDRAM power-down config + streq r9, [r6] @ CPU sleep 1: beq 1b mov pc, r14
arch/arm/mach-s3c24xx/sleep-s3c2412.S +6 -6
@@ -57,12 +57,12 @@ s3c2412_sleep_enter1: * retry, as simply returning causes the system to lock. */ - ldrne r9, [ r1 ] - strne r9, [ r1 ] - ldrne r9, [ r2 ] - strne r9, [ r2 ] - ldrne r9, [ r3 ] - strne r9, [ r3 ] + ldrne r9, [r1] + strne r9, [r1] + ldrne r9, [r2] + strne r9, [r2] + ldrne r9, [r3] + strne r9, [r3] bne s3c2412_sleep_enter1 mov pc, r14
arch/arm/plat-samsung/include/plat/debug-macro.S +9 -9
@@ -14,12 +14,12 @@ /* The S5PV210/S5PC110 implementations are as belows. */ .macro fifo_level_s5pv210 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S5PV210_UFSTAT_TXMASK .endm .macro fifo_full_s5pv210 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S5PV210_UFSTAT_TXFULL .endm
@@ -27,7 +27,7 @@ * most widely re-used */ .macro fifo_level_s3c2440 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] and \rd, \rd, #S3C2440_UFSTAT_TXMASK .endm
@@ -36,7 +36,7 @@ #endif .macro fifo_full_s3c2440 rd, rx - ldr \rd, [ \rx, # S3C2410_UFSTAT ] + ldr \rd, [\rx, # S3C2410_UFSTAT] tst \rd, #S3C2440_UFSTAT_TXFULL .endm
@@ -45,11 +45,11 @@ #endif .macro senduart,rd,rx - strb \rd, [\rx, # S3C2410_UTXH ] + strb \rd, [\rx, # S3C2410_UTXH] .endm .macro busyuart, rd, rx - ldr \rd, [ \rx, # S3C2410_UFCON ] + ldr \rd, [\rx, # S3C2410_UFCON] tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled...
@@ -60,7 +60,7 @@ 1001: @ busy waiting for non fifo - ldr \rd, [ \rx, # S3C2410_UTRSTAT ] + ldr \rd, [\rx, # S3C2410_UTRSTAT] tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b
@@ -68,7 +68,7 @@ .endm .macro waituart,rd,rx - ldr \rd, [ \rx, # S3C2410_UFCON ] + ldr \rd, [\rx, # S3C2410_UFCON] tst \rd, #S3C2410_UFCON_FIFOMODE @ fifo enabled? beq 1001f @ @ FIFO enabled...
@@ -79,7 +79,7 @@ b 1002f 1001: @ idle waiting for non fifo - ldr \rd, [ \rx, # S3C2410_UTRSTAT ] + ldr \rd, [\rx, # S3C2410_UTRSTAT] tst \rd, #S3C2410_UTRSTAT_TXFE beq 1001b
Greg Kroah-Hartman
maintainerPATCH 105/150 ARM: i.MX25: clk: parent per5_clk to AHB clock
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Trumtrar <[email protected]>
commit 4b526ca5f627188425184a22ed46c91baa602d43 upstream.
The mxc-timer on the imx25 needs to be derived from the AHB clock. If a bootloader reparents this clock to the ipg_clk_highfreq, which according to the datasheet is a valid operation, the system can/will produce lockups/ freezes after some time [1].
This can be forced with code like
while(1)
syscall(SYS_clock_gettime, CLOCK_REALTIME, &tp);This was already fixed with the commit
"i.MX25 GPT clock fix: ensure correct the clock source" [2],
for 3.1-rc2, but was lost, when i.MX was converted to the common clock framework ("ARM i.MX25: implement clocks using common clock framework") [3]
[1]: http://lists.arm.linux.org.uk/lurker/message/20130129.161230.229bda17.en.html
[2]: 2012d9ca2a1381ae3e733330a7f0d1d2f1988bba
[3]: 6bbaec5676e4f475b0d78743cbd4c70a8804ce14
--- arch/arm/mach-imx/clk-imx25.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-imx/clk-imx25.c +3 -0
@@ -224,6 +224,9 @@ static int __init __mx25_clocks_init(unsclk_prepare_enable (clk[emi_ahb]); +/* Clock source for gpt must be derived from AHB */ +clk_set_parent (clk[per5_sel], clk[ahb]); +clk_register_clkdev (clk[ipg],"ipg" ,"imx-gpt.0" );clk_register_clkdev (clk[gpt_ipg_per],"per" ,"imx-gpt.0" );
Greg Kroah-Hartman
maintainerPATCH 106/150 ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit ab2a724a2ef9cee5957692257a5d1f08fd7acbbd upstream.
When running on Integrator/AP using atags, ap_syscon_base is initialised in ->map_io, which isn't called for !MMU platforms.
Instead, initialise the pointer in ->machine_init, as we do when booting with device-tree.
--- arch/arm/mach-integrator/integrator_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-integrator/integrator_ap.c +1 -1
@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[]static void __init ap_map_io_atag (void ) {iotable_init (ap_io_desc_atag,ARRAY_SIZE (ap_io_desc_atag)); - ap_syscon_base =__io_address (INTEGRATOR_SC_BASE );ap_map_io (); }
@@ -685,6 +684,7 @@ static void __init ap_init(void)platform_device_register (&cfi_flash_device); + ap_syscon_base =__io_address (INTEGRATOR_SC_BASE ); sc_dec =readl (ap_syscon_base +INTEGRATOR_SC_DEC_OFFSET );for (i =0 ; i <4 ; i++) {struct lm_device *lmdev;
Greg Kroah-Hartman
maintainerPATCH 107/150 arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit c0e01d5d8f15c085236df184e5bc3d79a8b700cd upstream.
struct compat_ucontext * is a 64-bit pointer, so we need to use a compat_uptr_t instead to avoid declaring a structure incompatible with what AArch32 userspace expects.
--- arch/arm64/kernel/signal32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/signal32.c +2 -2
@@ -76,7 +76,7 @@ struct compat_sigcontext {struct compat_ucontext {compat_ulong_t uc_flags; -struct compat_ucontext *uc_link; +compat_uptr_t uc_link;compat_stack_t uc_stack;struct compat_sigcontext uc_mcontext;compat_sigset_t uc_sigmask;
@@ -703,7 +703,7 @@ int compat_setup_rt_frame(int usig, stru err |=copy_siginfo_to_user32 (&frame->info, info);__put_user_error (0 , &frame->sig.uc.uc_flags, err); -__put_user_error (NULL , &frame->sig.uc.uc_link, err); +__put_user_error (0 , &frame->sig.uc.uc_link, err);memset (&stack,0 ,sizeof (stack)); stack.ss_sp = (compat_uptr_t )current->sas_ss_sp;
Greg Kroah-Hartman
maintainerPATCH 108/150 ARM: 7643/1: sched: correct update_sched_clock()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joonsoo Kim <[email protected]>
commit 7c4e9ced424be4d36df6a3e3825763e97ee97607 upstream.
If we want load epoch_cyc and epoch_ns atomically, we should update epoch_cyc_copy first of all. This notify reader that updating is in progress.
If we update epoch_cyc first like as current implementation, there is subtle error case.
Look at the below example.
<Initial Condition>
cyc = 9
ns = 900cyc_copy = 9
== CASE 1 ==
<CPU A = reader> <CPU B = updater>
write cyc = 10
read cyc = 10
read ns = 900
write ns = 1000
write cyc_copy = 10
read cyc_copy = 10
output = (10, 900)
== CASE 2 ==
<CPU A = reader> <CPU B = updater>
read cyc = 9
write cyc = 10
write ns = 1000
read ns = 1000
read cyc_copy = 9
write cyc_copy = 10
output = (9, 1000)
If atomic read is ensured, output should be (9, 900) or (10, 1000). But, output in example case are not.
So, change updating sequence in order to correct this problem.
--- arch/arm/kernel/sched_clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/sched_clock.c +2 -2
@@ -93,11 +93,11 @@ static void notrace update_sched_clock(v* detectable in cyc_to_fixed_sched_clock(). */ raw_local_irq_save (flags); - cd.epoch_cyc = cyc; + cd.epoch_cyc_copy = cyc;smp_wmb (); cd.epoch_ns = ns;smp_wmb (); - cd.epoch_cyc_copy = cyc; + cd.epoch_cyc = cyc;raw_local_irq_restore (flags); }
Greg Kroah-Hartman
maintainerPATCH 109/150 powerpc/kexec: Disable hard IRQ before kexec
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Phileas Fogg <[email protected]>
commit 8520e443aa56cc157b015205ea53e7b9fc831291 upstream.
Disable hard IRQ before kexec a new kernel image.
Not doing it can result in corrupted data in the memory segments reserved for the new kernel.
--- arch/powerpc/kernel/machine_kexec_64.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/powerpc/kernel/machine_kexec_64.c +5 -0
@@ -162,6 +162,8 @@ static int kexec_all_irq_disabled = 0;static void kexec_smp_down (void *arg) {local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure our irqs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;while (kexec_all_irq_disabled ==0 )
@@ -244,6 +246,8 @@ static void kexec_prepare_cpus(void)wake_offline_cpus ();smp_call_function (kexec_smp_down,NULL ,/* wait */ 0 );local_irq_disable (); +hard_irq_disable (); +mb ();/* make sure IRQs are disabled before we say they are */ get_paca ()->kexec_state =KEXEC_STATE_IRQS_OFF ;
@@ -281,6 +285,7 @@ static void kexec_prepare_cpus(void)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,0 );local_irq_disable (); + hard_irq_disable(); }#endif /* SMP */
Greg Kroah-Hartman
maintainerPATCH 110/150 uprobes/powerpc: Add dependency on single step emulation
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Suzuki K. Poulose" <[email protected]>
commit 5e249d4528528c9a77da051a89ec7f99d31b83eb upstream.
Uprobes uses emulate_step in sstep.c, but we haven't explicitly specified the dependency. On pseries HAVE_HW_BREAKPOINT protects us, but 44x has no such luxury.
Consolidate other users that depend on sstep and create a new config option.
--- arch/powerpc/Kconfig | 4 ++++ arch/powerpc/lib/Makefile | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)
arch/powerpc/Kconfig +4 -0
@@ -275,6 +275,10 @@ config PPC_ADV_DEBUG_DAC_RANGE depends on PPC_ADV_DEBUG_REGS && 44x default y +config PPC_EMULATE_SSTEP + bool + default y if KPROBES || UPROBES || XMON || HAVE_HW_BREAKPOINT + source "init/Kconfig" source "kernel/Kconfig.freezer"
arch/powerpc/lib/Makefile +1 -3
@@ -19,9 +19,7 @@ obj-$(CONFIG_PPC64) += copypage_64.o cop checksum_wrappers_64.o hweight_64.o \ copyuser_power7.o string_64.o copypage_power7.o \ memcpy_power7.o -obj-$(CONFIG_XMON) += sstep.o ldstfp.o -obj-$(CONFIG_KPROBES) += sstep.o ldstfp.o -obj-$(CONFIG_HAVE_HW_BREAKPOINT) += sstep.o ldstfp.o +obj-$(CONFIG_PPC_EMULATE_SSTEP) += sstep.o ldstfp.o ifeq ($(CONFIG_PPC64),y) obj-$(CONFIG_SMP) += locks.o
Greg Kroah-Hartman
maintainerPATCH 111/150 powerpc/eeh: Fix crash when adding a device in a slot with DDW
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit 6a040ce72598159a74969a2d01ab0ba5ee6536b3 upstream.
The DDW code uses a eeh_dev struct from the pci_dev. However, this is not set until eeh_add_device_late is called.
Since pci_bus_add_devices is called before eeh_add_device_late, the PCI devices are added to the bus, making drivers' probe hooks to be called. These will call set_dma_mask, which will call the DDW code, which will require the eeh_dev struct from pci_dev. This would result in a crash, due to a NULL dereference.
Calling eeh_add_device_late after pci_bus_add_devices would make the system BUG, because device files shouldn't be added to devices there were not added to the system. So, a new function is needed to add such files only after pci_bus_add_devices have been called.
--- arch/powerpc/include/asm/eeh.h | 3 +++ arch/powerpc/kernel/of_platform.c | 3 +++ arch/powerpc/kernel/pci-common.c | 7 +++++-- arch/powerpc/platforms/pseries/eeh.c | 24 +++++++++++++++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/eeh.h +3 -0
@@ -201,6 +201,7 @@ int eeh_dev_check_failure(struct eeh_devvoid __init eeh_addr_cache_build (void );void eeh_add_device_tree_early (struct device_node *);void eeh_add_device_tree_late (struct pci_bus *); +void eeh_add_sysfs_files (struct pci_bus *);void eeh_remove_bus_device (struct pci_dev *,int );/**
@@ -240,6 +241,8 @@ static inline void eeh_add_device_tree_estatic inline void eeh_add_device_tree_late (struct pci_bus *bus) { } +static inline void eeh_add_sysfs_files (struct pci_bus *bus) { } +static inline void eeh_remove_bus_device (struct pci_dev *dev,int purge_pe) { }static inline void eeh_lock (void ) { }
arch/powerpc/kernel/of_platform.c +3 -0
@@ -95,6 +95,9 @@ static int of_pci_phb_probe(struct platf/* Add probed PCI devices to the device model */ pci_bus_add_devices (phb->bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (phb->bus); +return 0 ; }
arch/powerpc/kernel/pci-common.c +5 -2
@@ -1477,11 +1477,14 @@ void pcibios_finish_adding_to_bus(structpcibios_allocate_bus_resources (bus);pcibios_claim_one_bus (bus); +/* Fixup EEH */ +eeh_add_device_tree_late (bus); +/* Add new devices to global lists. Register in proc, sysfs. */ pci_bus_add_devices (bus); -/* Fixup EEH */ -eeh_add_device_tree_late (bus); +/* sysfs files should only be added after devices are added */ +eeh_add_sysfs_files (bus); }EXPORT_SYMBOL_GPL (pcibios_finish_adding_to_bus);
arch/powerpc/platforms/pseries/eeh.c +23 -1
@@ -788,7 +788,6 @@ static void eeh_add_device_late(struct p dev->dev.archdata.edev = edev;eeh_addr_cache_insert_dev (dev); -eeh_sysfs_add_device (dev); }/**
@@ -815,6 +814,29 @@ void eeh_add_device_tree_late(struct pciEXPORT_SYMBOL_GPL (eeh_add_device_tree_late);/** +* eeh_add_sysfs_files - Add EEH sysfs files for the indicated PCI bus +* @bus: PCI bus +* +* This routine must be used to add EEH sysfs files for PCI +* devices which are attached to the indicated PCI bus. The PCI bus +* is added after system boot through hotplug or dlpar. +*/ +void eeh_add_sysfs_files (struct pci_bus *bus) +{ +struct pci_dev *dev; + +list_for_each_entry (dev, &bus->devices, bus_list) { +eeh_sysfs_add_device (dev); +if (dev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) { +struct pci_bus *subbus = dev->subordinate; +if (subbus) +eeh_add_sysfs_files (subbus); + } + } +} +EXPORT_SYMBOL_GPL (eeh_add_sysfs_files); + +/** * eeh_remove_device - Undo EEH setup for the indicated pci device * @dev: pci device to be removed * @purge_pe: remove the PE or not
Greg Kroah-Hartman
maintainerPATCH 112/150 Purge existing TLB entries in set_pte_at and ptep_set_wrprotect
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: John David Anglin <[email protected]>
commit 7139bc1579901b53db7e898789e916ee2fb52d78 upstream.
This patch goes a long way toward fixing the minifail bug, and it significantly improves the stability of SMP machines such as the rp3440. When write protecting a page for COW, we need to purge the existing translation. Otherwise, the COW break doesn't occur as expected because the TLB may still have a stale entry which allows writes.
--- arch/parisc/include/asm/pgtable.h | 13 ++++++++++--- arch/parisc/kernel/cache.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-)
arch/parisc/include/asm/pgtable.h +10 -3
@@ -12,11 +12,10 @@#include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/mm_types.h> #include <asm/processor.h> #include <asm/cache.h> -struct vm_area_struct ; -/* * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel * memory. For the return value to be meaningful, ADDR must be >=
@@ -40,7 +39,14 @@ struct vm_area_struct;do { \ *(pteptr) = (pteval); \ } while(0) -#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval) + +extern void purge_tlb_entries (struct mm_struct *,unsigned long ); + +#define set_pte_at (mm, addr, ptep, pteval) \ + do { \ + set_pte(ptep, pteval); \ + purge_tlb_entries(mm, addr); \ + } while (0)#endif /* !__ASSEMBLY__ */
@@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(st old =pte_val (*ptep); new = pte_val(pte_wrprotect(__pte (old))); }while (cmpxchg ((unsigned long *) ptep, old, new) != old); +purge_tlb_entries (mm, addr);#else pte_t old_pte = *ptep;set_pte_at (mm, addr, ptep,pte_wrprotect (old_pte));
arch/parisc/kernel/cache.c +18 -0
@@ -419,6 +419,24 @@ void kunmap_parisc(void *addr)EXPORT_SYMBOL (kunmap_parisc);#endif +void purge_tlb_entries (struct mm_struct *mm,unsigned long addr) +{ +unsigned long flags; + +/* Note: purge_tlb_entries can be called at startup with +no context. */ + +/* Disable preemption while we play with %sr1. */ +preempt_disable (); +mtsp (mm->context,1 ); +purge_tlb_start (flags); +pdtlb (addr); +pitlb (addr); +purge_tlb_end (flags); +preempt_enable (); +} +EXPORT_SYMBOL (purge_tlb_entries); +void __flush_tlb_range (unsigned long sid,unsigned long start,unsigned long end) {
Greg Kroah-Hartman
maintainerPATCH 113/150 pcmcia/vrc4171: Add missing spinlock init
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit 811af9723859884f2f771f3174f3ddedab7c53b5 upstream.
It doesn't seem this spinlock was properly initialized. This bug was introduced by commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc.
--- drivers/pcmcia/vrc4171_card.c | 1 + 1 file changed, 1 insertion(+)
drivers/pcmcia/vrc4171_card.c +1 -0
@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_soc socket = &vrc4171_sockets[slot]; socket->csc_irq =search_nonuse_irq (); socket->io_irq =search_nonuse_irq (); +spin_lock_init (&socket->lock);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 114/150 drivers/video: fsl-diu-fb: fix pixel formats for 24 and 16 bpp
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anatolij Gustschin <[email protected]>
commit 5d3cc311a76073f6e0a27c0752f7e41f69e95ea7 upstream.
Framebuffer colors for 24 and 16 bpp are currently wrong. The order of the color component arguments in the MAKE_PF() is not natural and causes some confusion. The generated pixel format values for 24 and 16 bpp depths do not much the values in the comments.
Fix the macro arguments to be in the natural RGB order and adjust the arguments for all depths to generate correct pixel format values (equal to the values mentioned in the comments).
--- drivers/video/fsl-diu-fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/fsl-diu-fb.c +3 -3
@@ -944,7 +944,7 @@ static u32 fsl_diu_get_pixel_format(unsi#define PF_COMP_0_MASK 0x0000000F#define PF_COMP_0_SHIFT 0 -#define MAKE_PF (alpha, red, blue, green, size, c0, c1, c2, c3) \ +#define MAKE_PF (alpha, red, green, blue, size, c0, c1, c2, c3) \ cpu_to_le32(PF_BYTE_F | (alpha << PF_ALPHA_C_SHIFT) | \ (blue << PF_BLUE_C_SHIFT) | (green << PF_GREEN_C_SHIFT) | \ (red << PF_RED_C_SHIFT) | (c3 << PF_COMP_3_SHIFT) | \
@@ -954,10 +954,10 @@ static u32 fsl_diu_get_pixel_format(unsiswitch (bits_per_pixel) {case 32 :/* 0x88883316 */ -return MAKE_PF (3 ,2 ,0 ,1 ,3 ,8 ,8 ,8 ,8 ); +return MAKE_PF (3 ,2 ,1 ,0 ,3 ,8 ,8 ,8 ,8 );case 24 :/* 0x88082219 */ -return MAKE_PF (4 ,0 ,1 ,2 ,2 ,0 ,8 ,8 ,8 ); +return MAKE_PF (4 ,0 ,1 ,2 ,2 ,8 ,8 ,8 ,0 );case 16 :/* 0x65053118 */ return MAKE_PF (4 ,2 ,1 ,0 ,1 ,5 ,6 ,5 ,0 );
Greg Kroah-Hartman
maintainerPATCH 115/150 drivers/video: fsl-diu-fb: fix bugs in interrupt handling
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anatolij Gustschin <[email protected]>
commit b2639b5f1d01f218dc95537a1c352b3a551c4dd5 upstream.
Since commit f74de500 "drivers/video: fsl-diu-fb: streamline enabling of interrupts" the interrupt handling in the driver is broken. Enabling diu interrupt causes an interrupt storm and results in system lockup.
The cookie for the interrupt handler function passed to request_irq() is wrong (it must be a pointer to the diu struct, and not the address of the pointer to the diu struct). As a result the interrupt handler can not read diu registers and acknowledge the interrupt. Fix cookie arguments for request_irq() and free_irq().
Registering the diu interrupt handler in probe() must happen before install_fb() calls since this function registers framebuffer devices and if fbcon tries to take over framebuffer after registering a frame buffer device, it will call fb_open of the diu driver and enable the interrupts. At this time the diu interrupt handler must be registered already.
Disabling the interrupts in fsl_diu_release() must happen only if all other AOIs are closed. Otherwise closing an overlay plane will disable the interrupts even if the primary frame buffer plane is opened. Add an appropriate check in the release function.
--- drivers/video/fsl-diu-fb.c | 58 +++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 25 deletions(-)
drivers/video/fsl-diu-fb.c +33 -25
@@ -1232,6 +1232,16 @@ static int fsl_diu_ioctl(struct fb_inforeturn 0 ; } +static inline void fsl_diu_enable_interrupts (struct fsl_diu_data *data) +{ +u32 int_mask =INT_UNDRUN ;/* enable underrun detection */ + +if (IS_ENABLED (CONFIG_NOT_COHERENT_CACHE )) + int_mask |=INT_VSYNC ;/* enable vertical sync */ + +clrbits32 (&data->diu_reg->int_mask, int_mask); +} +/* turn on fb if count == 1 */ static int fsl_diu_open (struct fb_info *info,int user)
@@ -1251,19 +1261,7 @@ static int fsl_diu_open(struct fb_info *if (res <0 ) mfbi->count--;else { -struct fsl_diu_data *data = mfbi->parent; - -#ifdef CONFIG_NOT_COHERENT_CACHE -/* -* Enable underrun detection and vertical sync -* interrupts. -*/ -clrbits32 (&data->diu_reg->int_mask, -INT_UNDRUN |INT_VSYNC ); -#else -/* Enable underrun detection */ -clrbits32 (&data->diu_reg->int_mask,INT_UNDRUN ); -#endif +fsl_diu_enable_interrupts (mfbi->parent);fsl_diu_enable_panel (info); } }
@@ -1283,9 +1281,18 @@ static int fsl_diu_release(struct fb_inf mfbi->count--;if (mfbi->count ==0 ) {struct fsl_diu_data *data = mfbi->parent; +bool disable = true; +int i; + +/* Disable interrupts only if all AOIs are closed */ +for (i =0 ; i <NUM_AOIS ; i++) { +struct mfb_info *mi = data->fsl_diu_info[i].par; -/* Disable interrupts */ -out_be32 (&data->diu_reg->int_mask,0xffffffff ); +if (mi->count) + disable = false; + } +if (disable) +out_be32 (&data->diu_reg->int_mask,0xffffffff );fsl_diu_disable_panel (info); }
@@ -1614,14 +1621,6 @@ static int fsl_diu_probe(struct platformout_be32 (&data->diu_reg->desc[1 ], data->dummy_ad.paddr);out_be32 (&data->diu_reg->desc[2 ], data->dummy_ad.paddr); -for (i =0 ; i <NUM_AOIS ; i++) { - ret =install_fb (&data->fsl_diu_info[i]); -if (ret) { -dev_err (&pdev->dev,"could not register fb %d\n" , i); - goto error; - } - } -/* * Older versions of U-Boot leave interrupts enabled, so disable * all of them and clear the status register.
@@ -1630,12 +1629,21 @@ static int fsl_diu_probe(struct platformin_be32 (&data->diu_reg->int_status); ret =request_irq (data->irq, fsl_diu_isr,0 ,"fsl-diu-fb" , - &data->diu_reg); + data->diu_reg);if (ret) {dev_err (&pdev->dev,"could not claim irq\n" ); goto error; } +for (i =0 ; i <NUM_AOIS ; i++) { + ret =install_fb (&data->fsl_diu_info[i]); +if (ret) { +dev_err (&pdev->dev,"could not register fb %d\n" , i); +free_irq (data->irq, data->diu_reg); + goto error; + } + } +sysfs_attr_init (&data->dev_attr.attr); data->dev_attr.attr.name ="monitor" ; data->dev_attr.attr.mode =S_IRUGO |S_IWUSR ;
@@ -1667,7 +1675,7 @@ static int fsl_diu_remove(struct platfor data =dev_get_drvdata (&pdev->dev);disable_lcdc (&data->fsl_diu_info[0 ]); -free_irq (data->irq, &data->diu_reg); +free_irq (data->irq, data->diu_reg);for (i =0 ; i <NUM_AOIS ; i++)uninstall_fb (&data->fsl_diu_info[i]);
Greg Kroah-Hartman
maintainerPATCH 116/150 fbcon: dont lose the console font across generic->chip driver switch
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Airlie <[email protected]>
commit ae1287865f5361fa138d4d3b1b6277908b54eac9 upstream.
If grub2 loads efifb/vesafb, then when systemd starts it can set the console font on that framebuffer device, however when we then load the native KMS driver, the first thing it does is tear down the generic framebuffer driver.
The thing is the generic code is doing the right thing, it frees the font because otherwise it would leak memory. However we can assume that if you are removing the generic firmware driver (vesa/efi/offb), that a new driver *should* be loading soon after, so we effectively leak the font.
However the old code left a dangling pointer in vc->vc_font.data and we can now reuse that dangling pointer to load the font into the new driver, now that we aren't freeing it.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=892340
--- drivers/video/console/fbcon.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/video/console/fbcon.c +10 -4
@@ -990,7 +990,7 @@ static const char *fbcon_startup(void) }/* Setup default font */ -if (!p->fontdata) { +if (!p->fontdata && !vc->vc_font.data) {if (!fontname[0 ] || !(font =find_font (fontname))) font = get_default_font(info->var.xres, info->var.yres,
@@ -1000,6 +1000,8 @@ static const char *fbcon_startup(void) vc->vc_font.height = font->height; vc->vc_font.data = (void *)(p->fontdata = font->data); vc->vc_font.charcount =256 ;/* FIXME Need to support more fonts */ + }else { + p->fontdata = vc->vc_font.data; } cols =FBCON_SWAP (ops->rotate, info->var.xres, info->var.yres);
@@ -1159,9 +1161,9 @@ static void fbcon_init(struct vc_data *v ops->p = &fb_display[fg_console]; } -static void fbcon_free_font (struct display *p) +static void fbcon_free_font (struct display *p,bool freefont) { -if (p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 )) +if (freefont && p->userfont && p->fontdata && (--REFCOUNT (p->fontdata) ==0 ))kfree (p->fontdata -FONT_EXTRA_WORDS *sizeof (int )); p->fontdata =NULL ; p->userfont =0 ;
@@ -1173,8 +1175,8 @@ static void fbcon_deinit(struct vc_datastruct fb_info *info;struct fbcon_ops *ops;int idx; +bool free_font = true; -fbcon_free_font (p); idx = con2fb_map[vc->vc_num];if (idx ==-1 )
@@ -1185,6 +1187,8 @@ static void fbcon_deinit(struct vc_dataif (!info) goto finished; +if (info->flags &FBINFO_MISC_FIRMWARE ) + free_font = false; ops = info->fbcon_par;if (!ops)
@@ -1196,6 +1200,8 @@ static void fbcon_deinit(struct vc_data ops->flags &= ~FBCON_FLAGS_INIT ; finished: +fbcon_free_font (p, free_font); +if (!con_is_bound (&fb_con))fbcon_exit ();
Greg Kroah-Hartman
maintainerPATCH 117/150 fb: rework locking to fix lock ordering on takeover
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alan Cox <[email protected]>
commit 50e244cc793d511b86adea24972f3a7264cae114 upstream.
Adjust the console layer to allow a take over call where the caller already holds the locks. Make the fb layer lock in order.
This is partly a band aid, the fb layer is terminally confused about the locking rules it uses for its notifiers it seems.
--- drivers/tty/vt/vt.c | 93 +++++++++++++++++++++++++++++++----------- drivers/video/console/fbcon.c | 29 ++++++++++++- drivers/video/fbmem.c | 5 -- drivers/video/fbsysfs.c | 3 + include/linux/console.h | 1 5 files changed, 104 insertions(+), 27 deletions(-)
drivers/tty/vt/vt.c +70 -23
@@ -2987,7 +2987,7 @@ int __init vty_init(const struct file_opstatic struct class *vtconsole_class; -static int bind_con_driver (const struct consw *csw,int first,int last, +static int do_bind_con_driver (const struct consw *csw,int first,int last,int deflt) {struct module *owner = csw->owner;
@@ -2998,7 +2998,7 @@ static int bind_con_driver(const structif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3083,11 +3083,22 @@ static int bind_con_driver(const struct retval =0 ; err: -console_unlock ();module_put (owner);return retval; }; + +static int bind_con_driver (const struct consw *csw,int first,int last, +int deflt) +{ +int ret; + +console_lock (); + ret =do_bind_con_driver (csw, first, last, deflt); +console_unlock (); +return ret; +} +#ifdef CONFIG_VT_HW_CONSOLE_BINDING static int con_is_graphics (const struct consw *csw,int first,int last) {
@@ -3199,9 +3210,9 @@ int unbind_con_driver(const struct conswif (!con_is_bound (csw)) con_driver->flag &= ~CON_DRIVER_FLAG_INIT ; -console_unlock ();/* ignore return value, binding should not fail */ -bind_con_driver (defcsw, first, last, deflt); +do_bind_con_driver (defcsw, first, last, deflt); +console_unlock (); err:module_put (owner);return retval;
@@ -3492,28 +3503,18 @@ int con_debug_leave(void) }EXPORT_SYMBOL_GPL (con_debug_leave); -/** -* register_con_driver - register console driver to console layer -* @csw: console driver -* @first: the first console to take over, minimum value is 0 -* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 -* -* DESCRIPTION: This function registers a console driver which can later -* bind to a range of consoles specified by @first and @last. It will -* also initialize the console driver by calling con_startup(). -*/ -int register_con_driver (const struct consw *csw,int first,int last) +static int do_register_con_driver (const struct consw *csw,int first,int last) {struct module *owner = csw->owner;struct con_driver *con_driver;const char *desc;int i, retval =0 ; +WARN_CONSOLE_UNLOCKED (); +if (!try_module_get (owner))return -ENODEV ; -console_lock (); -for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) { con_driver = ®istered_con_driver[i];
@@ -3566,10 +3567,29 @@ int register_con_driver(const struct con } err: -console_unlock ();module_put (owner);return retval; } + +/** +* register_con_driver - register console driver to console layer +* @csw: console driver +* @first: the first console to take over, minimum value is 0 +* @last: the last console to take over, maximum value is MAX_NR_CONSOLES -1 +* +* DESCRIPTION: This function registers a console driver which can later +* bind to a range of consoles specified by @first and @last. It will +* also initialize the console driver by calling con_startup(). +*/ +int register_con_driver (const struct consw *csw,int first,int last) +{ +int retval; + +console_lock (); + retval =do_register_con_driver (csw, first, last); +console_unlock (); +return retval; +}EXPORT_SYMBOL (register_con_driver);/**
@@ -3623,17 +3643,44 @@ EXPORT_SYMBOL(unregister_con_driver);* when a driver wants to take over some existing consoles * and become default driver for newly opened ones. * -* take_over_console is basically a register followed by unbind +* take_over_console is basically a register followed by unbind +*/ +int do_take_over_console (const struct consw *csw,int first,int last,int deflt) +{ +int err; + + err =do_register_con_driver (csw, first, last); +/* +* If we get an busy error we still want to bind the console driver +* and return success, as we may have unbound the console driver +* but not unregistered it. +*/ +if (err == -EBUSY ) + err =0 ; +if (!err) +do_bind_con_driver (csw, first, last, deflt); + +return err; +} +EXPORT_SYMBOL_GPL (do_take_over_console); + +/* +* If we support more console drivers, this function is used +* when a driver wants to take over some existing consoles +* and become default driver for newly opened ones. +* +* take_over_console is basically a register followed by unbind */ int take_over_console (const struct consw *csw,int first,int last,int deflt) {int err; err =register_con_driver (csw, first, last); -/* if we get an busy error we still want to bind the console driver +/* +* If we get an busy error we still want to bind the console driver * and return success, as we may have unbound the console driver -* but not unregistered it. -*/ +* but not unregistered it. +*/ if (err == -EBUSY ) err =0 ;if (!err)
drivers/video/console/fbcon.c +28 -1
@@ -529,6 +529,33 @@ static int search_for_mapped_con(void)return retval; } +static int do_fbcon_takeover (int show_logo) +{ +int err, i; + +if (!num_registered_fb) +return -ENODEV ; + +if (!show_logo) + logo_shown =FBCON_LOGO_DONTSHOW ; + +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] = info_idx; + + err =do_take_over_console (&fb_con, first_fb_vc, last_fb_vc, + fbcon_is_default); + +if (err) { +for (i = first_fb_vc; i <= last_fb_vc; i++) + con2fb_map[i] =-1 ; + info_idx =-1 ; + }else { + fbcon_has_console_bind =1 ; + } + +return err; +} +static int fbcon_takeover (int show_logo) {int err, i;
@@ -3121,7 +3148,7 @@ static int fbcon_fb_registered(struct fb }if (info_idx !=-1 ) - ret =fbcon_takeover (1 ); + ret =do_fbcon_takeover (1 ); }else {for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map_boot[i] == idx)
drivers/video/fbmem.c +2 -3
@@ -1650,7 +1650,9 @@ static int do_register_framebuffer(struc event.info = fb_info;if (!lock_fb_info (fb_info))return -ENODEV ; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_REGISTERED , &event); +console_unlock ();unlock_fb_info (fb_info);return 0 ; }
@@ -1853,11 +1855,8 @@ int fb_new_modelist(struct fb_info *info err =1 ;if (!list_empty (&info->modelist)) { -if (!lock_fb_info (info)) -return -ENODEV ; event.info = info; err =fb_notifier_call_chain (FB_EVENT_NEW_MODELIST , &event); -unlock_fb_info (info); }return err;
drivers/video/fbsysfs.c +3 -0
@@ -177,6 +177,8 @@ static ssize_t store_modes(struct deviceif (i *sizeof (struct fb_videomode ) != count)return -EINVAL ; +if (!lock_fb_info (fb_info)) +return -ENODEV ;console_lock ();list_splice (&fb_info->modelist, &old_list); fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
@@ -188,6 +190,7 @@ static ssize_t store_modes(struct devicefb_destroy_modelist (&old_list);console_unlock (); +unlock_fb_info (fb_info);return 0 ; }
include/linux/console.h +1 -0
@@ -78,6 +78,7 @@ int con_is_bound(const struct consw *cswint register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt); +int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);#ifdef CONFIG_HW_CONSOLE int con_debug_enter (struct vc_data *vc);
Greg Kroah-Hartman
maintainerPATCH 118/150 fb: Yet another band-aid for fixing lockdep mess
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit e93a9a868792ad71cdd09d75e5a02d8067473c4e upstream.
I've still got lockdep warnings even after Alan's patch, and it seems that yet more band aids are required to paper over similar paths for unbind_con_driver() and unregister_con_driver(). After this hack, lockdep warnings are finally gone.
--- drivers/tty/vt/vt.c | 43 +++++++++++++++++++++++++++--------------- drivers/video/console/fbcon.c | 4 +-- drivers/video/fbmem.c | 4 +++ include/linux/console.h | 1 include/linux/vt_kern.h | 2 + 5 files changed, 37 insertions(+), 17 deletions(-)
drivers/tty/vt/vt.c +28 -15
@@ -3135,6 +3135,18 @@ static int con_is_graphics(const struct*/ int unbind_con_driver (const struct consw *csw,int first,int last,int deflt) { +int retval; + +console_lock (); + retval =do_unbind_con_driver (csw, first, last, deflt); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unbind_con_driver); + +/* unlocked version of unbind_con_driver() */ +int do_unbind_con_driver (const struct consw *csw,int first,int last,int deflt) +{struct module *owner = csw->owner;const struct consw *defcsw =NULL ;struct con_driver *con_driver =NULL , *con_back =NULL ;
@@ -3143,7 +3155,7 @@ int unbind_con_driver(const struct conswif (!try_module_get (owner))return -ENODEV ; -console_lock (); +WARN_CONSOLE_UNLOCKED ();/* check if driver is registered and if it is unbindable */ for (i =0 ; i <MAX_NR_CON_DRIVER ; i++) {
@@ -3156,10 +3168,8 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } retval = -ENODEV ;
@@ -3175,15 +3185,11 @@ int unbind_con_driver(const struct consw } } -if (retval) { -console_unlock (); +if (retval) goto err; - } -if (!con_is_bound (csw)) { -console_unlock (); +if (!con_is_bound (csw)) goto err; - } first =max (first, con_driver->first); last =min (last, con_driver->last);
@@ -3212,13 +3218,12 @@ int unbind_con_driver(const struct consw/* ignore return value, binding should not fail */ do_bind_con_driver (defcsw, first, last, deflt); -console_unlock (); err:module_put (owner);return retval; } -EXPORT_SYMBOL (unbind_con_driver); +EXPORT_SYMBOL_GPL (do_unbind_con_driver);static int vt_bind (struct con_driver *con) {
@@ -3605,9 +3610,18 @@ EXPORT_SYMBOL(register_con_driver);*/ int unregister_con_driver (const struct consw *csw) { -int i, retval = -ENODEV ; +int retval;console_lock (); + retval =do_unregister_con_driver (csw); +console_unlock (); +return retval; +} +EXPORT_SYMBOL (unregister_con_driver); + +int do_unregister_con_driver (const struct consw *csw) +{ +int i, retval = -ENODEV ;/* cannot unregister a bound driver */ if (con_is_bound (csw))
@@ -3633,10 +3647,9 @@ int unregister_con_driver(const struct c } } err: -console_unlock ();return retval; } -EXPORT_SYMBOL (unregister_con_driver); +EXPORT_SYMBOL_GPL (do_unregister_con_driver);/* * If we support more console drivers, this function is used
drivers/video/console/fbcon.c +2 -2
@@ -3010,7 +3010,7 @@ static int fbcon_unbind(void) {int ret; - ret =unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, + ret =do_unbind_con_driver (&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default);if (!ret)
@@ -3083,7 +3083,7 @@ static int fbcon_fb_unregistered(struct primary_device =-1 ;if (!num_registered_fb) -unregister_con_driver (&fb_con); +do_unregister_con_driver (&fb_con);return 0 ; }
drivers/video/fbmem.c +4 -0
@@ -1668,8 +1668,10 @@ static int do_unregister_framebuffer(strif (!lock_fb_info (fb_info))return -ENODEV ; +console_lock (); event.info = fb_info; ret =fb_notifier_call_chain (FB_EVENT_FB_UNBIND , &event); +console_unlock ();unlock_fb_info (fb_info);if (ret)
@@ -1684,7 +1686,9 @@ static int do_unregister_framebuffer(str num_registered_fb--;fb_cleanup_device (fb_info); event.info = fb_info; +console_lock ();fb_notifier_call_chain (FB_EVENT_FB_UNREGISTERED , &event); +console_unlock ();/* this may free fb info */ put_fb_info (fb_info);
include/linux/console.h +1 -0
@@ -77,6 +77,7 @@ extern const struct consw prom_con; /* Sint con_is_bound (const struct consw *csw);int register_con_driver (const struct consw *csw,int first,int last);int unregister_con_driver (const struct consw *csw); +int do_unregister_con_driver (const struct consw *csw);int take_over_console (const struct consw *sw,int first,int last,int deflt);int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw);
include/linux/vt_kern.h +2 -0
@@ -131,6 +131,8 @@ void vt_event_post(unsigned int event, uint vt_waitactive (int n);void change_console (struct vc_data *new_vc);void reset_vc (struct vc_data *vc); +extern int do_unbind_con_driver (const struct consw *csw,int first,int last, +int deflt);extern int unbind_con_driver (const struct consw *csw,int first,int last,int deflt);int vty_init (const struct file_operations *console_fops);
Greg Kroah-Hartman
maintainerPATCH 119/150 mmc: sdhci-esdhc-imx: fix host version read
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shawn Guo <[email protected]>
commit ef4d0888bb7e1b963880f086575081c3d39cad2d upstream.
When commit 95a2482 (mmc: sdhci-esdhc-imx: add basic imx6q usdhc support) works around host version issue on imx6q, it gets the register address fixup "reg ^= 2" lost for imx25/35/51/53 esdhc. Thus, the controller version on these SoCs is wrongly identified as v1 while it's actually v2.
Add the address fixup back and take a different approach to correct imx6q host version, so that the host version read gets back to work for all SoCs.
--- drivers/mmc/host/sdhci-esdhc-imx.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/mmc/host/sdhci-esdhc-imx.c +11 -8
@@ -237,15 +237,18 @@ static void esdhc_writel_le(struct sdhcistatic u16 esdhc_readw_le (struct sdhci_host *host,int reg) { +struct sdhci_pltfm_host *pltfm_host =sdhci_priv (host); +struct pltfm_imx_data *imx_data = pltfm_host->priv; +if (unlikely (reg ==SDHCI_HOST_VERSION )) { -u16 val =readw (host->ioaddr + (reg ^2 )); -/* -* uSDHC supports SDHCI v3.0, but it's encoded as value -* 0x3 in host controller version register, which violates -* SDHCI_SPEC_300 definition. Work it around here. -*/ -if ((val &SDHCI_SPEC_VER_MASK ) ==3 ) -return --val; + reg ^=2 ; +if (is_imx6q_usdhc (imx_data)) { +/* +* The usdhc register returns a wrong host version. +* Correct it here. +*/ +return SDHCI_SPEC_300 ; + } }return readw (host->ioaddr + reg);
Greg Kroah-Hartman
maintainerPATCH 120/150 mmc: core: expose RPMB partition only for CMD23 capable hosts
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Balaji T K <[email protected]>
commit d0123ccac55088811bde4f76c4a3fdbd39c3cfba upstream.
SET_BLOCK_COUNT CMD23 is needed for all access to RPMB partition. If block count is not set by CMD23, all subsequent read/write commands fail as per eMMC specification. So, If the host does not support CMD23, do not expose RPMB partition.
Accessing RPMB partition can cause hang / huge delay for hosts which do not support CMD23.
--- drivers/mmc/core/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/mmc.c +1 -1
@@ -496,7 +496,7 @@ static int mmc_read_ext_csd(struct mmc_c* RPMB regions are defined in multiples of 128K. */ card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT ]; -if (ext_csd[EXT_CSD_RPMB_MULT ]) { +if (ext_csd[EXT_CSD_RPMB_MULT ] &&mmc_host_cmd23 (card->host)) { mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17, EXT_CSD_PART_CONFIG_ACC_RPMB, "rpmb", 0, false,
Greg Kroah-Hartman
maintainerPATCH 121/150 HID: wiimote: fix nunchuck button parser
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Herrmann <[email protected]>
commit 89bdd0c6f38ccf0de43d5a36ede384a730f3394e upstream.
The buttons of the Wii Remote Nunchuck extension are actually active low. Fix the parser to forward the inverted values. The comment in the function always said "0 == pressed" but the implementation was wrong from the beginning.
--- drivers/hid/hid-wiimote-ext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/hid/hid-wiimote-ext.c +4 -4
@@ -403,14 +403,14 @@ static void handler_nunchuck(struct wiimif (ext->motionp) {input_report_key (ext->input, - wiiext_keymap[WIIEXT_KEY_Z ], !!(payload[5 ] &0x04 )); + wiiext_keymap[WIIEXT_KEY_Z ], !(payload[5 ] &0x04 ));input_report_key (ext->input, - wiiext_keymap[WIIEXT_KEY_C ], !!(payload[5 ] &0x08 )); + wiiext_keymap[WIIEXT_KEY_C ], !(payload[5 ] &0x08 )); }else {input_report_key (ext->input, - wiiext_keymap[WIIEXT_KEY_Z ], !!(payload[5 ] &0x01 )); + wiiext_keymap[WIIEXT_KEY_Z ], !(payload[5 ] &0x01 ));input_report_key (ext->input, - wiiext_keymap[WIIEXT_KEY_C ], !!(payload[5 ] &0x02 )); + wiiext_keymap[WIIEXT_KEY_C ], !(payload[5 ] &0x02 )); }input_sync (ext->input);
Greg Kroah-Hartman
maintainerPATCH 122/150 net: cdc_ncm: fix probing of devices with multiple control interface altsettings
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
[ Upstream commit f350ca03703133c94fe742f6fa6ff0fd8f5a9a09 ]
commit bd329e1 ("net: cdc_ncm: do not bind to NCM compatible MBIM devices") added a test for a CDC MBIM altsetting, implementing the cdc_ncm part of MBIM backward compatibility support. This intentionally made the driver behave differently for CDC NCM devices with 2 alternate settings for the Communication interface, depending on whether or not CONFIG_USB_NET_CDC_MBIM was enabled. This is correct iff alternate setting #1 really *is* a MBIM setting. If not, then NCM probing will use a different altsetting than before, possibly causing probing failures depending on CONFIG_USB_NET_CDC_MBIM.
Fix by setting the altsetting back to default after the test, restoring the previous behaviour for non MBIM devices.
This bug causes probing of Huawei E3276 devices to fail when the MBIM driver is enabled, because these devices have a second alternate setting with no CDC functional descriptors.
--- drivers/net/usb/cdc_ncm.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/usb/cdc_ncm.c +8 -3
@@ -576,9 +576,14 @@ static int cdc_ncm_bind(struct usbnet *dif ((intf->num_altsetting ==2 ) && !usb_set_interface (dev->udev, intf->cur_altsetting->desc.bInterfaceNumber, -CDC_NCM_COMM_ALTSETTING_MBIM ) && -cdc_ncm_comm_intf_is_mbim (intf->cur_altsetting)) -return -ENODEV ; +CDC_NCM_COMM_ALTSETTING_MBIM )) { +if (cdc_ncm_comm_intf_is_mbim (intf->cur_altsetting)) +return -ENODEV ; +else +usb_set_interface (dev->udev, + intf->cur_altsetting->desc.bInterfaceNumber, +CDC_NCM_COMM_ALTSETTING_NCM ); + }#endif /* NCM data altsetting is always 1 */
Greg Kroah-Hartman
maintainerPATCH 123/150 xen-netback: correctly return errors from netbk_count_requests()
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 35876b5ffc154c357476b2c3bdab10feaf4bd8f0 ]
netbk_count_requests() could detect an error, call netbk_fatal_tx_error() but return 0. The vif may then be used afterwards (e.g., in a call to netbk_tx_error().
Since netbk_fatal_tx_error() could set vif->refcnt to 1, the vif may be freed immediately after the call to netbk_fatal_tx_error() (e.g., if the vif is also removed).
Netback thread Xenwatch thread
-------------------------------------------netbk_fatal_tx_err() netback_remove()
xenvif_disconnect()
...
free_netdev()netbk_tx_err() Oops!
--- drivers/net/xen-netback/netback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/xen-netback/netback.c +4 -4
@@ -911,13 +911,13 @@ static int netbk_count_requests(struct xif (frags >= work_to_do) {netdev_err (vif->dev,"Need more frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -ENODATA ; }if (unlikely (frags >=MAX_SKB_FRAGS )) {netdev_err (vif->dev,"Too many frags\n" );netbk_fatal_tx_err (vif); -return -frags; +return -E2BIG ; } memcpy(txp, RING_GET_REQUEST(&vif->tx, cons + frags),
@@ -925,7 +925,7 @@ static int netbk_count_requests(struct xif (txp->size > first->size) {netdev_err (vif->dev,"Frag is bigger than frame.\n" );netbk_fatal_tx_err (vif); -return -frags; +return -EIO ; } first->size -= txp->size;
@@ -935,7 +935,7 @@ static int netbk_count_requests(struct xnetdev_err (vif->dev,"txp->offset: %x, size: %u\n" , txp->offset, txp->size);netbk_fatal_tx_err (vif); -return -frags; +return -EINVAL ; } }while ((txp++)->flags & XEN_NETTXF_more_data);return frags;
Greg Kroah-Hartman
maintainerPATCH 124/150 xen-netback: cancel the credit timer when taking the vif down
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Vrabel <[email protected]>
[ Upstream commit 3e55f8b306cf305832a4ac78aa82e1b40e818ece ]
If the credit timer is left armed after calling xen_netbk_remove_xenvif(), then it may fire and attempt to schedule the vif which will then oops as vif->netbk == NULL.
This may happen both in the fatal error path and during normal disconnection from the front end.
The sequencing during shutdown is critical to ensure that: a) vif->netbk doesn't become unexpectedly NULL; and b) the net device/vif is not freed.
1. Mark as unschedulable (netif_carrier_off()).
2. Synchronously cancel the timer.
3. Remove the vif from the schedule list.
4. Remove it from it netback thread group.
5. Wait for vif->refcnt to become 0.
--- drivers/net/xen-netback/interface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/xen-netback/interface.c +1 -2
@@ -132,6 +132,7 @@ static void xenvif_up(struct xenvif *vifstatic void xenvif_down (struct xenvif *vif) {disable_irq (vif->irq); +del_timer_sync (&vif->credit_timeout);xen_netbk_deschedule_xenvif (vif);xen_netbk_remove_xenvif (vif); }
@@ -363,8 +364,6 @@ void xenvif_disconnect(struct xenvif *viatomic_dec (&vif->refcnt);wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -del_timer_sync (&vif->credit_timeout); -if (vif->irq)unbind_from_irqhandler (vif->irq, vif);
Greg Kroah-Hartman
maintainerPATCH 125/150 net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ying Xue <[email protected]>
[ Upstream commit dec34fb0f5b7873de45132a84a3af29e61084a6b ]
When SOCK_REFCNT_DEBUG is enabled, below build error is met:
kernel/sysctl_binary.o: In function `sk_refcnt_debug_release':include/net/sock.h:1025: multiple definition of sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here kernel/audit.o: In function sk_refcnt_debug_release':include/net/sock.h:1025: multiple definition of `sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here make[1]: *** [kernel/built-in.o] Error 1
make: *** [kernel] Error 2
So we decide to make sk_refcnt_debug_release static to eliminate the error.
--- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/sock.h +1 -1
@@ -1037,7 +1037,7 @@ static inline void sk_refcnt_debug_dec(s sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks)); } -inline void sk_refcnt_debug_release (const struct sock *sk) +static inline void sk_refcnt_debug_release (const struct sock *sk) {if (atomic_read (&sk->sk_refcnt) !=1 ) printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",
Greg Kroah-Hartman
maintainerPATCH 126/150 xfrm: release neighbor upon dst destruction
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Romain KUNTZ <[email protected]>
[ Upstream commit 18cf0d0784b4a634472ed24d0d7ca1c721d93e90 ]
Neighbor is cloned in xfrm6_fill_dst but seems to never be released. Neighbor entry should be released when XFRM6 dst entry is destroyed in xfrm6_dst_destroy, otherwise references may be kept forever on the device pointed by the neighbor entry.
I may not have understood all the subtleties of XFRM & dst so I would be happy to receive comments on this patch.
--- net/ipv6/xfrm6_policy.c | 2 ++ 1 file changed, 2 insertions(+)
net/ipv6/xfrm6_policy.c +2 -0
@@ -236,6 +236,8 @@ static void xfrm6_dst_destroy(struct dst {struct xfrm_dst *xdst = (struct xfrm_dst *)dst; +if (likely (xdst->u.rt6.n)) +neigh_release (xdst->u.rt6.n);if (likely (xdst->u.rt6.rt6i_idev))in6_dev_put (xdst->u.rt6.rt6i_idev);dst_destroy_metrics_generic (dst);
Greg Kroah-Hartman
maintainerPATCH 127/150 ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 303c07db487be59ae9fda10600ea65ca11c21497 ]
If a qdisc is installed on a ppp device, its possible to get a lockdep splat under stress, because nested dev_queue_xmit() can lock busylock a second time (on a different device, so its a false positive)
Avoid this problem using a distinct lock_class_key for ppp devices.
--- drivers/net/ppp/ppp_generic.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ppp/ppp_generic.c +8 -0
@@ -1058,7 +1058,15 @@ ppp_get_stats64(struct net_device *dev,return stats64; } +static struct lock_class_key ppp_tx_busylock; +static int ppp_dev_init (struct net_device *dev) +{ + dev->qdisc_tx_busylock = &ppp_tx_busylock; +return 0 ; +} +static const struct net_device_ops ppp_netdev_ops = { + .ndo_init = ppp_dev_init, .ndo_start_xmit = ppp_start_xmit, .ndo_do_ioctl = ppp_net_ioctl, .ndo_get_stats64 = ppp_get_stats64,
Greg Kroah-Hartman
maintainerPATCH 128/150 ipv6: fix race condition regarding dst->expires and dst->from.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: YOSHIFUJI Hideaki <[email protected]>
[ Upstream commit ecd9883724b78cc72ed92c98bcb1a46c764fff21 ]
Eric Dumazet wrote:
| Some strange crashes happen in rt6_check_expired(), with access | to random addresses. | | At first glance, it looks like the RTF_EXPIRES and | stuff added in commit 1716a96101c49186b | (ipv6: fix problem with expired dst cache) | are racy : same dst could be manipulated at the same time | on different cpus. | | At some point, our stack believes rt->dst.from contains a dst pointer, | while its really a jiffie value (as rt->dst.expires shares the same area | of memory) | | rt6_update_expires() should be fixed, or am I missing something ? | | CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
Because we do not have any locks for dst_entry, we cannot change essential structure in the entry; e.g., we cannot change reference to other entity.
To fix this issue, split 'from' and 'expires' field in dst_entry out of union. Once it is 'from' is assigned in the constructor, keep the reference until the very last stage of the life time of the object.
Of course, it is unsafe to change 'from', so make rt6_set_from simple just for fresh entries.
--- include/net/dst.h | 8 ++------ include/net/ip6_fib.h | 37 +++++++++++-------------------------- net/core/dst.c | 1 + net/ipv6/route.c | 8 +++----- 4 files changed, 17 insertions(+), 37 deletions(-)
include/net/dst.h +2 -6
@@ -36,13 +36,9 @@ struct dst_entry {struct net_device *dev;struct dst_ops *ops;unsigned long _metrics; -union { -unsigned long expires; -/* point to where the dst_entry copied from */ -struct dst_entry *from; - }; +unsigned long expires;struct dst_entry *path; -void *__pad0; +struct dst_entry *from;#ifdef CONFIG_XFRM struct xfrm_state *xfrm;#else
include/net/ip6_fib.h +11 -26
@@ -166,50 +166,35 @@ static inline struct inet6_dev *ip6_dst_static inline void rt6_clean_expires (struct rt6_info *rt) { -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) -dst_release (rt->dst.from); - rt->rt6i_flags &= ~RTF_EXPIRES ; - rt->dst.from =NULL ; }static inline void rt6_set_expires (struct rt6_info *rt,unsigned long expires) { -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) -dst_release (rt->dst.from); - - rt->rt6i_flags |=RTF_EXPIRES ; rt->dst.expires = expires; + rt->rt6i_flags |=RTF_EXPIRES ; } -static inline void rt6_update_expires (struct rt6_info *rt,int timeout) +static inline void rt6_update_expires (struct rt6_info *rt0,int timeout) { -if (!(rt->rt6i_flags &RTF_EXPIRES )) { -if (rt->dst.from) -dst_release (rt->dst.from); -/* dst_set_expires relies on expires == 0 -* if it has not been set previously. -*/ - rt->dst.expires =0 ; - } +struct rt6_info *rt; -dst_set_expires (&rt->dst, timeout); - rt->rt6i_flags |=RTF_EXPIRES ; +for (rt = rt0; rt && !(rt->rt6i_flags &RTF_EXPIRES ); + rt = (struct rt6_info *)rt->dst.from); +if (rt && rt != rt0) + rt0->dst.expires = rt->dst.expires; + +dst_set_expires (&rt0->dst, timeout); + rt0->rt6i_flags |=RTF_EXPIRES ; }static inline void rt6_set_from (struct rt6_info *rt,struct rt6_info *from) {struct dst_entry *new = (struct dst_entry *) from; -if (!(rt->rt6i_flags &RTF_EXPIRES ) && rt->dst.from) { -if (new == rt->dst.from) -return ; -dst_release (rt->dst.from); - } - rt->rt6i_flags &= ~RTF_EXPIRES ; - rt->dst.from = new;dst_hold (new); + rt->dst.from = new; }static inline void ip6_rt_put (struct rt6_info *rt)
net/core/dst.c +1 -0
@@ -179,6 +179,7 @@ void *dst_alloc(struct dst_ops *ops, strdst_init_metrics (dst, dst_default_metrics, true); dst->expires =0UL ; dst->path = dst; + dst->from =NULL ;#ifdef CONFIG_XFRM dst->xfrm =NULL ;#endif
net/ipv6/route.c +3 -5
@@ -300,6 +300,7 @@ static void ip6_dst_destroy(struct dst_e {struct rt6_info *rt = (struct rt6_info *)dst;struct inet6_dev *idev = rt->rt6i_idev; +struct dst_entry *from = dst->from;if (rt->n)neigh_release (rt->n);
@@ -312,8 +313,8 @@ static void ip6_dst_destroy(struct dst_ein6_dev_put (idev); } -if (!(rt->rt6i_flags &RTF_EXPIRES ) && dst->from) -dst_release (dst->from); + dst->from =NULL ; +dst_release (from);if (rt6_has_peer (rt)) {struct inet_peer *peer =rt6_peer_ptr (rt);
@@ -1054,7 +1055,6 @@ struct dst_entry *ip6_blackhole_route(st rt->rt6i_gateway = ort->rt6i_gateway; rt->rt6i_flags = ort->rt6i_flags; -rt6_clean_expires (rt); rt->rt6i_metric =0 ;memcpy (&rt->rt6i_dst, &ort->rt6i_dst,sizeof (struct rt6key ));
@@ -1859,8 +1859,6 @@ static struct rt6_info *ip6_rt_copy(struif ((ort->rt6i_flags & (RTF_DEFAULT |RTF_ADDRCONF )) == (RTF_DEFAULT |RTF_ADDRCONF ))rt6_set_from (rt, ort); -else -rt6_clean_expires (rt); rt->rt6i_metric =0 ;#ifdef CONFIG_IPV6_SUBTREES
Greg Kroah-Hartman
maintainerPATCH 129/150 ipv4: fix a bug in ping_err().
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 ]
We should get 'type' and 'code' from the outer ICMP header.
--- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ping.c +2 -2
@@ -322,8 +322,8 @@ void ping_err(struct sk_buff *skb, u32 istruct iphdr *iph = (struct iphdr *)skb->data;struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 ));struct inet_sock *inet_sock; -int type = icmph->type; -int code = icmph->code; +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code;struct net *net =dev_net (skb->dev);struct sock *sk;int harderr;
Greg Kroah-Hartman
maintainerPATCH 130/150 ipv6: use a stronger hash for tcp
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 08dcdbf6a7b9d14c2302c5bd0c5390ddf122f664 ]
It looks like its possible to open thousands of TCP IPv6 sessions on a server, all landing in a single slot of TCP hash table. Incoming packets have to lookup sockets in a very long list.
We should hash all bits from foreign IPv6 addresses, using a salt and hash mix, not a simple XOR.
inet6_ehashfn() can also separately use the ports, instead of xoring them.
--- include/net/inet6_hashtables.h | 8 ++++---- include/net/inet_sock.h | 1 + include/net/ipv6.h | 12 ++++++++++++ net/ipv4/af_inet.c | 9 +++++++-- 4 files changed, 24 insertions(+), 6 deletions(-)
include/net/inet6_hashtables.h +4 -4
@@ -28,16 +28,16 @@struct inet_hashinfo ; -/* I have no idea if this is a good hash for v6 or not. -DaveM */ static inline unsigned int inet6_ehashfn (struct net *net,const struct in6_addr *laddr,const u16 lport,const struct in6_addr *faddr,const __be16 fport) { -u32 ports = (lport ^ (__force u16 )fport); +u32 ports = (((u32 )lport) <<16 ) | (__force u32 )fport;return jhash_3words ((__force u32 )laddr->s6_addr32[3 ], - (__force u32 )faddr->s6_addr32[3 ], - ports, inet_ehash_secret +net_hash_mix (net)); +ipv6_addr_jhash (faddr), + ports, + inet_ehash_secret +net_hash_mix (net)); }static inline int inet6_sk_ehashfn (const struct sock *sk)
include/net/inet_sock.h +1 -0
@@ -203,6 +203,7 @@ static inline void inet_sk_copy_descendaextern int inet_sk_rebuild_header (struct sock *sk);extern u32 inet_ehash_secret; +extern u32 ipv6_hash_secret;extern void build_ehash_secret (void ); static inline unsigned int inet_ehashfn(struct net *net,
include/net/ipv6.h +12 -0
@@ -15,6 +15,7 @@#include <linux/ipv6.h> #include <linux/hardirq.h> +#include <linux/jhash.h> #include <net/if_inet6.h> #include <net/ndisc.h> #include <net/flow.h>
@@ -473,6 +474,17 @@ static inline u32 ipv6_addr_hash(const s#endif } +/* more secured version of ipv6_addr_hash() */ +static inline u32 ipv6_addr_jhash (const struct in6_addr *a) +{ +u32 v = (__force u32 )a->s6_addr32[0 ] ^ (__force u32 )a->s6_addr32[1 ]; + +return jhash_3words (v, + (__force u32 )a->s6_addr32[2 ], + (__force u32 )a->s6_addr32[3 ], + ipv6_hash_secret); +} +static inline bool ipv6_addr_loopback (const struct in6_addr *a) { return (a->s6_addr32[0] | a->s6_addr32[1] |
net/ipv4/af_inet.c +7 -2
@@ -248,8 +248,12 @@ EXPORT_SYMBOL(inet_listen);u32 inet_ehash_secret__read_mostly ;EXPORT_SYMBOL (inet_ehash_secret); +u32 ipv6_hash_secret__read_mostly ; +EXPORT_SYMBOL (ipv6_hash_secret); +/* -* inet_ehash_secret must be set exactly once +* inet_ehash_secret must be set exactly once, and to a non nul value +* ipv6_hash_secret must be set exactly once. */ void build_ehash_secret (void ) {
@@ -259,7 +263,8 @@ void build_ehash_secret(void)get_random_bytes (&rnd,sizeof (rnd)); }while (rnd ==0 ); -cmpxchg (&inet_ehash_secret,0 , rnd); +if (cmpxchg (&inet_ehash_secret,0 , rnd) ==0 ) +get_random_bytes (&ipv6_hash_secret,sizeof (ipv6_hash_secret)); }EXPORT_SYMBOL (build_ehash_secret);
Greg Kroah-Hartman
maintainerPATCH 131/150 ipv4: fix error handling in icmp_protocol.
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Wei <[email protected]>
[ Upstream commit 5b0520425e5ea81ba95ec486dd6bbb59a09fff0e ]
Now we handle icmp errors in each transport protocol's err_handler, for icmp protocols, that is ping_err. Since this handler only care of those icmp errors triggered by echo request, errors triggered by echo reply(which sent by kernel) are sliently ignored.
So wrap ping_err() with icmp_err() to deal with those icmp errors.
--- include/net/icmp.h | 1 + net/ipv4/af_inet.c | 2 +- net/ipv4/icmp.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-)
include/net/icmp.h +1 -0
@@ -41,6 +41,7 @@ struct net;extern void icmp_send (struct sk_buff *skb_in,int type,int code,__be32 info);extern int icmp_rcv (struct sk_buff *skb); +extern void icmp_err (struct sk_buff *,u32 info);extern int icmp_init (void );extern void icmp_out_count (struct net *net,unsigned char type);
net/ipv4/af_inet.c +1 -1
@@ -1595,7 +1595,7 @@ static const struct net_offload udp_offlstatic const struct net_protocol icmp_protocol = { .handler = icmp_rcv, - .err_handler = ping_err, + .err_handler = icmp_err, .no_policy =1 , .netns_ok =1 , };
net/ipv4/icmp.c +23 -0
@@ -934,6 +934,29 @@ error: goto drop; } +void icmp_err (struct sk_buff *skb,u32 info) +{ +struct iphdr *iph = (struct iphdr *)skb->data; +struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2 )); +int type =icmp_hdr (skb)->type; +int code =icmp_hdr (skb)->code; +struct net *net =dev_net (skb->dev); + +/* +* Use ping_err to handle all icmp errors except those +* triggered by ICMP_ECHOREPLY which sent from kernel. +*/ +if (icmph->type !=ICMP_ECHOREPLY ) { +ping_err (skb, info); +return ; + } + +if (type ==ICMP_DEST_UNREACH && code ==ICMP_FRAG_NEEDED ) +ipv4_update_pmtu (skb, net, info,0 ,0 ,IPPROTO_ICMP ,0 ); +else if (type ==ICMP_REDIRECT ) +ipv4_redirect (skb, net,0 ,0 ,IPPROTO_ICMP ,0 ); +} +/* * This table is the definition of how we handle ICMP. */
Greg Kroah-Hartman
maintainerPATCH 132/150 tcp: fix SYN-data space mis-accounting
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuchung Cheng <[email protected]>
[ Upstream commit 1b63edd6ecc55c3a61b40297b49e2323783bddfd ]
In fast open the sender unncessarily reduces the space available for data in SYN by 12 bytes. This is because in the sender incorrectly reserves space for TS option twice in tcp_send_syn_data():tcp_mtu_to_mss() already accounts for TS option space. But it further reserves MAX_TCP_OPTION_SPACE when computing the payload space.
--- net/ipv4/tcp_output.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
net/ipv4/tcp_output.c +11 -7
@@ -1351,8 +1351,8 @@ int tcp_trim_head(struct sock *sk, strucreturn 0 ; } -/* Calculate MSS. Not accounting for SACKs here. */ -int tcp_mtu_to_mss (struct sock *sk,int pmtu) +/* Calculate MSS not accounting any TCP options. */ +static inline int __tcp_mtu_to_mss (struct sock *sk,int pmtu) {const struct tcp_sock *tp =tcp_sk (sk);const struct inet_connection_sock *icsk =inet_csk (sk);
@@ -1381,13 +1381,17 @@ int tcp_mtu_to_mss(struct sock *sk, int/* Then reserve room for full set of TCP options and 8 bytes of data */ if (mss_now <48 ) mss_now =48 ; - -/* Now subtract TCP options size, not including SACKs */ - mss_now -= tp->tcp_header_len -sizeof (struct tcphdr ); -return mss_now; } +/* Calculate MSS. Not accounting for SACKs here. */ +int tcp_mtu_to_mss (struct sock *sk,int pmtu) +{ +/* Subtract TCP options size, not including SACKs */ +return __tcp_mtu_to_mss (sk, pmtu) - + (tcp_sk (sk)->tcp_header_len -sizeof (struct tcphdr )); +} +/* Inverse of above */ int tcp_mss_to_mtu (struct sock *sk,int mss) {
@@ -2930,7 +2934,7 @@ static int tcp_send_syn_data(struct sock*/ if (tp->rx_opt.user_mss && tp->rx_opt.user_mss < tp->rx_opt.mss_clamp) tp->rx_opt.mss_clamp = tp->rx_opt.user_mss; - space =tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) - + space =__tcp_mtu_to_mss (sk,inet_csk (sk)->icsk_pmtu_cookie) -MAX_TCP_OPTION_SPACE ; syn_data = skb_copy_expand(syn, skb_headroom(syn), space,
Greg Kroah-Hartman
maintainerPATCH 133/150 mlx4_en: fix allocation of device tx_cq
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kleber Sacilotto de Souza <[email protected]>
[ Upstream commit 427a96252d8eee7b9bbafce15bd37fa3387ede55 ]
The memory to hold the network device tx_cq is not being allocated with the correct size in mlx4_en_init_netdev(). It should use MAX_TX_RINGS instead of MAX_RX_RINGS. This can cause problems if the number of tx rings being used is greater than MAX_RX_RINGS.
--- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -1597,7 +1597,7 @@ int mlx4_en_init_netdev(struct mlx4_en_d err = -ENOMEM ; goto out; } - priv->tx_cq =kzalloc (sizeof (struct mlx4_en_cq ) *MAX_RX_RINGS , + priv->tx_cq =kzalloc (sizeof (struct mlx4_en_cq ) *MAX_TX_RINGS ,GFP_KERNEL );if (!priv->tx_cq) { err = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 134/150 mlx4_en: fix allocation of CPU affinity reverse-map
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kleber Sacilotto de Souza <[email protected]>
[ Upstream commit 3770699675dd1b8fc1e86ff369eb3cce44e10082 ]
The mlx4_en driver allocates the number of objects for the CPU affinity reverse-map based on the number of rx rings of the device. However, mlx4_assign_eq() calls irq_cpu_rmap_add() as many times as IRQ's are assigned to EQ's, which can be as large as mlx4_dev->caps.comp_pool. If caps.comp_pool is larger than rx_ring_num we will eventually hit the BUG_ON() in cpu_rmap_add().
Fix this problem by allocating space for the maximum number of CPU affinity reverse-map objects we might want to add.
--- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -1434,7 +1434,7 @@ int mlx4_en_alloc_resources(struct mlx4_ }#ifdef CONFIG_RFS_ACCEL - priv->dev->rx_cpu_rmap =alloc_irq_cpu_rmap (priv->rx_ring_num); + priv->dev->rx_cpu_rmap =alloc_irq_cpu_rmap (priv->mdev->dev->caps.comp_pool);if (!priv->dev->rx_cpu_rmap) goto err;
Greg Kroah-Hartman
maintainerPATCH 135/150 sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mathias Krause <[email protected]>
[ Upstream commit 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 ]
Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY with a family greater or equal then AF_MAX -- the array size of sock_diag_handlers[]. The current code does not test for this condition therefore is vulnerable to an out-of-bound access opening doors for a privilege escalation.
--- net/core/sock_diag.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/sock_diag.c +3 -0
@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct skif (nlmsg_len (nlh) <sizeof (*req))return -EINVAL ; +if (req->sdiag_family >=AF_MAX ) +return -EINVAL ; + hndl =sock_diag_lock_handler (req->sdiag_family);if (hndl ==NULL ) err = -ENOENT ;
Greg Kroah-Hartman
maintainerPATCH 136/150 vlan: adjust vlan_set_encap_proto() for its callers
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit da8c87241c26aac81a64c7e4d21d438a33018f4e ]
There are two places to call vlan_set_encap_proto():vlan_untag() and __pop_vlan_tci().
vlan_untag() assumes skb->data points after mac addr, otherwise the following code
vhdr = (struct vlan_hdr *) skb->data;
vlan_tci = ntohs(vhdr->h_vlan_TCI);
__vlan_hwaccel_put_tag(skb, vlan_tci);
skb_pull_rcsum(skb, VLAN_HLEN);won't be correct. But __pop_vlan_tci() assumes points _before_ mac addr.
In vlan_set_encap_proto(), it looks for some magic L2 value after mac addr:
rawp = skb->data;
if (*(unsigned short *) rawp == 0xFFFF)
...Therefore __pop_vlan_tci() is obviously wrong.
A quick fix is avoiding using skb->data in vlan_set_encap_proto(), use 'vhdr+1' is always correct in both cases.
--- include/linux/if_vlan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/if_vlan.h +3 -3
@@ -331,7 +331,7 @@ static inline void vlan_set_encap_proto( struct vlan_hdr *vhdr) {__be16 proto; -unsigned char *rawp; +unsigned short *rawp;/* * Was a VLAN packet, grab the encapsulated protocol, which the layer
@@ -344,8 +344,8 @@ static inline void vlan_set_encap_proto(return ; } - rawp = skb->data; -if (*(unsigned short *) rawp ==0xFFFF ) + rawp = (unsigned short *)(vhdr +1 ); +if (*rawp ==0xFFFF )/* * This is a magic hack to spot IPX packets. Older Novell * breaks the protocol design and runs IPX over 802.3 without
Greg Kroah-Hartman
maintainerPATCH 137/150 mac80211: always unblock CSA queue stop when disconnecting
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
Commit 5b36ebd8249f403c7edf7cf68d68e9a0d0f55243 upstream.
In some cases when disconnecting after (or during?) CSA the queues might not recover, and then the only way to recover is reloading the module.
Fix this by always unblocking the queue CSA reason when
disconnecting.
--- net/mac80211/mlme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +2 -2
@@ -1812,6 +1812,8 @@ static void __ieee80211_disconnect(strucWLAN_REASON_DISASSOC_DUE_TO_INACTIVITY , transmit_frame, frame_buf); ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED ; +ieee80211_wake_queues_by_reason (&sdata->local->hw, +IEEE80211_QUEUE_STOP_REASON_CSA );mutex_unlock (&ifmgd->mtx);/*
@@ -1856,8 +1858,6 @@ static void ieee80211_csa_connection_dro container_of(work, struct ieee80211_sub_if_data, u.mgd.csa_connection_drop_work); -ieee80211_wake_queues_by_reason (&sdata->local->hw, -IEEE80211_QUEUE_STOP_REASON_CSA );__ieee80211_disconnect (sdata, true); }
Greg Kroah-Hartman
maintainerPATCH 138/150 USB: ehci-omap: Dont free gpios that we didnt request
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Quadros <[email protected]>
commit 428525f97153505e83983460a8d08a3210aa6b8a upstream.
This driver does not request any gpios so don't free them. Fixes L3 bus error on multiple modprobe/rmmod of ehci_hcd with ehci-omap in use.
Without this patch, EHCI will break on repeated insmod/rmmod of ehci_hcd for all OMAP2+ platforms that use EHCI and set 'phy_reset = true' in usbhs_omap_board_data. i.e.
board-3430sdp.c: .phy_reset = true,board-3630sdp.c: .phy_reset = true,board-am3517crane.c: .phy_reset = true,board-am3517evm.c: .phy_reset = true,board-cm-t3517.c: .phy_reset = true,board-cm-t35.c: .phy_reset = true,board-devkit8000.c: .phy_reset = true,board-igep0020.c: .phy_reset = true,board-igep0020.c: .phy_reset = true,board-omap3beagle.c: .phy_reset = true,board-omap3evm.c: .phy_reset = true,board-omap3pandora.c: .phy_reset = true,board-omap3stalker.c: .phy_reset = true,board-omap3touchbook.c: .phy_reset = true,board-omap4panda.c: .phy_reset = false,board-overo.c: .phy_reset = true,board-zoom.c: .phy_reset = true,
--- drivers/usb/host/ehci-omap.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/usb/host/ehci-omap.c +0 -8
@@ -288,7 +288,6 @@ static int ehci_hcd_omap_remove(struct p {struct device *dev = &pdev->dev;struct usb_hcd *hcd =dev_get_drvdata (dev); -struct ehci_hcd_omap_platform_data *pdata = dev->platform_data;usb_remove_hcd (hcd);disable_put_regulator (dev->platform_data);
@@ -298,13 +297,6 @@ static int ehci_hcd_omap_remove(struct ppm_runtime_put_sync (dev);pm_runtime_disable (dev); -if (pdata->phy_reset) { -if (gpio_is_valid (pdata->reset_gpio_port[0 ])) -gpio_free (pdata->reset_gpio_port[0 ]); - -if (gpio_is_valid (pdata->reset_gpio_port[1 ])) -gpio_free (pdata->reset_gpio_port[1 ]); - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 139/150 gpio: em: Use irq_domain_add_simple() to fix runtime error
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Magnus Damm <[email protected]>
commit c7886b18273b07042e25e8d3ba5c983837b84123 upstream.
Adjust the gpio-em.c driver to reconsider the pdata->irq_base variable. Non-DT board code like for instance board-kzm9d.c needs to operate of a static IRQ range for platform devices.
So this patch is updating the code to make use of the function irq_domain_add_simple() instead of irq_domain_add_linear().
Fixes a EMEV2 / KZM9D runtime error caused by the following commit:
7385500 gpio/em: convert to linear IRQ domain
--- drivers/gpio/gpio-em.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpio/gpio-em.c +2 -1
@@ -299,8 +299,9 @@ static int em_gio_probe(struct platform_ irq_chip->irq_set_type = em_gio_irq_set_type; irq_chip->flags =IRQCHIP_SKIP_SET_WAKE ; - p->irq_domain =irq_domain_add_linear (pdev->dev.of_node, + p->irq_domain =irq_domain_add_simple (pdev->dev.of_node, pdata->number_of_pins, + pdata->irq_base, &em_gio_irq_domain_ops, p);if (!p->irq_domain) { ret = -ENXIO ;
Greg Kroah-Hartman
maintainerPATCH 140/150 dma: sh: Dont use ENODEV for failing slave lookup
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guennadi Liakhovetski <[email protected]>
commit 7c1119bdd650fa58dad8157bc75c5fcf6ed97843 upstream.
If dmaengine driver's .device_alloc_chan_resources() method returns -ENODEV, dma_request_channel() will decide, that the driver has been removed and will remove the device from its list. To prevent this use ENXIO if a slave lookup fails.
--- drivers/dma/sh/shdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/sh/shdma.c +1 -1
@@ -326,7 +326,7 @@ static int sh_dmae_set_slave(struct shdm shdma_chan);const struct sh_dmae_slave_config *cfg =dmae_find_slave (sh_chan, slave_id);if (!cfg) -return -ENODEV ; +return -ENXIO ;if (!try) sh_chan->config = cfg;
Greg Kroah-Hartman
maintainerPATCH 141/150 dca: check against empty dca_domains list before unregister provider
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej Sosnowski <[email protected]>
commit c419fcfd071cf34ba00f9f65282583772d2655e7 upstream.
When providers get blocked unregister_dca_providers() is called ending up with dca_providers and dca_domain lists emptied. Dca should be prevented from trying to unregister any provider if dca_domain list is found empty.
--- drivers/dca/dca-core.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/dca/dca-core.c +5 -0
@@ -420,6 +420,11 @@ void unregister_dca_provider(struct dca_raw_spin_lock_irqsave (&dca_lock, flags); +if (list_empty (&dca_domains)) { +raw_spin_unlock_irqrestore (&dca_lock, flags); +return ; + } +list_del (&dca->node); pci_rc =dca_pci_rc_from_dev (dev);
Greg Kroah-Hartman
maintainerPATCH 142/150 USB: option: add and update Alcatel modems
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit f8f0302bbcbd1b14655bef29f6996a2152be559d upstream.
Adding three currently unsupported modems based on information from .inf driver files:
Diag VID_1BBB&PID_0052&MI_00
AGPS VID_1BBB&PID_0052&MI_01
VOICE VID_1BBB&PID_0052&MI_02
AT VID_1BBB&PID_0052&MI_03
Modem VID_1BBB&PID_0052&MI_05
wwan VID_1BBB&PID_0052&MI_06
Diag VID_1BBB&PID_00B6&MI_00
AT VID_1BBB&PID_00B6&MI_01
Modem VID_1BBB&PID_00B6&MI_02
wwan VID_1BBB&PID_00B6&MI_03
Diag VID_1BBB&PID_00B7&MI_00
AGPS VID_1BBB&PID_00B7&MI_01
VOICE VID_1BBB&PID_00B7&MI_02
AT VID_1BBB&PID_00B7&MI_03
Modem VID_1BBB&PID_00B7&MI_04
wwan VID_1BBB&PID_00B7&MI_05
Updating the blacklist info for the X060S_X200 and X220_X500D, reserving interfaces for a wwan driver, based on
wwan VID_1BBB&PID_0000&MI_04
wwan VID_1BBB&PID_0017&MI_06
--- drivers/usb/serial/option.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/serial/option.c +9 -1
@@ -479,6 +479,7 @@ static const struct option_blacklist_infstatic const struct option_blacklist_info alcatel_x200_blacklist = { .sendsetup =BIT (0 ) |BIT (1 ), + .reserved =BIT (4 ), };static const struct option_blacklist_info zte_0037_blacklist = {
@@ -1215,7 +1216,14 @@ static const struct usb_device_id option { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist }, - { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) }, + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052), + .driver_info = (kernel_ulong_t)&net_intf6_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6), + .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7), + .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
Greg Kroah-Hartman
maintainerPATCH 143/150 USB: option: add Yota / Megafon M100-1 4g modem
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit cd565279e51bedee1b2988e84f9b3bef485adeb6 upstream.
Interface layout:
00 CD-ROM
01 debug COM port
02 AP control port
03 modem
04 usb-ethernet
Bus=01 Lev=02 Prnt=02 Port=01 Cnt=02 Dev#= 4 Spd=480 MxCh= 0
D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 P: Vendor=0408 ProdID=ea42 Rev= 0.00 S: Manufacturer=Qualcomm, Incorporated S: Product=Qualcomm CDMA Technologies MSM S: SerialNumber=353568051xxxxxx C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=84(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) E: Ad=86(I) Atr=03(Int.) MxPS= 64 Ivl=2ms E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms
--- drivers/usb/serial/option.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
@@ -576,6 +576,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, + { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
Greg Kroah-Hartman
maintainerPATCH 144/150 USB: option: add Huawei "ACM" devices using protocol = vendor
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bjørn Mork <[email protected]>
commit 1f3f687722fd9b29a0c2a85b4844e3b2a3585c63 upstream.
The USB device descriptor of one identity presented by a few Huawei morphing devices have serial functions with class codes 02/02/ff, indicating CDC ACM with a vendor specific protocol. This combination is often used for MSFT RNDIS functions, and the CDC ACM class driver will therefore ignore such functions.
The CDC ACM class driver cannot support functions with only 2 endpoints. The underlying serial functions of these modems are also believed to be the same as for alternate device identities already supported by the option driver. Letting the same driver handle these functions independently of the current identity ensures consistent handling and user experience.
There is no need to blacklist these devices in the rndis_host driver. Huawei serial functions will either have only 2 endpoints or a CDC ACM functional descriptor with bmCapabilities != 0, making them correctly ignored as "non RNDIS" by that driver.
--- drivers/usb/serial/option.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/option.c +4 -0
@@ -578,8 +578,12 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
Greg Kroah-Hartman
maintainerPATCH 145/150 USB: ehci-omap: Fix autoloading of module
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Quadros <[email protected]>
commit 04753523266629b1cd0518091da1658755787198 upstream.
The module alias should be "ehci-omap" and not "omap-ehci" to match the platform device name. The omap-ehci module should now autoload correctly.
--- drivers/usb/host/ehci-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/ehci-omap.c +1 -1
@@ -364,7 +364,7 @@ static const struct hc_driver ehci_omap_ .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, }; -MODULE_ALIAS ("platform:omap-ehci" ); +MODULE_ALIAS ("platform:ehci-omap" );MODULE_AUTHOR ("Texas Instruments, Inc." );MODULE_AUTHOR ("Felipe Balbi <[email protected]>" );
Greg Kroah-Hartman
maintainerPATCH 146/150 USB: storage: properly handle the endian issues of idProduct
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: fangxiaozhi <[email protected]>
commit cd060956c5e97931c3909e4a808508469c0bb9f6 upstream.
1. The idProduct is little endian, so make sure its value to be compatible with the current CPU. Make no break on big endian processors.
--- drivers/usb/storage/initializers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/initializers.c +2 -2
@@ -147,7 +147,7 @@ static int usb_stor_huawei_dongles_pid(sint idProduct; idesc = &us->pusb_intf->cur_altsetting->desc; - idProduct = us->pusb_dev->descriptor.idProduct; + idProduct =le16_to_cpu (us->pusb_dev->descriptor.idProduct);/* The first port is CDROM, * means the dongle in the single port mode, * and a switch command is required to be sent. */
@@ -169,7 +169,7 @@ int usb_stor_huawei_init(struct us_dataint result =0 ;if (usb_stor_huawei_dongles_pid (us)) { -if (us->pusb_dev->descriptor.idProduct >=0x1446 ) +if (le16_to_cpu (us->pusb_dev->descriptor.idProduct) >=0x1446 ) result =usb_stor_huawei_scsi_init (us);else result =usb_stor_huawei_feature_init (us);
Greg Kroah-Hartman
maintainerPATCH 147/150 USB: usb-storage: unusual_devs update for Super TOP SATA bridge
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Josh Boyer <[email protected]>
commit 18e03310b5caa6d11c1a8c61b982c37047693fba upstream.
The current entry in unusual_cypress.h for the Super TOP SATA bridge devices seems to be causing corruption on newer revisions of this device. This has been reported in Arch Linux and Fedora. The original patch was tested on devices with bcdDevice of 1.60, whereas the newer devices report bcdDevice as 2.20. Limit the UNUSUAL_DEV entry to devices less than 2.20.
This fixes https://bugzilla.redhat.com/show_bug.cgi?id=909591
The Arch Forum post on this is here:
https://bbs.archlinux.org/viewtopic.php?id=152011
--- drivers/usb/storage/unusual_cypress.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/unusual_cypress.h +1 -1
@@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x9999 , +UNUSUAL_DEV (0x14cd ,0x6116 ,0x0000 ,0x0219 ,"Super Top" ,"USB 2.0 SATA BRIDGE" , USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
Greg Kroah-Hartman
maintainerPATCH 148/150 usb: musb: core: fix failure path
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 681d1e8761ca773967bce9bd1bb2896f07279551 upstream.
In the fail1~fail5 failure path, pm_runtime_disable() should be called to avoid 'Unbalanced pm_runtime_enable' error in next probe() which may be triggered by defer probe or next 'modprobe musb_hdrc'.
--- drivers/usb/musb/musb_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/musb/musb_core.c +1 -0
@@ -1993,6 +1993,7 @@ fail2:musb_platform_exit (musb); fail1: +pm_runtime_disable (musb->controller);dev_err (musb->controller,"musb_init_controller failed with status %d\n" , status);
Greg Kroah-Hartman
maintainerPATCH 149/150 usb: musb: fix dependency on transceiver driver
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit 25736e0c8269e9613aa6036fbc591818daa30d14 upstream.
This patch let glue driver return -EPROBE_DEFER if the transceiver is not readly, so we can support defer probe on musb to fix the below error on 3.7-rc5 if transceiver drivers are built as module:
[ 19.052490] unable to find transceiver of type USB2 PHY [ 19.072052] HS USB OTG: no transceiver configured [ 19.076995] musb-hdrc musb-hdrc.0.auto: musb_init_controller failed with status -19 [ 19.089355] musb-hdrc: probe of musb-hdrc.0.auto rejects match -19 [ 19.096771] driver: 'musb-omap2430': driver_bound: bound to device 'musb-omap2430' [ 19.105194] bus: 'platform': really_probe: bound device musb-omap2430 to driver musb-omap2430 [ 19.174407] bus: 'platform': add driver twl4030_usb [ 19.179656] bus: 'platform': driver_probe_device: matched device twl4030_usb with driver twl4030_usb [ 19.202270] bus: 'platform': really_probe: probing driver twl4030_usb with device twl4030_usb [ 19.214172] twl4030_usb twl4030_usb: HW_CONDITIONS 0xc0/192; link 3 [ 19.239624] musb-omap2430 musb-omap2430: musb core is not yet ready [ 19.246765] twl4030_usb twl4030_usb: Initialized TWL4030 USB module [ 19.254516] driver: 'twl4030_usb': driver_bound: bound to device 'twl4030_usb' [ 19.263580] bus: 'platform': really_probe: bound device twl4030_usb to driver twl4030_usb
--- drivers/usb/musb/am35x.c | 2 +- drivers/usb/musb/blackfin.c | 2 +- drivers/usb/musb/da8xx.c | 7 +++++-- drivers/usb/musb/davinci.c | 7 +++++-- drivers/usb/musb/musb_dsps.c | 2 +- drivers/usb/musb/omap2430.c | 2 +- drivers/usb/musb/tusb6010.c | 2 +- drivers/usb/musb/ux500.c | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-)
drivers/usb/musb/am35x.c +1 -1
@@ -365,7 +365,7 @@ static int am35x_musb_init(struct musb *usb_nop_xceiv_register (); musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) -return -ENODEV ; +return -EPROBE_DEFER ;setup_timer (&otg_workaround, otg_timer, (unsigned long ) musb);
drivers/usb/musb/blackfin.c +1 -1
@@ -406,7 +406,7 @@ static int bfin_musb_init(struct musb *m musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) {gpio_free (musb->config->gpio_vrsel); -return -ENODEV ; +return -EPROBE_DEFER ; }bfin_musb_reg_init (musb);
drivers/usb/musb/da8xx.c +5 -2
@@ -410,6 +410,7 @@ static int da8xx_musb_init(struct musb * {void __iomem *reg_base = musb->ctrl_base;u32 rev; +int ret = -ENODEV ; musb->mregs +=DA8XX_MENTOR_CORE_OFFSET ;
@@ -420,8 +421,10 @@ static int da8xx_musb_init(struct musb *usb_nop_xceiv_register (); musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 ); -if (IS_ERR_OR_NULL (musb->xceiv)) +if (IS_ERR_OR_NULL (musb->xceiv)) { + ret = -EPROBE_DEFER ; goto fail; + }setup_timer (&otg_workaround, otg_timer, (unsigned long )musb);
@@ -441,7 +444,7 @@ static int da8xx_musb_init(struct musb * musb->isr = da8xx_musb_interrupt;return 0 ; fail: -return -ENODEV ; +return ret; }static int da8xx_musb_exit (struct musb *musb)
drivers/usb/musb/davinci.c +5 -2
@@ -380,11 +380,14 @@ static int davinci_musb_init(struct musb {void __iomem *tibase = musb->ctrl_base;u32 revision; +int ret = -ENODEV ;usb_nop_xceiv_register (); musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 ); -if (IS_ERR_OR_NULL (musb->xceiv)) +if (IS_ERR_OR_NULL (musb->xceiv)) { + ret = -EPROBE_DEFER ; goto unregister; + } musb->mregs +=DAVINCI_BASE_OFFSET ;
@@ -438,7 +441,7 @@ fail:usb_put_phy (musb->xceiv); unregister:usb_nop_xceiv_unregister (); -return -ENODEV ; +return ret; }static int davinci_musb_exit (struct musb *musb)
drivers/usb/musb/musb_dsps.c +1 -1
@@ -419,7 +419,7 @@ static int dsps_musb_init(struct musb *musb_nop_xceiv_register (); musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) -return -ENODEV ; +return -EPROBE_DEFER ;/* Returns zero if e.g. not clocked */ rev =dsps_readl (reg_base, wrp->revision);
drivers/usb/musb/omap2430.c +1 -1
@@ -369,7 +369,7 @@ static int omap2430_musb_init(struct mus musb->xceiv =devm_usb_get_phy (dev,USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) {pr_err ("HS USB OTG: no transceiver configured\n" ); -return -ENODEV ; +return -EPROBE_DEFER ; } musb->isr = omap2430_musb_interrupt;
drivers/usb/musb/tusb6010.c +1 -1
@@ -1069,7 +1069,7 @@ static int tusb_musb_init(struct musb *musb_nop_xceiv_register (); musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) -return -ENODEV ; +return -EPROBE_DEFER ; pdev =to_platform_device (musb->controller);
drivers/usb/musb/ux500.c +1 -1
@@ -61,7 +61,7 @@ static int ux500_musb_init(struct musb * musb->xceiv =usb_get_phy (USB_PHY_TYPE_USB2 );if (IS_ERR_OR_NULL (musb->xceiv)) {pr_err ("HS USB OTG: no transceiver configured\n" ); -return -ENODEV ; +return -EPROBE_DEFER ; } musb->isr = ux500_musb_interrupt;
Greg Kroah-Hartman
maintainerPATCH 150/150 usb: musb: ux500: use clk_prepare_enable and clk_disable_unprepare
In reply to Greg Kroah-Hartman3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fabio Baltieri <[email protected]>
commit 99d17cfa3bbc6f4edb175f819af59c6b9e245e82 upstream.
This patch converts the module to use clk_prepare_enable and clk_disable_unprepare variants as required by common clock framework.
Without this the system crash during probe function.
--- drivers/usb/musb/ux500.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/musb/ux500.c +5 -5
@@ -108,7 +108,7 @@ static int ux500_probe(struct platform_d goto err3; } - ret =clk_enable (clk); + ret =clk_prepare_enable (clk);if (ret) {dev_err (&pdev->dev,"failed to enable clock\n" ); goto err4;
@@ -148,7 +148,7 @@ static int ux500_probe(struct platform_dreturn 0 ; err5: -clk_disable (clk); +clk_disable_unprepare (clk); err4:clk_put (clk);
@@ -168,7 +168,7 @@ static int ux500_remove(struct platform_struct ux500_glue *glue =platform_get_drvdata (pdev);platform_device_unregister (glue->musb); -clk_disable (glue->clk); +clk_disable_unprepare (glue->clk);clk_put (glue->clk);kfree (glue);
@@ -182,7 +182,7 @@ static int ux500_suspend(struct device *struct musb *musb =glue_to_musb (glue);usb_phy_set_suspend (musb->xceiv,1 ); -clk_disable (glue->clk); +clk_disable_unprepare (glue->clk);return 0 ; }
@@ -193,7 +193,7 @@ static int ux500_resume(struct device *dstruct musb *musb =glue_to_musb (glue);int ret; - ret =clk_enable (glue->clk); + ret =clk_prepare_enable (glue->clk);if (ret) {dev_err (dev,"failed to enable clock\n" );return ret;
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.8.1 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 28 23:52:34 UTC 2013. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.8.1-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.66, 3.4.33, and 3.8.0
Compiled and booted on the following systems:
HP EliteBook 6930p Intel(R) Core(TM)2 Duo CPU T9400 @ 2.53GHz HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics
dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
Cross-compile tests results:
alpha: defconfig passed on all
arm: defconfig passed on all
arm64: not applicable to 3.0.y, 3.4.y. defconfig passed on 3.8.y
c6x: not applicable to 3.0.y, defconfig passed on 3.4.y, and 3.8.y.
mips: defconfig passed on all
mipsel: defconfig passed on all
powerpc: wii_defconfig passed on all
sh: defconfig passed on all
sparc: defconfig passed on all
tile: tilegx_defconfig passed on all
-- Shuah
At Wed, 27 Feb 2013 09:50:03 -0700,
Quoted 10 lines · Shuah Khan
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.8.1 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu Feb 28 23:52:34 UTC 2013. Anything received after that time might be too late.
Greg, 3.8.1 is already released although now is only "Thu Feb 28 14:45:19 UTC 2013". Is there any rule to move up the deadline? I encountered such situation several times and didn't understand why it happened.
Quoted 3 lines
Patches applied cleanly to 3.0.66, 3.4.33, and 3.8.0
Compiled and booted on the following systems:
...
Anyway, +1.
This kernel can be built and boot without any problem. Building a kernel with this kernel also works fine.
- Build Machine: debian wheezy x86_64
CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
memory: 8GB
- Test machine: debian wheezy x86_64(KVM guest on the Build Machine)
vCPU: x2
memory: 2GB
Thanks,
Satoru
Greg Kroah-Hartman
maintainerQuoted 10 lines · Satoru Takeuchi
At Wed, 27 Feb 2013 09:50:03 -0700,
Quoted 8 lines · Shuah Khan
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.8.1 release. There are 150 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.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Responses should be made by Thu Feb 28 23:52:34 UTC 2013. Anything received after that time might be too late.
Greg, 3.8.1 is already released although now is only "Thu Feb 28 14:45:19 UTC 2013". Is there any rule to move up the deadline? I encountered such situation several times and didn't understand why it happened.
It happens sometimes due to my travel schedule, and based on how "good" I think this release is. 3.8.1 had a bunch of fixes in it that people really needed (myself included, it fixed resume on my main travel laptop), and I'm staring at a bunch more 3.8-stable patches that need to get queued up, so I did the release a few hours early.
Hope this helps,
greg k-h
At Thu, 28 Feb 2013 08:24:20 -0800,
Quoted 19 lines · Greg Kroah-Hartman
Quoted 10 lines · Satoru Takeuchi
At Wed, 27 Feb 2013 09:50:03 -0700,
Quoted 8 lines · Shuah Khan
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.8.1 release. There are 150 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.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
Responses should be made by Thu Feb 28 23:52:34 UTC 2013. Anything received after that time might be too late.
Greg, 3.8.1 is already released although now is only "Thu Feb 28 14:45:19 UTC 2013". Is there any rule to move up the deadline? I encountered such situation several times and didn't understand why it happened.
Quoted 7 lines
It happens sometimes due to my travel schedule, and based on how "good" I think this release is. 3.8.1 had a bunch of fixes in it that people really needed (myself included, it fixed resume on my main travel laptop), and I'm staring at a bunch more 3.8-stable patches that need to get queued up, so I did the release a few hours early.
Hope this helps,
Got it. Thank you for your explanation. I continue to this review on the best effor basis. So sometimes skip some versions due to lack of my free time :-)
Thanks,
Satoru
Quoted 2 lines · Greg Kroah-Hartman
Phileas Fogg <[email protected]>
powerpc/kexec: Disable hard IRQ before kexec
Quote Documentation/SubmittingPatches:
"then you just add a line saying
using your real name (sorry, no pseudonyms or anonymous contributions.)"
Wow I had no clue he was alive, and in Russia. Must've gotten stuck while rushing the world some 150 years ago.
http://en.wikipedia.org/wiki/Phileas_Fogg
But maybe there is a guy in Russia that has actually arranged to get that name as legal name, whatdoIknow...
Yours,
Linus Walleij