Linux 3.17.5
Greg KH
maintainerI'm announcing the release of the 3.17.5 kernel.
No one should use it, use 3.17.6 instead. I'm just including this here so that everyone can see the changelog of what went into it.
The updated 3.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.17.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | 4 Makefile | 2 arch/arm/include/asm/thread_info.h | 11 - arch/arm/kernel/traps.c | 31 -- arch/arm/mach-mvebu/coherency.c | 2 arch/arm/mm/proc-v7.S | 2 arch/arm/mm/proc-xscale.S | 4 arch/mips/include/asm/mipsregs.h | 2 arch/mips/include/asm/r4kcache.h | 4 arch/mips/include/asm/uaccess.h | 7 arch/mips/kernel/cpu-probe.c | 33 ++- arch/mips/kernel/signal.c | 8 arch/mips/lib/memcpy.S | 1 arch/mips/loongson/common/Makefile | 3 arch/mips/loongson/loongson-3/numa.c | 1 arch/mips/mm/tlb-r4k.c | 4 arch/mips/mm/tlbex.c | 10 arch/mips/oprofile/backtrace.c | 2 arch/mips/sgi-ip27/ip27-memory.c | 1 arch/powerpc/kernel/vdso32/getcpu.S | 4 arch/powerpc/platforms/powernv/opal-hmi.c | 2 arch/powerpc/platforms/powernv/pci-ioda.c | 5 arch/powerpc/platforms/powernv/pci.c | 4 arch/powerpc/platforms/pseries/msi.c | 2 arch/powerpc/xmon/xmon.c | 6 arch/sparc/include/uapi/asm/swab.h | 12 - arch/x86/include/asm/cpufeature.h | 1 arch/x86/include/asm/kvm_para.h | 10 arch/x86/include/asm/page_32_types.h | 1 arch/x86/include/asm/page_64_types.h | 11 - arch/x86/include/asm/thread_info.h | 2 arch/x86/include/asm/traps.h | 1 arch/x86/kernel/cpu/amd.c | 7 arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/dumpstack_64.c | 1 arch/x86/kernel/entry_64.S | 81 ++----- arch/x86/kernel/traps.c | 71 +++++- arch/x86/mm/init_64.c | 11 - arch/x86/tools/calc_run_size.pl | 11 - drivers/acpi/device_pm.c | 2 drivers/acpi/ec.c | 4 drivers/clk/clk-divider.c | 18 - drivers/clk/qcom/mmcc-apq8084.c | 2 drivers/clk/rockchip/clk.c | 4 drivers/clocksource/sun4i_timer.c | 12 - drivers/dma/sun6i-dma.c | 61 ++--- drivers/gpu/drm/i915/i915_dma.c | 10 drivers/gpu/drm/i915/intel_display.c | 4 drivers/gpu/drm/i915/intel_dp.c | 12 + drivers/gpu/drm/i915/intel_pm.c | 5 drivers/gpu/drm/radeon/dce3_1_afmt.c | 2 drivers/gpu/drm/radeon/dce6_afmt.c | 2 drivers/gpu/drm/radeon/evergreen_hdmi.c | 2 drivers/gpu/drm/radeon/r600_dpm.c | 2 drivers/gpu/drm/radeon/radeon_connectors.c | 19 + drivers/gpu/drm/radeon/radeon_encoders.c | 3 drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 drivers/hwmon/g762.c | 6 drivers/iio/adc/men_z188_adc.c | 1 drivers/infiniband/ulp/isert/ib_isert.c | 44 ++-- drivers/infiniband/ulp/srpt/ib_srpt.c | 8 drivers/input/joystick/xpad.c | 16 + drivers/input/mouse/synaptics.c | 4 drivers/irqchip/irq-atmel-aic-common.c | 6 drivers/net/bonding/bond_main.c | 4 drivers/net/can/dev.c | 2 drivers/net/can/usb/esd_usb2.c | 1 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 - drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 28 +- drivers/net/ieee802154/fakehard.c | 13 - drivers/net/ppp/pptp.c | 4 drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 13 + drivers/net/wireless/ath/ath9k/hw.c | 13 - drivers/net/wireless/brcm80211/brcmfmac/of.c | 4 drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 2 drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 drivers/net/wireless/iwlwifi/iwl-fw.h | 4 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 37 ++- drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 drivers/net/wireless/iwlwifi/pcie/trans.c | 3 drivers/net/wireless/rt2x00/rt2x00queue.c | 50 +--- drivers/of/address.c | 19 + drivers/of/fdt.c | 2 drivers/of/selftest.c | 3 drivers/pci/msi.c | 26 ++ drivers/pci/probe.c | 28 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 drivers/scsi/scsi_devinfo.c | 1 drivers/spi/spi-dw.c | 6 drivers/spi/spi-sirf.c | 4 drivers/spi/spi.c | 6 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 drivers/target/target_core_transport.c | 2 drivers/usb/core/quirks.c | 3 drivers/usb/host/xhci-hub.c | 5 drivers/usb/host/xhci-pci.c | 2 drivers/usb/host/xhci-plat.c | 10 drivers/usb/host/xhci-ring.c | 43 +--- drivers/usb/host/xhci.c | 107 +++++----- drivers/usb/host/xhci.h | 2 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 33 +++ drivers/usb/serial/ftdi_sio_ids.h | 39 +++ drivers/usb/serial/keyspan.c | 97 +++++---- drivers/usb/serial/ssu100.c | 11 - drivers/usb/storage/unusual_uas.h | 7 drivers/vhost/scsi.c | 24 ++ fs/aio.c | 21 + fs/btrfs/ctree.c | 14 - fs/btrfs/locking.c | 24 +- fs/btrfs/locking.h | 2 fs/nfsd/nfs4callback.c | 8 fs/nfsd/nfsd.h | 9 include/dt-bindings/clock/qcom,mmcc-apq8084.h | 2 include/linux/bitops.h | 7 include/linux/clk-provider.h | 1 include/linux/iio/events.h | 2 include/linux/inetdevice.h | 2 include/linux/pci.h | 1 include/sound/soc-dpcm.h | 2 kernel/events/uprobes.c | 1 net/ipv4/fib_rules.c | 4 net/ipv4/ping.c | 2 net/ipx/af_ipx.c | 6 net/mac80211/aes_ccm.c | 3 net/netfilter/nf_conntrack_core.c | 14 - sound/pci/hda/hda_intel.c | 24 +- sound/pci/hda/hda_priv.h | 1 sound/pci/hda/patch_realtek.c | 1 sound/soc/codecs/cs42l51-i2c.c | 1 sound/soc/codecs/cs42l51.c | 4 sound/soc/codecs/cs42l51.h | 1 sound/soc/codecs/rt5670.c | 28 +- sound/soc/codecs/sgtl5000.c | 3 sound/soc/codecs/sgtl5000.h | 2 sound/soc/codecs/wm_adsp.c | 1 sound/soc/rockchip/rockchip_i2s.c | 4 sound/soc/samsung/snow.c | 1 sound/soc/sh/fsi.c | 3 sound/soc/sh/rcar/core.c | 3 sound/soc/soc-pcm.c | 72 +++++- sound/usb/quirks.c | 14 + 143 files changed, 1007 insertions(+), 605 deletions(-)
Aaro Koskinen (2):
MIPS: oprofile: Fix backtrace on 64-bit kernel
MIPS: Loongson: Make platform serial setup always built-in.
Alex Deucher (4):
drm/radeon: fix endian swapping in vbios fetch for tdp table drm/radeon: disable native backlight control on pre-r6xx asics (v2) drm/radeon: report disconnected for LVDS/eDP with PX if ddc fails drm/radeon: initialize sadb to NULL in the audio code
Alexey Khoroshilov (2):
ieee802154: fix error handling in ieee802154fake_probe()
can: esd_usb2: fix memory leak on disconnect
Andreas Färber (1):
ASoC: samsung: Add MODULE_DEVICE_TABLE for Snow
Andy Lutomirski (4):
x86_64, traps: Fix the espfix64 #DF fixup and rewrite it in C x86_64, traps: Stop using IST for #SS
x86_64, traps: Rework bad_iret
uprobes, x86: Fix _TIF_UPROBE vs _TIF_NOTIFY_RESUME
Anton Blanchard (1):
powerpc: 32 bit getcpu VDSO function uses 64 bit instructions
Arend van Spriel (1):
brcmfmac: fix conversion of channel width 20MHZ_NOHT
Arnaud Ebalard (1):
hwmon: (g762) fix call to devm_hwmon_device_register_with_groups()
Axel Lin (1):
iio: adc: men_z188_adc: Add terminating entry for men_z188_ids
Bard Liao (1):
ASoC: rt5670: correct the incorrect default values
Bart Van Assche (1):
srp-target: Retry when QP creation fails with ENOMEM
Ben Sagal (1):
Input: synaptics - adjust min/max on Thinkpad E540
Benjamin Herrenschmidt (6):
PCI/MSI: Add device flag indicating that 64-bit MSIs don't work of/base: Fix PowerPC address parsing hack powerpc/pseries: Honor the generic "no_64bit_msi" flag sound/radeon: Move 64-bit MSI quirk from arch to driver gpu/radeon: Set flag to indicate broken 64-bit MSI powerpc/powernv: Honor the generic "no_64bit_msi" flag
Bjorn Helgaas (1):
of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text
Boris Brezillon (1):
irqchip: atmel-aic: Fix irqdomain initialization
Charles Keepax (2):
ASoC: wm_adsp: Avoid attempt to free buffers that might still be in use
spi: Fix mapping from vmalloc-ed buffer to scatter list
Chris Mason (1):
btrfs: fix lockups from btrfs_clear_path_blocking
Chris Moore (1):
IB/isert: Adjust CQ size to HW limits
Christian Sünkenberg (1):
scsi: add Intel Multi-Flex to scsi scan blacklist
Christoph Hellwig (1):
nfsd: correctly define v4.2 support attributes
Cristina Ciocan (1):
iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
Daniel Borkmann (1):
ixgbe: fix use after free adapter->state test in ixgbe_remove/ixgbe_probe
Daniel Vetter (2):
drm/i915: drop WaSetupGtModeTdRowDispatch:snb drm/i915: Kick fbdev before vgacon
Dave Hansen (1):
x86: Require exact match for 'noxsave' command line option
David S. Miller (1):
sparc64: Fix constraints on swab helpers.
Dmitry Eremin-Solenikov (1):
ARM: 8216/1: xscale: correct auxiliary register in suspend/resume
Dmitry Torokhov (1):
brcmfmac: fix error handling of irq_of_parse_and_map
Fabio Estevam (1):
ASoC: sgtl5000: Fix SMALL_POP bit definition
Gavin Shan (1):
powerpc/powernv: Replace OPAL_DEASSERT_RESET with EEH_RESET_DEACTIVATE
Georgi Djakov (1):
clk: qcom: Fix duplicate rbcpr clock name
Grant Likely (1):
of/selftest: Fix off-by-one error in removal path
Greg Kroah-Hartman (2):
Input: xpad - use proper endpoint type
Linux 3.17.5
Gu Zheng (1):
aio: fix uncorrent dirty pages accouting when truncating AIO ring buffer
Hans de Goede (2):
usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000
USB: uas: Add no-uas quirk for Hitachi usb-3 enclosures 4971:1012
Hui Wang (1):
ALSA: hda - One more HP machine needs to change mute led quirk
James Cowgill (2):
MIPS: IP27: Fix __node_distances undefined error
MIPS: Loongson3: Fix __node_distances undefined error
James Hogan (1):
clk-divider: Fix READ_ONLY when divider > 1
Jane Zhou (1):
net/ping: handle protocol mismatching scenario
Jianqun (1):
ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl
Jiri Bohac (1):
ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg
Johan Hovold (3):
USB: ssu100: fix overrun-error reporting
USB: keyspan: fix overrun-error reporting
USB: keyspan: fix tty line-status reporting
Johannes Berg (1):
brcmfmac: don't include linux/unaligned/access_ok.h
Jurgen Kramer (1):
ALSA: usb-audio: Add ctrl message delay quirk for Marantz/Denon devices
Kees Cook (2):
x86, mm: Set NX across entire PMD at boot x86, kaslr: Handle Gold linker for finding bss/brk
Kevin Cernekee (1):
of: Fix crash if an earlycon driver is not found
Kuninori Morimoto (2):
ASoC: rsnd: remove unsupported PAUSE flag
ASoC: fsi: remove unsupported PAUSE flag
Larry Finger (1):
staging: r8188eu: Add new device ID for DLink GO-USB-N150
Laurent Dufour (1):
powerpc/pseries: Fix endiannes issue in RTAS call from xmon
Leonid Yegoshin (1):
MIPS: tlbex: Fix potential HTW race on TLBL/M/S handlers
Liad Kaufman (1):
iwlwifi: pcie: fix prph dump length
Lu Baolu (2):
usb: xhci: rework root port wake bits if controller isn't allowed to wakeup Revert "xhci: clear root port wake on bits if controller isn't wake-up capable"
Luciano Coelho (1):
iwlwifi: mvm: check TLV flag before trying to use hotspot firmware commands
Lv Zheng (1):
ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC
Mahesh Salgaonkar (1):
powerpc/powernv: Fix the hmi event version check.
Markos Chandras (5):
MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller
MIPS: tlb-r4k: Add missing HTW stop/start sequences
MIPS: asm: uaccess: Add v1 register to clobber list on EVA
MIPS: cpu-probe: Set the FTLB probability bit on supported cores
MIPS: r4kcache: Add EVA case for protected_writeback_dcache_line
Martin Hauke (1):
qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem
Mathias Krause (1):
pptp: fix stack info leak in pptp_getname()
Mathias Nyman (2):
USB: xhci: don't start a halted endpoint before its new dequeue is set
USB: xhci: Reset a halted endpoint immediately when we encounter a stall.
Matti Gottlieb (1):
iwlwifi: mvm: ROC - bug fixes around time events and locking
Maurizio Lombardi (1):
bnx2fc: do not add shared skbs to the fcoe_rx_list
Maxime COQUELIN (1):
bitops: Fix shift overflow in GENMASK macros
Maxime Ripard (2):
clockevent: sun4i: Fix race condition in the probe code
dmaengine: sun6i: Fix memcpy operation
Miaoqing Pan (1):
ath9k: Fix RTC_DERIVED_CLK usage
Nicholas Bellinger (1):
vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT
Nikolay Aleksandrov (1):
bonding: fix curr_active_slave/carrier with loadbalance arp monitoring
Or Gerlitz (3):
net/mlx4_en: Add VXLAN ndo calls to the PF net device ops too net/mlx4_en: Advertize encapsulation offloads features only when VXLAN tunnel is set
ib_isert: Add max_send_sge=2 minimum for control PDU responses
Panu Matilainen (1):
ipv4: Fix incorrect error code when adding an unreachable route
Paolo Bonzini (1):
x86: kvm: use alternatives for VMCALL vs. VMMCALL if kernel text is read-only
Paul Burton (1):
MIPS: fix EVA & non-SMP non-FPU FP context signal handling
Preston Fick (1):
USB: serial: cp210x: add IDs for CEL MeshConnect USB Stick
Qipan Li (1):
spi: sirf: fix word width configuration
Rafael J. Wysocki (1):
ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
Roland Dreier (1):
target: Don't call TFO->write_pending if data_length == 0
Ronald Wahl (1):
mac80211: Fix regression that triggers a kernel BUG with CCMP
Sagi Grimberg (1):
iser-target: Handle DEVICE_REMOVAL event on network portal listener correctly
Stanislaw Gruszka (1):
rt2x00: do not align payload on modern H/W
Takashi Iwai (2):
ASoC: dpcm: Fix race between FE/BE updates and trigger
ALSA: hda - Limit 40bit DMA for AMD HDMI controllers
Thomas Körper (1):
can: dev: avoid calling kfree_skb() from interrupt context
Thomas Petazzoni (3):
ASoC: cs42l51: re-hook of_match_table pointer
ARM: mvebu: add missing of_node_put() call in coherency.c
ARM: 8222/1: mvebu: enable strex backoff delay
Thor Thayer (1):
spi: dw: Fix dynamic speed change.
Trond Myklebust (1):
nfsd: Fix slot wake up race in the nfsv4.1 callback code
Troy Clark (1):
usb: serial: ftdi_sio: add PIDs for Matrix Orbital products
Ville Syrjälä (2):
drm/i915: Ignore SURFLIVE and flip counter when the GPU gets reset drm/i915: Ignore long hpds on eDP ports
Vincent BENAYOUN (1):
inetdevice: fixed signed integer overflow
Vlad Yasevich (1):
ixgbe: Correctly disable VLAN filter in promiscuous mode
Vladimir Murzin (1):
ARM: 8226/1: cacheflush: get rid of restarting block
Yinghai Lu (1):
PCI: Support 64-bit bridge windows if we have 64-bit dma_addr_t
bill bonaparte (1):
netfilter: conntrack: fix race in __nf_conntrack_confirm against get_next_corpse
Greg KH
maintainerDocumentation/devicetree/bindings/interrupt-controller/interrupts.txt +0 -4
@@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents. Example: interrupts-extended = <&intc1 5 1>, <&intc2 1 0>; -A device node may contain either "interrupts" or "interrupts-extended", but not -both. If both properties are present, then the operating system should log an -error and use only the data in "interrupts". - 2) Interrupt controller nodes -----------------------------
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 17 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = NAME = Shuffling Zombie Juror
arch/arm/include/asm/thread_info.h +0 -11
@@ -44,16 +44,6 @@ struct cpu_context_save {__u32 extra[2 ];/* Xscale 'acc' register, etc */ }; -struct arm_restart_block { -union { -/* For user cache flushing */ -struct { -unsigned long start; -unsigned long end; - } cache; - }; -}; -/* * low level task data that entry.S needs immediate access to. * __switch_to() assumes cpu_context follows immediately after cpu_domain.
@@ -79,7 +69,6 @@ struct thread_info {unsigned long thumbee_state;/* ThumbEE Handler Base register */ #endif struct restart_block restart_block; -struct arm_restart_block arm_restart_block; };#define INIT_THREAD_INFO (tsk) \
arch/arm/kernel/traps.c +2 -29
@@ -513,8 +513,6 @@ static int bad_syscall(int n, struct pt_regs *regs)return regs->ARM_r0; } -static long do_cache_op_restart (struct restart_block *); -static inline int __do_cache_op (unsigned long start,unsigned long end) {
@@ -523,24 +521,8 @@ __do_cache_op(unsigned long start, unsigned long end) do { unsigned long chunk = min(PAGE_SIZE, end - start); - if (signal_pending(current)) { - struct thread_info *ti = current_thread_info(); - - ti->restart_block = (struct restart_block) { - .fn = do_cache_op_restart, - }; - - ti->arm_restart_block = (struct arm_restart_block) { - { - .cache = { - .start = start, - .end = end, - }, - }, - }; - - return -ERESTART_RESTARTBLOCK; - } + if (fatal_signal_pending(current)) + return 0; ret = flush_cache_user_range(start, start + chunk); if (ret)
@@ -553,15 +535,6 @@ __do_cache_op(unsigned long start, unsigned long end)return 0 ; } -static long do_cache_op_restart (struct restart_block *unused) -{ -struct arm_restart_block *restart_block; - - restart_block = ¤t_thread_info ()->arm_restart_block; -return __do_cache_op (restart_block->cache.start, - restart_block->cache.end); -} -static inline int do_cache_op (unsigned long start,unsigned long end,int flags) {
arch/arm/mach-mvebu/coherency.c +2 -0
@@ -400,6 +400,8 @@ int __init coherency_init(void) type == COHERENCY_FABRIC_TYPE_ARMADA_380)armada_375_380_coherency_init (np); +of_node_put (np); +return 0 ; }
arch/arm/mm/proc-v7.S +0 -2
@@ -270,7 +270,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ #define PJ4B_STATIC_BP (1 << 2) /* Enable Static BP */ #define PJ4B_INTER_PARITY (1 << 8) /* Disable Internal Parity Handling */ -#define PJ4B_BCK_OFF_STREX (1 << 5) /* Enable the back off of STREX instr */ #define PJ4B_CLEAN_LINE (1 << 16) /* Disable data transfer for clean line */ /* Auxiliary Debug Modes Control 2 Register */
@@ -293,7 +292,6 @@ __v7_pj4b_setup: /* Auxiliary Debug Modes Control 1 Register */ mrc p15, 1, r0, c15, c1, 1 orr r0, r0, #PJ4B_CLEAN_LINE - orr r0, r0, #PJ4B_BCK_OFF_STREX orr r0, r0, #PJ4B_INTER_PARITY bic r0, r0, #PJ4B_STATIC_BP mcr p15, 1, r0, c15, c1, 1
arch/arm/mm/proc-xscale.S +2 -2
@@ -535,7 +535,7 @@ ENTRY(cpu_xscale_do_suspend) mrc p15, 0, r5, c15, c1, 0 @ CP access reg mrc p15, 0, r6, c13, c0, 0 @ PID mrc p15, 0, r7, c3, c0, 0 @ domain ID - mrc p15, 0, r8, c1, c1, 0 @ auxiliary control reg + mrc p15, 0, r8, c1, c0, 1 @ auxiliary control reg mrc p15, 0, r9, c1, c0, 0 @ control reg bic r4, r4, #2 @ clear frequency change bit stmia r0, {r4 - r9} @ store cp regs
@@ -552,7 +552,7 @@ ENTRY(cpu_xscale_do_resume) mcr p15, 0, r6, c13, c0, 0 @ PID mcr p15, 0, r7, c3, c0, 0 @ domain ID mcr p15, 0, r1, c2, c0, 0 @ translation table base addr - mcr p15, 0, r8, c1, c1, 0 @ auxiliary control reg + mcr p15, 0, r8, c1, c0, 1 @ auxiliary control reg mov r0, r9 @ control register b cpu_resume_mmu ENDPROC(cpu_xscale_do_resume)
arch/mips/include/asm/mipsregs.h +2 -0
@@ -661,6 +661,8 @@#define MIPS_CONF6_SYND (_ULCAST_(1) << 13)/* proAptiv FTLB on/off bit */ #define MIPS_CONF6_FTLBEN (_ULCAST_(1) << 15) +/* FTLB probability bits */ +#define MIPS_CONF6_FTLBP_SHIFT (16)#define MIPS_CONF7_WII (_ULCAST_(1) << 31)
arch/mips/include/asm/r4kcache.h +4 -0
@@ -257,7 +257,11 @@ static inline void protected_flush_icache_line(unsigned long addr)*/ static inline void protected_writeback_dcache_line (unsigned long addr) { +#ifdef CONFIG_EVA +protected_cachee_op (Hit_Writeback_Inv_D, addr); +#else protected_cache_op (Hit_Writeback_Inv_D, addr); +#endif }static inline void protected_writeback_scache_line (unsigned long addr)
arch/mips/include/asm/uaccess.h +4 -3
@@ -773,10 +773,11 @@ extern void __put_user_unaligned_unknown(void); "jal\t" #destination "\n\t"#endif -#ifndef CONFIG_CPU_DADDI_WORKAROUNDS -#define DADDI_SCRATCH "$0" -#else +#if defined(CONFIG_CPU_DADDI_WORKAROUNDS ) || (defined(CONFIG_EVA ) && \ + defined(CONFIG_CPU_HAS_PREFETCH ))#define DADDI_SCRATCH "$3" +#else +#define DADDI_SCRATCH "$0"#endif extern size_t __copy_user (void *__to,const void *__from,size_t __n);
arch/mips/kernel/cpu-probe.c +32 -1
@@ -192,6 +192,32 @@ static void set_isa(struct cpuinfo_mips *c, unsigned int isa)static char unknown_isa[] =KERN_ERR \"Unsupported ISA type, c0.config0: %d." ; +static unsigned int calculate_ftlb_probability (struct cpuinfo_mips *c) +{ + +unsigned int probability = c->tlbsize / c->tlbsizevtlb; + +/* +* 0 = All TLBWR instructions go to FTLB +* 1 = 15:1: For every 16 TBLWR instructions, 15 go to the +* FTLB and 1 goes to the VTLB. +* 2 = 7:1: As above with 7:1 ratio. +* 3 = 3:1: As above with 3:1 ratio. +* +* Use the linear midpoint as the probability threshold. +*/ +if (probability >=12 ) +return 1 ; +else if (probability >=6 ) +return 2 ; +else +/* +* So FTLB is less than 4 times bigger than VTLB. +* A 3:1 ratio can still be useful though. +*/ +return 3 ; +} +static void set_ftlb_enable (struct cpuinfo_mips *c,int enable) {unsigned int config6;
@@ -202,9 +228,14 @@ static void set_ftlb_enable(struct cpuinfo_mips *c, int enable)case CPU_P5600 :/* proAptiv & related cores use Config6 to enable the FTLB */ config6 =read_c0_config6 (); +/* Clear the old probability value */ + config6 &= ~(3 <<MIPS_CONF6_FTLBP_SHIFT );if (enable)/* Enable FTLB */ -write_c0_config6 (config6 |MIPS_CONF6_FTLBEN ); +write_c0_config6 (config6 | + (calculate_ftlb_probability (c) + <<MIPS_CONF6_FTLBP_SHIFT ) + |MIPS_CONF6_FTLBEN );else /* Disable FTLB */ write_c0_config6 (config6 & ~MIPS_CONF6_FTLBEN );
arch/mips/kernel/signal.c +4 -4
@@ -658,13 +658,13 @@ static int signal_setup(void) save_fp_context = _save_fp_context; restore_fp_context = _restore_fp_context; } else { - save_fp_context = copy_fp_from_sigcontext; - restore_fp_context = copy_fp_to_sigcontext; + save_fp_context = copy_fp_to_sigcontext; + restore_fp_context = copy_fp_from_sigcontext; }#endif /* CONFIG_SMP */ #else - save_fp_context = copy_fp_from_sigcontext;; - restore_fp_context = copy_fp_to_sigcontext; + save_fp_context = copy_fp_to_sigcontext; + restore_fp_context = copy_fp_from_sigcontext;#endif return 0 ;
arch/mips/lib/memcpy.S +1 -0
@@ -503,6 +503,7 @@ STOREB(t0, NBYTES-2(dst), .Ls_exc_p1\@) .Ldone\@: jr ra + nop .if __memcpy == 1 END(memcpy) .set __memcpy, 0
arch/mips/loongson/common/Makefile +2 -1
@@ -11,7 +11,8 @@ obj-$(CONFIG_PCI) += pci.o # Serial port support # obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_SERIAL_8250) += serial.o +loongson-serial-$(CONFIG_SERIAL_8250) := serial.o +obj-y += $(loongson-serial-m) $(loongson-serial-y) obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o obj-$(CONFIG_LOONGSON_MC146818) += rtc.o
arch/mips/loongson/loongson-3/numa.c +1 -0
@@ -33,6 +33,7 @@static struct node_data prealloc__node_data[MAX_NUMNODES ];unsigned char __node_distances[MAX_NUMNODES ][MAX_NUMNODES ]; +EXPORT_SYMBOL (__node_distances);struct node_data *__node_data[MAX_NUMNODES ];EXPORT_SYMBOL (__node_data);
arch/mips/mm/tlb-r4k.c +4 -0
@@ -299,6 +299,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)local_irq_save (flags); +htw_stop (); pid =read_c0_entryhi () &ASID_MASK ; address &= (PAGE_MASK <<1 );write_c0_entryhi (address | pid);
@@ -346,6 +347,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)tlb_write_indexed (); }tlbw_use_hazard (); +htw_start ();flush_itlb_vm (vma);local_irq_restore (flags); }
@@ -422,6 +424,7 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,local_irq_save (flags);/* Save old context and create impossible VPN2 value */ +htw_stop (); old_ctx =read_c0_entryhi (); old_pagemask =read_c0_pagemask (); wired =read_c0_wired ();
@@ -443,6 +446,7 @@ __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,write_c0_entryhi (old_ctx);write_c0_pagemask (old_pagemask); +htw_start (); out:local_irq_restore (flags);return ret;
arch/mips/mm/tlbex.c +9 -1
@@ -1872,8 +1872,16 @@ build_r4000_tlbchange_handler_head(u32 **p, struct uasm_label **l,uasm_l_smp_pgtable_change (l, *p);#endif iPTE_LW (p, wr.r1, wr.r2);/* get even pte */ -if (!m4kc_tlbp_war ()) +if (!m4kc_tlbp_war ()) {build_tlb_probe_entry (p); +if (cpu_has_htw) { +/* race condition happens, leaving */ +uasm_i_ehb (p); +uasm_i_mfc0 (p, wr.r3,C0_INDEX ); +uasm_il_bltz (p, r, wr.r3, label_leave); +uasm_i_nop (p); + } + }return wr; }
arch/mips/oprofile/backtrace.c +1 -1
@@ -92,7 +92,7 @@ static inline int unwind_user_frame(struct stackframe *old_frame,/* This marks the end of the previous function, which means we overran. */ break ; - stack_size = (unsigned ) stack_adjustment; + stack_size = (unsigned long ) stack_adjustment; }else if (is_ra_save_ins (&ip)) {int ra_slot = ip.i_format.simmediate;if (ra_slot <0 )
arch/mips/sgi-ip27/ip27-memory.c +1 -0
@@ -107,6 +107,7 @@ static void router_recurse(klrou_t *router_a, klrou_t *router_b, int depth) }unsigned char __node_distances[MAX_COMPACT_NODES ][MAX_COMPACT_NODES ]; +EXPORT_SYMBOL (__node_distances);static int __init compute_node_distance (nasid_t nasid_a,nasid_t nasid_b) {
arch/powerpc/kernel/vdso32/getcpu.S +2 -2
@@ -30,8 +30,8 @@ V_FUNCTION_BEGIN(__kernel_getcpu) .cfi_startproc mfspr r5,SPRN_SPRG_VDSO_READ - cmpdi cr0,r3,0 - cmpdi cr1,r4,0 + cmpwi cr0,r3,0 + cmpwi cr1,r4,0 clrlwi r6,r5,16 rlwinm r7,r5,16,31-15,31-0 beq cr0,1f
arch/powerpc/platforms/powernv/opal-hmi.c +1 -1
@@ -57,7 +57,7 @@ static void print_hmi_event_info(struct OpalHMIEvent *hmi_evt) };/* Print things out */ -if (hmi_evt->version != OpalHMIEvt_V1) { +if (hmi_evt->version < OpalHMIEvt_V1) {pr_err ("HMI Interrupt, Unknown event version %d !\n" , hmi_evt->version);return ;
arch/powerpc/platforms/powernv/pci-ioda.c +2 -3
@@ -1311,7 +1311,6 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev, unsigned int is_64, struct msi_msg *msg) { struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev); -struct pci_dn *pdn =pci_get_pdn (dev);struct irq_data *idata;struct irq_chip *ichip;unsigned int xive_num = hwirq - phb->msi_base;
@@ -1327,7 +1326,7 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev,return -ENXIO ;/* Force 32-bit MSI on some broken devices */ -if (pdn && pdn->force_32bit_msi) +if (dev->no_64bit_msi) is_64 =0 ;/* Assign XIVE to PE */
@@ -1815,7 +1814,7 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,if (is_kdump_kernel ()) {pr_info (" Issue PHB reset ...\n" );ioda_eeh_phb_reset (hose,EEH_RESET_FUNDAMENTAL ); -ioda_eeh_phb_reset (hose,OPAL_DEASSERT_RESET ); +ioda_eeh_phb_reset (hose,EEH_RESET_DEACTIVATE ); }/* Configure M64 window */
arch/powerpc/platforms/powernv/pci.c +2 -2
@@ -1,3 +1,4 @@ +/* * Support PCI/PCIe on PowerNV platforms *
@@ -50,9 +51,8 @@ static int pnv_msi_check_device(struct pci_dev* pdev, int nvec, int type) {struct pci_controller *hose =pci_bus_to_host (pdev->bus);struct pnv_phb *phb = hose->private_data; -struct pci_dn *pdn =pci_get_pdn (pdev); -if (pdn && pdn->force_32bit_msi && !phb->msi32_support) +if (pdev->no_64bit_msi && !phb->msi32_support)return -ENODEV ;return (phb && phb->msi_bmp.bitmap) ?0 : -ENODEV ;
arch/powerpc/platforms/pseries/msi.c +1 -1
@@ -429,7 +429,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type)*/ again:if (type ==PCI_CAP_ID_MSI ) { -if (pdn->force_32bit_msi) { +if (pdev->no_64bit_msi) { rc =rtas_change_msi (pdn,RTAS_CHANGE_32MSI_FN , nvec);if (rc <0 ) {/*
arch/powerpc/xmon/xmon.c +3 -3
@@ -293,10 +293,10 @@ static inline void disable_surveillance(void) args.token =rtas_token ("set-indicator" );if (args.token ==RTAS_UNKNOWN_SERVICE )return ; - args.nargs =3 ; - args.nret =1 ; + args.nargs =cpu_to_be32 (3 ); + args.nret =cpu_to_be32 (1 ); args.rets = &args.args[3 ]; - args.args[0 ] =SURVEILLANCE_TOKEN ; + args.args[0 ] =cpu_to_be32 (SURVEILLANCE_TOKEN ); args.args[1 ] =0 ; args.args[2 ] =0 ;enter_rtas (__pa (&args));
arch/sparc/include/uapi/asm/swab.h +6 -6
@@ -9,9 +9,9 @@ static inline __u16 __arch_swab16p(const __u16 *addr) {__u16 ret; - __asm__ __volatile__ ("lduha [%1] %2, %0" + __asm__ __volatile__ ("lduha [%2] %3, %0" :"=r" (ret) - :"r" (addr),"i" (ASI_PL )); + :"m" (*addr),"r" (addr),"i" (ASI_PL ));return ret; }#define __arch_swab16p __arch_swab16p
@@ -20,9 +20,9 @@ static inline __u32 __arch_swab32p(const __u32 *addr) {__u32 ret; - __asm__ __volatile__ ("lduwa [%1] %2, %0" + __asm__ __volatile__ ("lduwa [%2] %3, %0" :"=r" (ret) - :"r" (addr),"i" (ASI_PL )); + :"m" (*addr),"r" (addr),"i" (ASI_PL ));return ret; }#define __arch_swab32p __arch_swab32p
@@ -31,9 +31,9 @@ static inline __u64 __arch_swab64p(const __u64 *addr) {__u64 ret; - __asm__ __volatile__ ("ldxa [%1] %2, %0" + __asm__ __volatile__ ("ldxa [%2] %3, %0" :"=r" (ret) - :"r" (addr),"i" (ASI_PL )); + :"m" (*addr),"r" (addr),"i" (ASI_PL ));return ret; }#define __arch_swab64p __arch_swab64p
arch/x86/include/asm/cpufeature.h +1 -0
@@ -202,6 +202,7 @@#define X86_FEATURE_DECODEASSISTS ( 8*32+12)/* AMD Decode Assists support */ #define X86_FEATURE_PAUSEFILTER ( 8*32+13)/* AMD filtered pause intercept */ #define X86_FEATURE_PFTHRESHOLD ( 8*32+14)/* AMD pause filter threshold */ +#define X86_FEATURE_VMMCALL ( 8*32+15)/* Prefer vmmcall to vmcall */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
arch/x86/include/asm/kvm_para.h +8 -2
@@ -2,6 +2,7 @@#define _ASM_X86_KVM_PARA_H#include <asm/processor.h> +#include <asm/alternative.h> #include <uapi/asm/kvm_para.h> extern void kvmclock_init (void );
@@ -16,10 +17,15 @@ static inline bool kvm_check_and_clear_guest_paused(void) }#endif /* CONFIG_KVM_GUEST */ -/* This instruction is vmcall. On non-VT architectures, it will generate a -* trap that we will then rewrite to the appropriate instruction. +#ifdef CONFIG_DEBUG_RODATA +#define KVM_HYPERCALL \ + ALTERNATIVE(".byte 0x0f,0x01,0xc1", ".byte 0x0f,0x01,0xd9", X86_FEATURE_VMMCALL) +#else +/* On AMD processors, vmcall will generate a trap that we will +* then rewrite to the appropriate instruction. */ #define KVM_HYPERCALL ".byte 0x0f,0x01,0xc1" +#endif /* For KVM hypercalls, a three-byte sequence of either the vmcall or the vmmcall * instruction. The hypervisor may replace it with something else but only the
arch/x86/include/asm/page_32_types.h +0 -1
@@ -20,7 +20,6 @@#define THREAD_SIZE_ORDER 1#define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) -#define STACKFAULT_STACK 0#define DOUBLEFAULT_STACK 1#define NMI_STACK 0#define DEBUG_STACK 0
arch/x86/include/asm/page_64_types.h +5 -6
@@ -14,12 +14,11 @@#define IRQ_STACK_ORDER 2#define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER) -#define STACKFAULT_STACK 1 -#define DOUBLEFAULT_STACK 2 -#define NMI_STACK 3 -#define DEBUG_STACK 4 -#define MCE_STACK 5 -#define N_EXCEPTION_STACKS 5/* hw limit: 7 */ +#define DOUBLEFAULT_STACK 1 +#define NMI_STACK 2 +#define DEBUG_STACK 3 +#define MCE_STACK 4 +#define N_EXCEPTION_STACKS 4/* hw limit: 7 */ #define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT)#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1))
arch/x86/include/asm/thread_info.h +1 -1
@@ -141,7 +141,7 @@ struct thread_info {/* Only used for 64 bit */ #define _TIF_DO_NOTIFY_MASK \ (_TIF_SIGPENDING | _TIF_MCE_NOTIFY | _TIF_NOTIFY_RESUME | \ - _TIF_USER_RETURN_NOTIFY) + _TIF_USER_RETURN_NOTIFY | _TIF_UPROBE)/* flags to check in __switch_to() */ #define _TIF_WORK_CTXSW \
arch/x86/include/asm/traps.h +1 -0
@@ -39,6 +39,7 @@ asmlinkage void simd_coprocessor_error(void);#ifdef CONFIG_TRACING asmlinkage void trace_page_fault(void); +#define trace_stack_segment stack_segment#define trace_divide_error divide_error#define trace_bounds bounds#define trace_invalid_op invalid_op
arch/x86/kernel/cpu/amd.c +7 -0
@@ -525,6 +525,13 @@ static void early_init_amd(struct cpuinfo_x86 *c) }#endif +/* +* This is only needed to tell the kernel whether to use VMCALL +* and VMMCALL. VMMCALL is never executed except under virt, so +* we can set it unconditionally. +*/ +set_cpu_cap (c,X86_FEATURE_VMMCALL ); +/* F16h erratum 793, CVE-2013-6885 */ if (c->x86 ==0x16 && c->x86_model <=0xf )msr_set_bit (MSR_AMD64_LS_CFG ,15 );
arch/x86/kernel/cpu/common.c +2 -0
@@ -146,6 +146,8 @@ EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);static int __init x86_xsave_setup (char *s) { +if (strlen (s)) +return 0 ;setup_clear_cpu_cap (X86_FEATURE_XSAVE );setup_clear_cpu_cap (X86_FEATURE_XSAVEOPT );setup_clear_cpu_cap (X86_FEATURE_XSAVES );
arch/x86/kernel/dumpstack_64.c +0 -1
@@ -24,7 +24,6 @@ static char x86_stack_ids[][8] = { [ DEBUG_STACK-1 ] = "#DB", [ NMI_STACK-1 ] = "NMI", [ DOUBLEFAULT_STACK-1 ] = "#DF", - [ STACKFAULT_STACK-1 ] = "#SS", [ MCE_STACK-1 ] = "#MC", #if DEBUG_STKSZ > EXCEPTION_STKSZ [ N_EXCEPTION_STACKS ...
arch/x86/kernel/entry_64.S +22 -59
131 lines not on this page · raw message
arch/x86/kernel/traps.c +54 -17
99 lines not on this page · raw message
arch/x86/mm/init_64.c +10 -1
@@ -1111,7 +1111,7 @@ void mark_rodata_ro(void)unsigned long end = (unsigned long ) &__end_rodata_hpage_align;unsigned long text_end =PFN_ALIGN (&__stop___ex_table);unsigned long rodata_end =PFN_ALIGN (&__end_rodata); -unsigned long all_end =PFN_ALIGN (&_end); +unsigned long all_end;printk (KERN_INFO "Write protecting the kernel read-only data: %luk\n" , (end - start) >>10 );
@@ -1122,7 +1122,16 @@ void mark_rodata_ro(void)/* * The rodata/data/bss/brk section (but not the kernel text!) * should also be not-executable. +* +* We align all_end to PMD_SIZE because the existing mapping +* is a full PMD. If we would align _brk_end to PAGE_SIZE we +* split the PMD and the reminder between _brk_end and the end +* of the PMD will remain mapped executable. +* +* Any PMD which was setup after the one which covers _brk_end +* has been zapped already via cleanup_highmem(). */ + all_end =roundup ((unsigned long )_brk_end,PMD_SIZE );set_memory_nx (rodata_start, (all_end - rodata_start) >>PAGE_SHIFT );rodata_test ();
arch/x86/tools/calc_run_size.pl +10 -1
@@ -19,7 +19,16 @@ while (<>) { if ($file_offset == 0) { $file_offset = $offset; } elsif ($file_offset != $offset) { - die ".bss and .brk lack common file offset\n"; + # BFD linker shows the same file offset in ELF. + # Gold linker shows them as consecutive. + next if ($file_offset + $mem_size == $offset + $size); + + printf STDERR "file_offset: 0x%lx\n", $file_offset; + printf STDERR "mem_size: 0x%lx\n", $mem_size; + printf STDERR "offset: 0x%lx\n", $offset; + printf STDERR "size: 0x%lx\n", $size; + + die ".bss and .brk are non-contiguous\n"; } } }
drivers/acpi/device_pm.c +1 -1
@@ -877,7 +877,7 @@ int acpi_dev_suspend_late(struct device *dev)return 0 ; target_state =acpi_target_system_state (); - wakeup =device_may_wakeup (dev); + wakeup =device_may_wakeup (dev) &&acpi_device_can_wakeup (adev); error =acpi_device_wakeup (adev, target_state, wakeup);if (wakeup && error)return error;
drivers/acpi/ec.c +2 -2
@@ -299,11 +299,11 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec,/* following two actions should be kept atomic */ ec->curr = t;start_transaction (ec); +if (ec->curr->command ==ACPI_EC_COMMAND_QUERY ) +clear_bit (EC_FLAGS_QUERY_PENDING , &ec->flags);spin_unlock_irqrestore (&ec->lock, tmp); ret =ec_poll (ec);spin_lock_irqsave (&ec->lock, tmp); -if (ec->curr->command ==ACPI_EC_COMMAND_QUERY ) -clear_bit (EC_FLAGS_QUERY_PENDING , &ec->flags); ec->curr =NULL ;spin_unlock_irqrestore (&ec->lock, tmp);return ret;
drivers/clk/clk-divider.c +9 -9
@@ -263,6 +263,14 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,if (!rate) rate =1 ; +/* if read only, just return current value */ +if (divider->flags &CLK_DIVIDER_READ_ONLY ) { + bestdiv =readl (divider->reg) >> divider->shift; + bestdiv &=div_mask (divider); + bestdiv =_get_div (divider, bestdiv); +return bestdiv; + } + maxdiv =_get_maxdiv (divider);if (!(__clk_get_flags (hw->clk) &CLK_SET_RATE_PARENT )) {
@@ -361,11 +369,6 @@ const struct clk_ops clk_divider_ops = { };EXPORT_SYMBOL_GPL (clk_divider_ops); -const struct clk_ops clk_divider_ro_ops = { - .recalc_rate = clk_divider_recalc_rate, -}; -EXPORT_SYMBOL_GPL (clk_divider_ro_ops); - static struct clk *_register_divider(struct device *dev, const char *name, const char *parent_name, unsigned long flags, void __iomem *reg, u8 shift, u8 width,
@@ -391,10 +394,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, } init.name = name; -if (clk_divider_flags &CLK_DIVIDER_READ_ONLY ) - init.ops = &clk_divider_ro_ops; -else - init.ops = &clk_divider_ops; + init.ops = &clk_divider_ops; init.flags = flags |CLK_IS_BASIC ; init.parent_names = (parent_name ? &parent_name:NULL ); init.num_parents = (parent_name ?1 :0 );
drivers/clk/qcom/mmcc-apq8084.c +1 -1
@@ -3122,7 +3122,7 @@ static struct clk_regmap *mmcc_apq8084_clocks[] = { [ESC1_CLK_SRC] = &esc1_clk_src.clkr, [HDMI_CLK_SRC] = &hdmi_clk_src.clkr, [VSYNC_CLK_SRC] = &vsync_clk_src.clkr, - [RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr, + [MMSS_RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr, [RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr, [MAPLE_CLK_SRC] = &maple_clk_src.clkr, [VDP_CLK_SRC] = &vdp_clk_src.clkr,
drivers/clk/rockchip/clk.c +1 -3
@@ -89,9 +89,7 @@ struct clk *rockchip_clk_register_branch(const char *name, div->width = div_width; div->lock = lock; div->table = div_table; - div_ops = (div_flags &CLK_DIVIDER_READ_ONLY ) - ? &clk_divider_ro_ops - : &clk_divider_ops; + div_ops = &clk_divider_ops; } clk = clk_register_composite(NULL, name, parent_names, num_parents,
drivers/clocksource/sun4i_timer.c +6 -6
@@ -182,6 +182,12 @@ static void __init sun4i_timer_init(struct device_node *node)/* Make sure timer is stopped before playing with interrupts */ sun4i_clkevt_time_stop (0 ); + sun4i_clockevent.cpumask = cpu_possible_mask; + sun4i_clockevent.irq = irq; + +clockevents_config_and_register (&sun4i_clockevent, rate, +TIMER_SYNC_TICKS ,0xffffffff ); + ret =setup_irq (irq, &sun4i_timer_irq);if (ret)pr_warn ("failed to setup irq %d\n" , irq);
@@ -189,12 +195,6 @@ static void __init sun4i_timer_init(struct device_node *node)/* Enable timer0 interrupt */ val =readl (timer_base +TIMER_IRQ_EN_REG );writel (val |TIMER_IRQ_EN (0 ), timer_base +TIMER_IRQ_EN_REG ); - - sun4i_clockevent.cpumask = cpu_possible_mask; - sun4i_clockevent.irq = irq; - -clockevents_config_and_register (&sun4i_clockevent, rate, -TIMER_SYNC_TICKS ,0xffffffff ); }CLOCKSOURCE_OF_DECLARE (sun4i,"allwinner,sun4i-a10-timer" , sun4i_timer_init);
drivers/dma/sun6i-dma.c +30 -31
125 lines not on this page · raw message
drivers/gpu/drm/i915/i915_dma.c +6 -4
@@ -1670,15 +1670,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto out_regs;if (drm_core_check_feature (dev,DRIVER_MODESET )) { - ret =i915_kick_out_vgacon (dev_priv); +/* WARNING: Apparently we must kick fbdev drivers before vgacon, +* otherwise the vga fbdev driver falls over. */ + ret =i915_kick_out_firmware_fb (dev_priv);if (ret) { -DRM_ERROR ("failed to remove conflicting VGA console\n" ); +DRM_ERROR ("failed to remove conflicting framebuffer drivers\n" ); goto out_gtt; } - ret =i915_kick_out_firmware_fb (dev_priv); + ret =i915_kick_out_vgacon (dev_priv);if (ret) { -DRM_ERROR ("failed to remove conflicting framebuffer drivers\n" ); +DRM_ERROR ("failed to remove conflicting VGA console\n" ); goto out_gtt; } }
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -9217,6 +9217,10 @@ static bool page_flip_finished(struct intel_crtc *crtc)struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +if (i915_reset_in_progress (&dev_priv->gpu_error) || + crtc->reset_counter !=atomic_read (&dev_priv->gpu_error.reset_counter)) +return true; +/* * The relevant registers doen't exist on pre-ctg. * As the flip done interrupt doesn't trigger for mmio
drivers/gpu/drm/i915/intel_dp.c +12 -0
@@ -4084,6 +4084,18 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)if (intel_dig_port->base.type !=INTEL_OUTPUT_EDP ) intel_dig_port->base.type =INTEL_OUTPUT_DISPLAYPORT ; +if (long_hpd && intel_dig_port->base.type ==INTEL_OUTPUT_EDP ) { +/* +* vdd off can generate a long pulse on eDP which +* would require vdd on to handle it, and thus we +* would end up in an endless cycle of +* "vdd off -> long hpd -> vdd on -> detect -> vdd off -> ..." +*/ +DRM_DEBUG_KMS ("ignoring long hpd on eDP port %c\n" , +port_name (intel_dig_port->port)); +return false; + } +DRM_DEBUG_KMS ("got hpd irq on port %d - %s\n" , intel_dig_port->port, long_hpd ?"long" :"short" );
drivers/gpu/drm/i915/intel_pm.c +0 -5
@@ -5247,11 +5247,6 @@ static void gen6_init_clock_gating(struct drm_device *dev)I915_WRITE (_3D_CHICKEN,_MASKED_BIT_ENABLE (_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB)); -/* WaSetupGtModeTdRowDispatch:snb */ -if (IS_SNB_GT1 (dev)) -I915_WRITE (GEN6_GT_MODE , -_MASKED_BIT_ENABLE (GEN6_TD_FOUR_ROW_DISPATCH_DISABLE )); -/* WaDisable_RenderCache_OperationalFlush:snb */ I915_WRITE (CACHE_MODE_0 ,_MASKED_BIT_DISABLE (RC_OP_FLUSH_ENABLE ));
drivers/gpu/drm/radeon/dce3_1_afmt.c +1 -1
@@ -32,7 +32,7 @@ static void dce3_2_afmt_write_speaker_allocation(struct drm_encoder *encoder)struct drm_connector *connector;struct radeon_connector *radeon_connector =NULL ;u32 tmp; -u8 *sadb; +u8 *sadb =NULL ;int sad_count;list_for_each_entry (connector, &encoder->dev->mode_config.connector_list, head) {
drivers/gpu/drm/radeon/dce6_afmt.c +1 -1
@@ -155,7 +155,7 @@ void dce6_afmt_write_speaker_allocation(struct drm_encoder *encoder)struct drm_connector *connector;struct radeon_connector *radeon_connector =NULL ;u32 offset, tmp; -u8 *sadb; +u8 *sadb =NULL ;int sad_count;if (!dig || !dig->afmt || !dig->afmt->pin)
drivers/gpu/drm/radeon/evergreen_hdmi.c +1 -1
@@ -102,7 +102,7 @@ static void dce4_afmt_write_speaker_allocation(struct drm_encoder *encoder)struct drm_connector *connector;struct radeon_connector *radeon_connector =NULL ;u32 tmp; -u8 *sadb; +u8 *sadb =NULL ;int sad_count;list_for_each_entry (connector, &encoder->dev->mode_config.connector_list, head) {
drivers/gpu/drm/radeon/r600_dpm.c +1 -1
@@ -1255,7 +1255,7 @@ int r600_parse_extended_power_table(struct radeon_device *rdev) (mode_info->atom_context->bios + data_offset +le16_to_cpu (ext_hdr->usPowerTuneTableOffset)); rdev->pm.dpm.dyn_state.cac_tdp_table->maximum_power_delivery_limit = - ppt->usMaximumPowerDeliveryLimit; +le16_to_cpu (ppt->usMaximumPowerDeliveryLimit); pt = &ppt->power_tune_table; }else { ATOM_PPLIB_POWERTUNE_Table *ppt = (ATOM_PPLIB_POWERTUNE_Table *)
drivers/gpu/drm/radeon/radeon_connectors.c +18 -1
@@ -322,6 +322,12 @@ static void radeon_connector_get_edid(struct drm_connector *connector) }if (!radeon_connector->edid) { +/* don't fetch the edid from the vbios if ddc fails and runpm is +* enabled so we report disconnected. +*/ +if ((rdev->flags &RADEON_IS_PX ) && (radeon_runtime_pm !=0 )) +return ; +if (rdev->is_atom_bios) {/* some laptops provide a hardcoded edid in rom for LCDs */ if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) ||
@@ -826,6 +832,8 @@ static int radeon_lvds_mode_valid(struct drm_connector *connector,static enum drm_connector_status radeon_lvds_detect (struct drm_connector *connector,bool force) { +struct drm_device *dev = connector->dev; +struct radeon_device *rdev = dev->dev_private;struct radeon_connector *radeon_connector =to_radeon_connector (connector);struct drm_encoder *encoder =radeon_best_single_encoder (connector);enum drm_connector_status ret = connector_status_disconnected;
@@ -842,7 +850,11 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)/* check if panel is valid */ if (native_mode->hdisplay >=320 && native_mode->vdisplay >=240 ) ret = connector_status_connected; - +/* don't fetch the edid from the vbios if ddc fails and runpm is +* enabled so we report disconnected. +*/ +if ((rdev->flags &RADEON_IS_PX ) && (radeon_runtime_pm !=0 )) + ret = connector_status_disconnected; }/* check for edid as well */
@@ -1589,6 +1601,11 @@ radeon_dp_detect(struct drm_connector *connector, bool force)/* check if panel is valid */ if (native_mode->hdisplay >=320 && native_mode->vdisplay >=240 ) ret = connector_status_connected; +/* don't fetch the edid from the vbios if ddc fails and runpm is +* enabled so we report disconnected. +*/ +if ((rdev->flags &RADEON_IS_PX ) && (radeon_runtime_pm !=0 )) + ret = connector_status_disconnected; }/* eDP is always DP */ radeon_dig_connector->dp_sink_type =CONNECTOR_OBJECT_ID_DISPLAYPORT ;
drivers/gpu/drm/radeon/radeon_encoders.c +3 -0
@@ -179,6 +179,9 @@ static void radeon_encoder_add_backlight(struct radeon_encoder *radeon_encoder, (rdev->pdev->subsystem_vendor == 0x1734) && (rdev->pdev->subsystem_device == 0x1107)) use_bl = false; +/* disable native backlight control on older asics */ + else if (rdev->family < CHIP_R600) + use_bl = false; else use_bl = true; }
drivers/gpu/drm/radeon/radeon_irq_kms.c +10 -0
@@ -202,6 +202,16 @@ static bool radeon_msi_ok(struct radeon_device *rdev)if (rdev->flags &RADEON_IS_AGP )return false; +/* +* Older chips have a HW limitation, they can only generate 40 bits +* of address for "64-bit" MSIs which breaks on some platforms, notably +* IBM POWER servers, so we limit them +*/ +if (rdev->family <CHIP_BONAIRE ) { +dev_info (rdev->dev,"radeon: MSI limited to 32-bit\n" ); + rdev->pdev->no_64bit_msi =1 ; + } +/* force MSI on */ if (radeon_msi ==1 )return true;
drivers/hwmon/g762.c +2 -4
@@ -1084,10 +1084,8 @@ static int g762_probe(struct i2c_client *client, const struct i2c_device_id *id)if (ret) goto clock_dis; - data->hwmon_dev =devm_hwmon_device_register_with_groups (dev, - client->name, - data, - g762_groups); + data->hwmon_dev =hwmon_device_register_with_groups (dev, client->name, + data, g762_groups);if (IS_ERR (data->hwmon_dev)) { ret =PTR_ERR (data->hwmon_dev); goto clock_dis;
drivers/iio/adc/men_z188_adc.c +1 -0
@@ -152,6 +152,7 @@ static void men_z188_remove(struct mcb_device *dev)static const struct mcb_device_id men_z188_ids[] = { { .device =0xbc }, + { } };MODULE_DEVICE_TABLE (mcb, men_z188_ids);
drivers/infiniband/ulp/isert/ib_isert.c +30 -14
111 lines not on this page · raw message
drivers/infiniband/ulp/srpt/ib_srpt.c +8 -0
@@ -2092,6 +2092,7 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch)if (!qp_init) goto out; +retry: ch->cq =ib_create_cq (sdev->device, srpt_completion,NULL , ch, ch->rq_size + srp_sq_size,0 );if (IS_ERR (ch->cq)) {
@@ -2115,6 +2116,13 @@ static int srpt_create_ch_ib(struct srpt_rdma_ch *ch) ch->qp =ib_create_qp (sdev->pd, qp_init);if (IS_ERR (ch->qp)) { ret =PTR_ERR (ch->qp); +if (ret == -ENOMEM ) { + srp_sq_size /=2 ; +if (srp_sq_size >=MIN_SRPT_SQ_SIZE ) { +ib_destroy_cq (ch->cq); + goto retry; + } + }printk (KERN_ERR "failed to create_qp ret= %d\n" , ret); goto err_destroy_cq; }
drivers/input/joystick/xpad.c +13 -3
@@ -1143,9 +1143,19 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id } ep_irq_in = &intf->cur_altsetting->endpoint[1 ].desc; -usb_fill_bulk_urb (xpad->bulk_out, udev, -usb_sndbulkpipe (udev, ep_irq_in->bEndpointAddress), - xpad->bdata,XPAD_PKT_LEN , xpad_bulk_out, xpad); +if (usb_endpoint_is_bulk_out (ep_irq_in)) { +usb_fill_bulk_urb (xpad->bulk_out, udev, +usb_sndbulkpipe (udev, + ep_irq_in->bEndpointAddress), + xpad->bdata,XPAD_PKT_LEN , + xpad_bulk_out, xpad); + }else { +usb_fill_int_urb (xpad->bulk_out, udev, +usb_sndintpipe (udev, + ep_irq_in->bEndpointAddress), + xpad->bdata,XPAD_PKT_LEN , + xpad_bulk_out, xpad,0 ); + }/* * Submit the int URB immediately rather than waiting for open
drivers/input/mouse/synaptics.c +4 -0
@@ -143,6 +143,10 @@ static const struct min_max_quirk min_max_pnpid_table[] = { (const char * const []){"LEN2001", NULL}, 1024, 5022, 2508, 4832 }, + { + (const char *const []){"LEN2006" ,NULL }, +1264 ,5675 ,1171 ,4688 + }, { } };
drivers/irqchip/irq-atmel-aic-common.c +3 -3
@@ -217,8 +217,9 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, } ret =irq_alloc_domain_generic_chips (domain,32 ,1 , name, - handle_level_irq,0 ,0 , -IRQCHIP_SKIP_SET_WAKE ); + handle_fasteoi_irq, +IRQ_NOREQUEST |IRQ_NOPROBE | +IRQ_NOAUTOEN ,0 ,0 );if (ret) goto err_domain_remove;
@@ -230,7 +231,6 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node, gc->unused =0 ; gc->wake_enabled = ~0 ; gc->chip_types[0 ].type =IRQ_TYPE_SENSE_MASK ; - gc->chip_types[0 ].handler = handle_fasteoi_irq; gc->chip_types[0 ].chip.irq_eoi = irq_gc_eoi; gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; gc->chip_types[0 ].chip.irq_shutdown = aic_common_shutdown;
drivers/net/bonding/bond_main.c +2 -2
@@ -2498,9 +2498,9 @@ static void bond_loadbalance_arp_mon(struct work_struct *work)if (!rtnl_trylock ()) goto re_arm; -if (slave_state_changed) { +if (slave_state_changed)bond_slave_state_change (bond); - }else if (do_failover) { +if (do_failover) {/* the bond_select_active_slave must hold RTNL * and curr_slave_lock for write. */
drivers/net/can/dev.c +1 -1
@@ -383,7 +383,7 @@ void can_free_echo_skb(struct net_device *dev, unsigned int idx)BUG_ON (idx >= priv->echo_skb_max);if (priv->echo_skb[idx]) { -kfree_skb (priv->echo_skb[idx]); +dev_kfree_skb_any (priv->echo_skb[idx]); priv->echo_skb[idx] =NULL ; } }
drivers/net/can/usb/esd_usb2.c +1 -0
@@ -1143,6 +1143,7 @@ static void esd_usb2_disconnect(struct usb_interface *intf) } }unlink_all_urbs (dev); +kfree (dev); } }
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8 -4
@@ -4059,8 +4059,8 @@ void ixgbe_set_rx_mode(struct net_device *netdev)* if SR-IOV and VMDQ are disabled - otherwise ensure * that hardware VLAN filters remain enabled. */ -if (!(adapter->flags & (IXGBE_FLAG_VMDQ_ENABLED | -IXGBE_FLAG_SRIOV_ENABLED ))) +if (adapter->flags & (IXGBE_FLAG_VMDQ_ENABLED | +IXGBE_FLAG_SRIOV_ENABLED )) vlnctrl |= (IXGBE_VLNCTRL_VFE |IXGBE_VLNCTRL_CFIEN ); }else {if (netdev->flags &IFF_ALLMULTI ) {
@@ -8084,6 +8084,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)int i, err, pci_using_dac, expected_gts;unsigned int indices =MAX_TX_QUEUES ;u8 part_str[IXGBE_PBANUM_LENGTH ]; +bool disable_dev = false;#ifdef IXGBE_FCOE u16 device_caps;#endif
@@ -8477,13 +8478,14 @@ err_sw_init:iounmap (adapter->io_addr);kfree (adapter->mac_table); err_ioremap: + disable_dev = !test_and_set_bit (__IXGBE_DISABLED, &adapter->state);free_netdev (netdev); err_alloc_etherdev:pci_release_selected_regions (pdev,pci_select_bars (pdev,IORESOURCE_MEM )); err_pci_reg: err_dma: -if (!adapter || !test_and_set_bit (__IXGBE_DISABLED, &adapter->state)) +if (!adapter || disable_dev)pci_disable_device (pdev);return err; }
@@ -8501,6 +8503,7 @@ static void ixgbe_remove(struct pci_dev *pdev) {struct ixgbe_adapter *adapter =pci_get_drvdata (pdev);struct net_device *netdev = adapter->netdev; +bool disable_dev;ixgbe_dbg_adapter_exit (adapter);
@@ -8550,11 +8553,12 @@ static void ixgbe_remove(struct pci_dev *pdev)e_dev_info ("complete\n" );kfree (adapter->mac_table); + disable_dev = !test_and_set_bit (__IXGBE_DISABLED, &adapter->state);free_netdev (netdev);pci_disable_pcie_error_reporting (pdev); -if (!test_and_set_bit (__IXGBE_DISABLED, &adapter->state)) +if (disable_dev)pci_disable_device (pdev); }
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +19 -9
@@ -1693,7 +1693,7 @@ int mlx4_en_start_port(struct net_device *dev)mlx4_set_stats_bitmap (mdev->dev, &priv->stats_bitmap);#ifdef CONFIG_MLX4_EN_VXLAN -if (priv->mdev->dev->caps.flags2 &MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS ) +if (priv->mdev->dev->caps.tunnel_offload_mode ==MLX4_TUNNEL_OFFLOAD_MODE_VXLAN )vxlan_get_rx_port (dev);#endif priv->port_up = true;
@@ -2281,8 +2281,16 @@ static void mlx4_en_add_vxlan_offloads(struct work_struct *work) ret =mlx4_SET_PORT_VXLAN (priv->mdev->dev, priv->port,VXLAN_STEER_BY_OUTER_MAC ,1 ); out: -if (ret) +if (ret) {en_err (priv,"failed setting L2 tunnel configuration ret %d\n" , ret); +return ; + } + +/* set offloads */ + priv->dev->hw_enc_features |=NETIF_F_IP_CSUM |NETIF_F_RXCSUM | +NETIF_F_TSO |NETIF_F_GSO_UDP_TUNNEL ; + priv->dev->hw_features |=NETIF_F_GSO_UDP_TUNNEL ; + priv->dev->features |=NETIF_F_GSO_UDP_TUNNEL ; }static void mlx4_en_del_vxlan_offloads (struct work_struct *work)
@@ -2290,6 +2298,11 @@ static void mlx4_en_del_vxlan_offloads(struct work_struct *work)int ret; struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv, vxlan_del_task); +/* unset offloads */ + priv->dev->hw_enc_features &= ~(NETIF_F_IP_CSUM |NETIF_F_RXCSUM | +NETIF_F_TSO |NETIF_F_GSO_UDP_TUNNEL ); + priv->dev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL ; + priv->dev->features &= ~NETIF_F_GSO_UDP_TUNNEL ; ret =mlx4_SET_PORT_VXLAN (priv->mdev->dev, priv->port,VXLAN_STEER_BY_OUTER_MAC ,0 );
@@ -2403,6 +2416,10 @@ static const struct net_device_ops mlx4_netdev_ops_master = { .ndo_rx_flow_steer = mlx4_en_filter_rfs, #endif .ndo_get_phys_port_id = mlx4_en_get_phys_port_id, +#ifdef CONFIG_MLX4_EN_VXLAN + .ndo_add_vxlan_port = mlx4_en_add_vxlan_port, + .ndo_del_vxlan_port = mlx4_en_del_vxlan_port, +#endif }; int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
@@ -2567,13 +2584,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,if (mdev->dev->caps.steering_mode !=MLX4_STEERING_MODE_A0 ) dev->priv_flags |=IFF_UNICAST_FLT ; -if (mdev->dev->caps.tunnel_offload_mode ==MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ) { - dev->hw_enc_features |=NETIF_F_IP_CSUM |NETIF_F_RXCSUM | -NETIF_F_TSO |NETIF_F_GSO_UDP_TUNNEL ; - dev->hw_features |=NETIF_F_GSO_UDP_TUNNEL ; - dev->features |=NETIF_F_GSO_UDP_TUNNEL ; - } - mdev->pndev[port] = dev;netif_carrier_off (dev);
drivers/net/ieee802154/fakehard.c +8 -5
@@ -377,17 +377,20 @@ static int ieee802154fake_probe(struct platform_device *pdev) err =wpan_phy_register (phy);if (err) - goto out; + goto err_phy_reg; err =register_netdev (dev); -if (err <0 ) - goto out; +if (err) + goto err_netdev_reg;dev_info (&pdev->dev,"Added ieee802154 HardMAC hardware\n" );return 0 ; -out: -unregister_netdev (dev); +err_netdev_reg: +wpan_phy_unregister (phy); +err_phy_reg: +free_netdev (dev); +wpan_phy_free (phy);return err; }
drivers/net/ppp/pptp.c +3 -1
@@ -506,7 +506,9 @@ static int pptp_getname(struct socket *sock, struct sockaddr *uaddr,int len =sizeof (struct sockaddr_pppox );struct sockaddr_pppox sp; - sp.sa_family =AF_PPPOX ; +memset (&sp.sa_addr,0 ,sizeof (sp.sa_addr)); + + sp.sa_family =AF_PPPOX ; sp.sa_protocol =PX_PROTO_PPTP ; sp.sa_addr.pptp =pppox_sk (sock->sk)->proto.pptp.src_addr;
drivers/net/usb/qmi_wwan.c +1 -0
@@ -780,6 +780,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */ {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ + {QMI_FIXED_INTF(0x03f0, 0x581d, 4)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) *//* 4. Gobi 1000 devices */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
drivers/net/wireless/ath/ath9k/ar9003_phy.c +13 -0
@@ -647,6 +647,19 @@ static void ar9003_hw_override_ini(struct ath_hw *ah) ah->enabled_cals |=TX_CL_CAL ; else ah->enabled_cals &= ~TX_CL_CAL; + +if (AR_SREV_9340 (ah) ||AR_SREV_9531 (ah) ||AR_SREV_9550 (ah)) { +if (ah->is_clk_25mhz) { +REG_WRITE (ah,AR_RTC_DERIVED_CLK ,0x17c <<1 ); +REG_WRITE (ah,AR_SLP32_MODE ,0x0010f3d7 ); +REG_WRITE (ah,AR_SLP32_INC ,0x0001e7ae ); + }else { +REG_WRITE (ah,AR_RTC_DERIVED_CLK ,0x261 <<1 ); +REG_WRITE (ah,AR_SLP32_MODE ,0x0010f400 ); +REG_WRITE (ah,AR_SLP32_INC ,0x0001e800 ); + } +udelay (100 ); + } } static void ar9003_hw_prog_ini(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/hw.c +0 -13
@@ -859,19 +859,6 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,udelay (RTC_PLL_SETTLE_DELAY );REG_WRITE (ah,AR_RTC_SLEEP_CLK ,AR_RTC_FORCE_DERIVED_CLK ); - -if (AR_SREV_9340 (ah) ||AR_SREV_9550 (ah)) { -if (ah->is_clk_25mhz) { -REG_WRITE (ah,AR_RTC_DERIVED_CLK ,0x17c <<1 ); -REG_WRITE (ah,AR_SLP32_MODE ,0x0010f3d7 ); -REG_WRITE (ah,AR_SLP32_INC ,0x0001e7ae ); - }else { -REG_WRITE (ah,AR_RTC_DERIVED_CLK ,0x261 <<1 ); -REG_WRITE (ah,AR_SLP32_MODE ,0x0010f400 ); -REG_WRITE (ah,AR_SLP32_INC ,0x0001e800 ); - } -udelay (100 ); - } } static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
drivers/net/wireless/brcm80211/brcmfmac/of.c +2 -2
@@ -40,8 +40,8 @@ void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)return ; irq =irq_of_parse_and_map (np,0 ); -if (irq <0 ) { -brcmf_err ("interrupt could not be mapped: err=%d\n" , irq); +if (!irq) { +brcmf_err ("interrupt could not be mapped\n" );devm_kfree (dev, sdiodev->pdata);return ; }
drivers/net/wireless/brcm80211/brcmfmac/pcie.c +1 -1
@@ -19,10 +19,10 @@#include <linux/pci.h> #include <linux/vmalloc.h> #include <linux/delay.h> -#include <linux/unaligned/access_ok.h> #include <linux/interrupt.h> #include <linux/bcma/bcma.h> #include <linux/sched.h> +#include <asm/unaligned.h> #include <soc.h> #include <chipcommon.h>
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +6 -0
@@ -298,6 +298,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, primary_offset = ch->center_freq1 - ch->chan->center_freq;switch (ch->width) {case NL80211_CHAN_WIDTH_20 : +case NL80211_CHAN_WIDTH_20_NOHT : ch_inf.bw =BRCMU_CHAN_BW_20 ;WARN_ON (primary_offset !=0 );break ;
@@ -322,6 +323,10 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf, ch_inf.sb =BRCMU_CHAN_SB_LU ; }break ; +case NL80211_CHAN_WIDTH_80P80 : +case NL80211_CHAN_WIDTH_160 : +case NL80211_CHAN_WIDTH_5 : +case NL80211_CHAN_WIDTH_10 :default :WARN_ON_ONCE (1 ); }
@@ -332,6 +337,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,case IEEE80211_BAND_5GHZ : ch_inf.band =BRCMU_CHAN_BAND_5G ;break ; +case IEEE80211_BAND_60GHZ :default :WARN_ON_ONCE (1 ); }
drivers/net/wireless/iwlwifi/iwl-fw.h +3 -1
@@ -138,9 +138,11 @@ enum iwl_ucode_tlv_api {/** * enum iwl_ucode_tlv_capa - ucode capabilities * @IWL_UCODE_TLV_CAPA_D0I3_SUPPORT: supports D0i3 +* @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command */ enum iwl_ucode_tlv_capa { -IWL_UCODE_TLV_CAPA_D0I3_SUPPORT =BIT (0 ), +IWL_UCODE_TLV_CAPA_D0I3_SUPPORT =BIT (0 ), +IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT =BIT (18 ), };/* The default calibrate table size if not specified by firmware file */
drivers/net/wireless/iwlwifi/mvm/mac80211.c +25 -12
@@ -515,7 +515,8 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, }if (IEEE80211_SKB_CB (skb)->hw_queue ==IWL_MVM_OFFCHANNEL_QUEUE && - !test_bit (IWL_MVM_STATUS_ROC_RUNNING , &mvm->status)) + !test_bit (IWL_MVM_STATUS_ROC_RUNNING , &mvm->status) && + !test_bit (IWL_MVM_STATUS_ROC_AUX_RUNNING , &mvm->status)) goto drop;/* treat non-bufferable MMPDUs as broadcast if sta is sleeping */
@@ -2403,14 +2404,19 @@ static int iwl_mvm_send_aux_roc_cmd(struct iwl_mvm *mvm,/* Set the node address */ memcpy (aux_roc_req.node_addr, vif->addr,ETH_ALEN ); +lockdep_assert_held (&mvm->mutex); + +spin_lock_bh (&mvm->time_event_lock); + +if (WARN_ON (te_data->id ==HOT_SPOT_CMD )) { +spin_unlock_bh (&mvm->time_event_lock); +return -EIO ; + } + te_data->vif = vif; te_data->duration = duration; te_data->id =HOT_SPOT_CMD ; -lockdep_assert_held (&mvm->mutex); - -spin_lock_bh (&mvm->time_event_lock); -list_add_tail (&te_data->list, &mvm->time_event_list);spin_unlock_bh (&mvm->time_event_lock);/*
@@ -2466,22 +2472,29 @@ static int iwl_mvm_roc(struct ieee80211_hw *hw,IWL_DEBUG_MAC80211 (mvm,"enter (%d, %d, %d)\n" , channel->hw_value, duration, type); +mutex_lock (&mvm->mutex); +switch (vif->type) {case NL80211_IFTYPE_STATION : -/* Use aux roc framework (HS20) */ - ret =iwl_mvm_send_aux_roc_cmd (mvm, channel, - vif, duration); -return ret; +if (mvm->fw->ucode_capa.capa[0 ] & +IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT ) { +/* Use aux roc framework (HS20) */ + ret =iwl_mvm_send_aux_roc_cmd (mvm, channel, + vif, duration); + goto out_unlock; + } +IWL_ERR (mvm,"hotspot not supported\n" ); + ret = -EINVAL ; + goto out_unlock;case NL80211_IFTYPE_P2P_DEVICE :/* handle below */ break ;default :IWL_ERR (mvm,"vif isn't P2P_DEVICE: %d\n" , vif->type); -return -EINVAL ; + ret = -EINVAL ; + goto out_unlock; } -mutex_lock (&mvm->mutex); -for (i =0 ; i <NUM_PHY_CTX ; i++) { phy_ctxt = &mvm->phy_ctxts[i];if (phy_ctxt->ref ==0 || mvmvif->phy_ctxt == phy_ctxt)
drivers/net/wireless/iwlwifi/mvm/time-event.c +1 -1
@@ -303,8 +303,8 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm, te_data->running = false; te_data->vif =NULL ; te_data->uid =0 ; + te_data->id =TE_MAX ; }else if (le32_to_cpu (notif->action) ==TE_V2_NOTIF_HOST_EVENT_START ) { -set_bit (IWL_MVM_STATUS_ROC_RUNNING , &mvm->status);set_bit (IWL_MVM_STATUS_ROC_AUX_RUNNING , &mvm->status); te_data->running = true;ieee80211_ready_on_channel (mvm->hw);/* Start TE */
drivers/net/wireless/iwlwifi/pcie/trans.c +1 -2
@@ -1891,8 +1891,7 @@ static u32 iwl_trans_pcie_dump_prph(struct iwl_trans *trans,int reg;__le32 *val; - prph_len +=sizeof (*data) +sizeof (*prph) + - num_bytes_in_chunk; + prph_len +=sizeof (**data) +sizeof (*prph) + num_bytes_in_chunk; (*data)->type =cpu_to_le32 (IWL_FW_ERROR_DUMP_PRPH ); (*data)->len = cpu_to_le32(sizeof(*prph) +
drivers/net/wireless/rt2x00/rt2x00queue.c +12 -38
67 lines not on this page · raw message
drivers/of/address.c +16 -3
@@ -403,6 +403,21 @@ static struct of_bus *of_match_bus(struct device_node *np)return NULL ; } +static int of_empty_ranges_quirk (void ) +{ +if (IS_ENABLED (CONFIG_PPC )) { +/* To save cycles, we cache the result */ +static int quirk_state =-1 ; + +if (quirk_state <0 ) + quirk_state = +of_machine_is_compatible ("Power Macintosh" ) || +of_machine_is_compatible ("MacRISC" ); +return quirk_state; + } +return false; +} +static int of_translate_one (struct device_node *parent,struct of_bus *bus,struct of_bus *pbus,__be32 *addr,int na,int ns,int pna,const char *rprop)
@@ -428,12 +443,10 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,* This code is only enabled on powerpc. --gcl */ ranges =of_get_property (parent, rprop, &rlen); -#if !defined(CONFIG_PPC ) -if (ranges ==NULL ) { +if (ranges ==NULL && !of_empty_ranges_quirk ()) {pr_err ("OF: no ranges; cannot translate\n" );return 1 ; } -#endif /* !defined(CONFIG_PPC) */ if (ranges ==NULL || rlen ==0 ) { offset =of_read_number (addr, na);memset (addr,0 , pna *4 );
drivers/of/fdt.c +1 -1
@@ -773,7 +773,7 @@ int __init early_init_dt_scan_chosen_serial(void)if (offset <0 )return -ENODEV ; -while (match->compatible) { +while (match->compatible[0 ]) {unsigned long addr;if (fdt_node_check_compatible (fdt, offset, match->compatible)) { match++;
drivers/of/selftest.c +1 -2
@@ -799,7 +799,7 @@ static void selftest_data_remove(void)return ; } -while (last_node_index >=0 ) { +while (last_node_index-- >0 ) {if (nodes[last_node_index]) { np =of_find_node_by_path (nodes[last_node_index]->full_name);if (strcmp (np->full_name,"/aliases" ) !=0 ) {
@@ -812,7 +812,6 @@ static void selftest_data_remove(void) } } } - last_node_index--; } }
drivers/pci/msi.c +26 -0
@@ -610,6 +610,20 @@ static struct msi_desc *msi_setup_entry(struct pci_dev *dev)return entry; } +static int msi_verify_entries (struct pci_dev *dev) +{ +struct msi_desc *entry; + +list_for_each_entry (entry, &dev->msi_list, list) { +if (!dev->no_64bit_msi || !entry->msg.address_hi) +continue ; +dev_err (&dev->dev,"Device has broken 64-bit MSI but arch" +" tried to assign one above 4G\n" ); +return -EIO ; + } +return 0 ; +} +/** * msi_capability_init - configure device's MSI capability structure * @dev: pointer to the pci_dev data structure of MSI device function
@@ -647,6 +661,13 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)return ret; } + ret =msi_verify_entries (dev); +if (ret) { +msi_mask_irq (entry, mask, ~mask); +free_msi_irqs (dev); +return ret; + } + ret =populate_msi_sysfs (dev);if (ret) {msi_mask_irq (entry, mask, ~mask);
@@ -760,6 +781,11 @@ static int msix_capability_init(struct pci_dev *dev,if (ret) goto out_avail; +/* Check if all MSI entries honor device restrictions */ + ret =msi_verify_entries (dev); +if (ret) + goto out_free; +/* * Some devices require MSI-X to be enabled before we can touch the * MSI-X registers. We need to mask all the vectors to prevent
drivers/pci/probe.c +16 -12
@@ -406,15 +406,16 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child) {struct pci_dev *dev = child->self;u16 mem_base_lo, mem_limit_lo; -unsigned long base, limit; +u64 base64, limit64; +dma_addr_t base, limit;struct pci_bus_region region;struct resource *res; res = child->resource[2 ];pci_read_config_word (dev,PCI_PREF_MEMORY_BASE , &mem_base_lo);pci_read_config_word (dev,PCI_PREF_MEMORY_LIMIT , &mem_limit_lo); - base = ((unsigned long ) mem_base_lo &PCI_PREF_RANGE_MASK ) <<16 ; - limit = ((unsigned long ) mem_limit_lo &PCI_PREF_RANGE_MASK ) <<16 ; + base64 = (mem_base_lo &PCI_PREF_RANGE_MASK ) <<16 ; + limit64 = (mem_limit_lo &PCI_PREF_RANGE_MASK ) <<16 ;if ((mem_base_lo &PCI_PREF_RANGE_TYPE_MASK ) ==PCI_PREF_RANGE_TYPE_64 ) {u32 mem_base_hi, mem_limit_hi;
@@ -428,17 +429,20 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)* this, just assume they are not being used. */ if (mem_base_hi <= mem_limit_hi) { -#if BITS_PER_LONG ==64 - base |= ((unsigned long ) mem_base_hi) <<32 ; - limit |= ((unsigned long ) mem_limit_hi) <<32 ; -#else -if (mem_base_hi || mem_limit_hi) { -dev_err (&dev->dev,"can't handle 64-bit address space for bridge\n" ); -return ; - } -#endif + base64 |= (u64 ) mem_base_hi <<32 ; + limit64 |= (u64 ) mem_limit_hi <<32 ; } } + + base = (dma_addr_t ) base64; + limit = (dma_addr_t ) limit64; + +if (base != base64) { +dev_err (&dev->dev,"can't handle bridge window above 4GB (bus address %#010llx)\n" , + (unsigned long long ) base64); +return ; + } +if (base <= limit) { res->flags = (mem_base_lo &PCI_PREF_RANGE_TYPE_MASK ) |IORESOURCE_MEM |IORESOURCE_PREFETCH ;
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +7 -0
@@ -412,6 +412,7 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev,struct fc_frame_header *fh;struct fcoe_rcv_info *fr;struct fcoe_percpu_s *bg; +struct sk_buff *tmp_skb;unsigned short oxid; interface = container_of(ptype, struct bnx2fc_interface,
@@ -424,6 +425,12 @@ static int bnx2fc_rcv(struct sk_buff *skb, struct net_device *dev, goto err; } + tmp_skb =skb_share_check (skb,GFP_ATOMIC ); +if (!tmp_skb) + goto err; + + skb = tmp_skb; +if (unlikely (eth_hdr (skb)->h_proto !=htons (ETH_P_FCOE ))) { printk(KERN_ERR PFX "bnx2fc_rcv: Wrong FC type frame\n"); goto err;
drivers/scsi/scsi_devinfo.c +1 -0
@@ -202,6 +202,7 @@ static struct { {"IOMEGA", "Io20S *F", NULL, BLIST_KEY}, {"INSITE", "Floptical F*8I", NULL, BLIST_KEY}, {"INSITE", "I325VM", NULL, BLIST_KEY}, + {"Intel", "Multi-Flex", NULL, BLIST_NO_RSOC}, {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN}, {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
drivers/spi/spi-dw.c +1 -5
@@ -382,9 +382,6 @@ static void pump_transfers(unsigned long data) chip = dws->cur_chip; spi = message->spi; -if (unlikely (!chip->clk_div)) - chip->clk_div = dws->max_freq / chip->speed_hz; -if (message->state ==ERROR_STATE ) { message->status = -EIO ; goto early_exit;
@@ -425,7 +422,7 @@ static void pump_transfers(unsigned long data)if (transfer->speed_hz) { speed = chip->speed_hz; -if (transfer->speed_hz != speed) { +if ((transfer->speed_hz != speed) || (!chip->clk_div)) { speed = transfer->speed_hz;/* clk_div doesn't support odd number */
@@ -586,7 +583,6 @@ static int dw_spi_setup(struct spi_device *spi)dev_err (&spi->dev,"No max speed HZ parameter\n" );return -EINVAL ; } - chip->speed_hz = spi->max_speed_hz; chip->tmode =0 ;/* Tx & Rx */ /* Default SPI mode is SCPOL = 0, SCPH = 0 */
drivers/spi/spi-sirf.c +2 -2
@@ -565,9 +565,9 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t) sspi->word_width =DIV_ROUND_UP (bits_per_word,8 ); txfifo_ctrl =SIRFSOC_SPI_FIFO_THD (SIRFSOC_SPI_FIFO_SIZE /2 ) | - sspi->word_width; + (sspi->word_width >>1 ); rxfifo_ctrl =SIRFSOC_SPI_FIFO_THD (SIRFSOC_SPI_FIFO_SIZE /2 ) | - sspi->word_width; + (sspi->word_width >>1 );if (!(spi->mode &SPI_CS_HIGH )) regval |=SIRFSOC_SPI_CS_IDLE_STAT ;
drivers/spi/spi.c +3 -3
@@ -609,13 +609,13 @@ static int spi_map_buf(struct spi_master *master, struct device *dev,sg_free_table (sgt);return -ENOMEM ; } - sg_buf =page_address (vm_page) + - ((size_t )buf & ~PAGE_MASK ); +sg_set_page (&sgt->sgl[i], vm_page, + min,offset_in_page (buf)); }else { sg_buf = buf; +sg_set_buf (&sgt->sgl[i], sg_buf, min); } -sg_set_buf (&sgt->sgl[i], sg_buf, min); buf += min; len -= min;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -0
@@ -47,6 +47,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = { {USB_DEVICE(0x07b8, 0x8179)}, /* Abocom - Abocom */ {USB_DEVICE(0x2001, 0x330F)}, /* DLink DWA-125 REV D1 */ {USB_DEVICE(0x2001, 0x3310)}, /* Dlink DWA-123 REV D1 */ + {USB_DEVICE(0x2001, 0x3311)}, /* DLink GO-USB-N150 REV B1 */ {USB_DEVICE(0x0df6, 0x0076)}, /* Sitecom N150 v2 */ {} /* Terminating entry */ };
drivers/target/target_core_transport.c +1 -1
@@ -2295,7 +2295,7 @@ transport_generic_new_cmd(struct se_cmd *cmd)* and let it call back once the write buffers are ready. */ target_add_to_state_list (cmd); -if (cmd->data_direction !=DMA_TO_DEVICE ) { +if (cmd->data_direction !=DMA_TO_DEVICE || cmd->data_length ==0 ) {target_execute_cmd (cmd);return 0 ; }
drivers/usb/core/quirks.c +3 -0
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {/* Creative SB Audigy 2 NX */ { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Microsoft Wireless Laser Mouse 6000 Receiver */ + { USB_DEVICE(0x045e, 0x00e1), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Microsoft LifeCam-VX700 v2.0 */ { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/host/xhci-hub.c +1 -4
@@ -22,7 +22,6 @@#include <linux/slab.h> -#include <linux/device.h> #include <asm/unaligned.h> #include "xhci.h"
@@ -1142,9 +1141,7 @@ int xhci_bus_suspend(struct usb_hcd *hcd)* including the USB 3.0 roothub, but only if CONFIG_PM_RUNTIME * is enabled, so also enable remote wake here. */ -if (hcd->self.root_hub->do_remote_wakeup - &&device_may_wakeup (hcd->self.controller)) { - +if (hcd->self.root_hub->do_remote_wakeup) {if (t1 &PORT_CONNECT ) { t2 |=PORT_WKOC_E |PORT_WKDISC_E ; t2 &= ~PORT_WKCONN_E ;
drivers/usb/host/xhci-pci.c +1 -1
@@ -279,7 +279,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)if (xhci_compliance_mode_recovery_timer_quirk_check ()) pdev->no_d3cold = true; -return xhci_suspend (xhci); +return xhci_suspend (xhci, do_wakeup); }static int xhci_pci_resume (struct usb_hcd *hcd,bool hibernated)
drivers/usb/host/xhci-plat.c +9 -1
@@ -255,7 +255,15 @@ static int xhci_plat_suspend(struct device *dev)struct usb_hcd *hcd =dev_get_drvdata (dev);struct xhci_hcd *xhci =hcd_to_xhci (hcd); -return xhci_suspend (xhci); +/* +* xhci_suspend() needs `do_wakeup` to know whether host is allowed +* to do wakeup during suspend. Since xhci_plat_suspend is currently +* only designed for system suspend, device_may_wakeup() is enough +* to dertermine whether host is allowed to do wakeup. Need to +* reconsider this when xhci_plat_suspend enlarges its scope, e.g., +* also applies to runtime suspend. +*/ +return xhci_suspend (xhci,device_may_wakeup (dev)); }static int xhci_plat_resume (struct device *dev)
drivers/usb/host/xhci-ring.c +11 -32
68 lines not on this page · raw message
drivers/usb/host/xhci.c +56 -51
149 lines not on this page · raw message
drivers/usb/host/xhci.h +1 -1
@@ -1764,7 +1764,7 @@ void xhci_shutdown(struct usb_hcd *hcd);int xhci_gen_setup (struct usb_hcd *hcd,xhci_get_quirks_t get_quirks);#ifdef CONFIG_PM -int xhci_suspend (struct xhci_hcd *xhci); +int xhci_suspend (struct xhci_hcd *xhci,bool do_wakeup);int xhci_resume (struct xhci_hcd *xhci,bool hibernated);#else #define xhci_suspend NULL
drivers/usb/serial/cp210x.c +1 -0
@@ -120,6 +120,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0x8875) }, /* CEL MeshConnect USB Stick */ { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */
drivers/usb/serial/ftdi_sio.c +33 -0
@@ -470,6 +470,39 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_01FD_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_01FE_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_01FF_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_4701_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9300_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9301_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9302_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9303_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9304_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9305_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9306_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9307_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9308_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9309_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930A_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930B_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930C_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930D_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930E_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_930F_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9310_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9311_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9312_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9313_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9314_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9315_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9316_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9317_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9318_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_9319_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931A_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931B_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931C_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931D_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931E_PID) }, + { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_931F_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PERLE_ULTRAPORT_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PIEGROUP_PID) }, { USB_DEVICE(FTDI_VID, FTDI_TNC_X_PID) },
drivers/usb/serial/ftdi_sio_ids.h +35 -4
@@ -926,8 +926,8 @@#define BAYER_CONTOUR_CABLE_PID 0x6001/* -* The following are the values for the Matrix Orbital FTDI Range -* Anything in this range will use an FT232RL. +* Matrix Orbital Intelligent USB displays. +* http://www.matrixorbital.com */ #define MTXORB_VID 0x1B3D#define MTXORB_FTDI_RANGE_0100_PID 0x0100
@@ -1186,8 +1186,39 @@#define MTXORB_FTDI_RANGE_01FD_PID 0x01FD#define MTXORB_FTDI_RANGE_01FE_PID 0x01FE#define MTXORB_FTDI_RANGE_01FF_PID 0x01FF - - +#define MTXORB_FTDI_RANGE_4701_PID 0x4701 +#define MTXORB_FTDI_RANGE_9300_PID 0x9300 +#define MTXORB_FTDI_RANGE_9301_PID 0x9301 +#define MTXORB_FTDI_RANGE_9302_PID 0x9302 +#define MTXORB_FTDI_RANGE_9303_PID 0x9303 +#define MTXORB_FTDI_RANGE_9304_PID 0x9304 +#define MTXORB_FTDI_RANGE_9305_PID 0x9305 +#define MTXORB_FTDI_RANGE_9306_PID 0x9306 +#define MTXORB_FTDI_RANGE_9307_PID 0x9307 +#define MTXORB_FTDI_RANGE_9308_PID 0x9308 +#define MTXORB_FTDI_RANGE_9309_PID 0x9309 +#define MTXORB_FTDI_RANGE_930A_PID 0x930A +#define MTXORB_FTDI_RANGE_930B_PID 0x930B +#define MTXORB_FTDI_RANGE_930C_PID 0x930C +#define MTXORB_FTDI_RANGE_930D_PID 0x930D +#define MTXORB_FTDI_RANGE_930E_PID 0x930E +#define MTXORB_FTDI_RANGE_930F_PID 0x930F +#define MTXORB_FTDI_RANGE_9310_PID 0x9310 +#define MTXORB_FTDI_RANGE_9311_PID 0x9311 +#define MTXORB_FTDI_RANGE_9312_PID 0x9312 +#define MTXORB_FTDI_RANGE_9313_PID 0x9313 +#define MTXORB_FTDI_RANGE_9314_PID 0x9314 +#define MTXORB_FTDI_RANGE_9315_PID 0x9315 +#define MTXORB_FTDI_RANGE_9316_PID 0x9316 +#define MTXORB_FTDI_RANGE_9317_PID 0x9317 +#define MTXORB_FTDI_RANGE_9318_PID 0x9318 +#define MTXORB_FTDI_RANGE_9319_PID 0x9319 +#define MTXORB_FTDI_RANGE_931A_PID 0x931A +#define MTXORB_FTDI_RANGE_931B_PID 0x931B +#define MTXORB_FTDI_RANGE_931C_PID 0x931C +#define MTXORB_FTDI_RANGE_931D_PID 0x931D +#define MTXORB_FTDI_RANGE_931E_PID 0x931E +#define MTXORB_FTDI_RANGE_931F_PID 0x931F/* * The Mobility Lab (TML)
drivers/usb/serial/keyspan.c +59 -38
137 lines not on this page · raw message
drivers/usb/serial/ssu100.c +3 -8
@@ -490,10 +490,9 @@ static void ssu100_update_lsr(struct usb_serial_port *port, u8 lsr,if (*tty_flag ==TTY_NORMAL ) *tty_flag =TTY_FRAME ; } -if (lsr &UART_LSR_OE ){ +if (lsr &UART_LSR_OE ) { port->icount.overrun++; -if (*tty_flag ==TTY_NORMAL ) - *tty_flag =TTY_OVERRUN ; +tty_insert_flip_char (&port->port,0 ,TTY_OVERRUN ); } }
@@ -511,12 +510,8 @@ static void ssu100_process_read_urb(struct urb *urb)if ((len >=4 ) && (packet[0 ] ==0x1b ) && (packet[1 ] ==0x1b ) && ((packet[2 ] ==0x00 ) || (packet[2 ] ==0x01 ))) { -if (packet[2 ] ==0x00 ) { +if (packet[2 ] ==0x00 )ssu100_update_lsr (port, packet[3 ], &flag); -if (flag ==TTY_OVERRUN ) -tty_insert_flip_char (&port->port,0 , -TTY_OVERRUN ); - }if (packet[2 ] ==0x01 )ssu100_update_msr (port, packet[3 ]);
drivers/usb/storage/unusual_uas.h +7 -0
@@ -103,3 +103,10 @@ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VL711", USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_ATA_1X), + +/* Reported-by: Hans de Goede <[email protected]> */ +UNUSUAL_DEV (0x4971 ,0x1012 ,0x0000 ,0x9999 , +"Hitachi" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_IGNORE_UAS),
drivers/vhost/scsi.c +24 -0
@@ -1312,6 +1312,7 @@ static int vhost_scsi_set_endpoint(struct vhost_scsi *vs, struct vhost_scsi_target *t) { + struct se_portal_group *se_tpg;struct tcm_vhost_tport *tv_tport;struct tcm_vhost_tpg *tpg;struct tcm_vhost_tpg **vs_tpg;
@@ -1359,6 +1360,21 @@ vhost_scsi_set_endpoint(struct vhost_scsi *vs, ret = -EEXIST ; goto out; } +/* +* In order to ensure individual vhost-scsi configfs +* groups cannot be removed while in use by vhost ioctl, +* go ahead and take an explicit se_tpg->tpg_group.cg_item +* dependency now. +*/ + se_tpg = &tpg->se_tpg; + ret =configfs_depend_item (se_tpg->se_tpg_tfo->tf_subsys, + &se_tpg->tpg_group.cg_item); +if (ret) { +pr_warn ("configfs_depend_item() failed: %d\n" , ret); +kfree (vs_tpg); +mutex_unlock (&tpg->tv_tpg_mutex); + goto out; + } tpg->tv_tpg_vhost_count++; tpg->vhost_scsi = vs; vs_tpg[tpg->tport_tpgt] = tpg;
@@ -1401,6 +1417,7 @@ static int vhost_scsi_clear_endpoint(struct vhost_scsi *vs, struct vhost_scsi_target *t) { + struct se_portal_group *se_tpg;struct tcm_vhost_tport *tv_tport;struct tcm_vhost_tpg *tpg;struct vhost_virtqueue *vq;
@@ -1449,6 +1466,13 @@ vhost_scsi_clear_endpoint(struct vhost_scsi *vs, vs->vs_tpg[target] =NULL ; match = true;mutex_unlock (&tpg->tv_tpg_mutex); +/* +* Release se_tpg->tpg_group.cg_item configfs dependency now +* to allow vhost-scsi WWPN se_tpg->tpg_group shutdown to occur. +*/ + se_tpg = &tpg->se_tpg; +configfs_undepend_item (se_tpg->se_tpg_tfo->tf_subsys, + &se_tpg->tpg_group.cg_item); }if (match) {for (i =0 ; i <VHOST_SCSI_MAX_VQ ; i++) {
fs/aio.c +14 -7
@@ -165,6 +165,15 @@ static struct vfsmount *aio_mnt;static const struct file_operations aio_ring_fops;static const struct address_space_operations aio_ctx_aops; +/* Backing dev info for aio fs. +* -no dirty page accounting or writeback happens +*/ +static struct backing_dev_info aio_fs_backing_dev_info = { + .name ="aiofs" , + .state =0 , + .capabilities =BDI_CAP_NO_ACCT_AND_WRITEBACK |BDI_CAP_MAP_COPY , +}; +static struct file *aio_private_file (struct kioctx *ctx,loff_t nr_pages) {struct qstr this =QSTR_INIT ("[aio]" ,5 );
@@ -176,6 +185,7 @@ static struct file *aio_private_file(struct kioctx *ctx, loff_t nr_pages) inode->i_mapping->a_ops = &aio_ctx_aops; inode->i_mapping->private_data = ctx; + inode->i_mapping->backing_dev_info = &aio_fs_backing_dev_info; inode->i_size =PAGE_SIZE * nr_pages; path.dentry =d_alloc_pseudo (aio_mnt->mnt_sb, &this);
@@ -220,6 +230,9 @@ static int __init aio_setup(void)if (IS_ERR (aio_mnt))panic ("Failed to create aio fs mount." ); +if (bdi_init (&aio_fs_backing_dev_info)) +panic ("Failed to init aio fs backing dev info." ); + kiocb_cachep =KMEM_CACHE (kiocb,SLAB_HWCACHE_ALIGN |SLAB_PANIC ); kioctx_cachep =KMEM_CACHE (kioctx,SLAB_HWCACHE_ALIGN |SLAB_PANIC );
@@ -281,11 +294,6 @@ static const struct file_operations aio_ring_fops = { .mmap = aio_ring_mmap, }; -static int aio_set_page_dirty (struct page *page) -{ -return 0 ; -} -#if IS_ENABLED (CONFIG_MIGRATION )static int aio_migratepage (struct address_space *mapping,struct page *new,struct page *old,enum migrate_mode mode)
@@ -357,7 +365,7 @@ out:#endif static const struct address_space_operations aio_ctx_aops = { - .set_page_dirty = aio_set_page_dirty, + .set_page_dirty = __set_page_dirty_no_writeback, #if IS_ENABLED(CONFIG_MIGRATION) .migratepage = aio_migratepage, #endif
@@ -412,7 +420,6 @@ static int aio_setup_ring(struct kioctx *ctx)pr_debug ("pid(%d) page[%d]->count=%d\n" , current->pid, i,page_count (page));SetPageUptodate (page); -SetPageDirty (page);unlock_page (page); ctx->ring_pages[i] = page;
fs/btrfs/ctree.c +2 -12
@@ -80,13 +80,6 @@ noinline void btrfs_clear_path_blocking(struct btrfs_path *p, {int i; -#ifdef CONFIG_DEBUG_LOCK_ALLOC -/* lockdep really cares that we take all of these spinlocks -* in the right order. If any of the locks in the path are not -* currently blocking, it is going to complain. So, make really -* really sure by forcing the path to blocking before we clear -* the path blocking. -*/ if (held) {btrfs_set_lock_blocking_rw (held, held_rw);if (held_rw ==BTRFS_WRITE_LOCK )
@@ -95,7 +88,6 @@ noinline void btrfs_clear_path_blocking(struct btrfs_path *p, held_rw =BTRFS_READ_LOCK_BLOCKING ; }btrfs_set_path_blocking (p); -#endif for (i =BTRFS_MAX_LEVEL -1 ; i >=0 ; i--) {if (p->nodes[i] && p->locks[i]) {
@@ -107,10 +99,8 @@ noinline void btrfs_clear_path_blocking(struct btrfs_path *p, } } -#ifdef CONFIG_DEBUG_LOCK_ALLOC if (held)btrfs_clear_lock_blocking_rw (held, held_rw); -#endif }/* this also releases the path */
@@ -2902,7 +2892,7 @@ cow_done: } p->locks[level] =BTRFS_WRITE_LOCK ; }else { - err =btrfs_try_tree_read_lock (b); + err =btrfs_tree_read_lock_atomic (b);if (!err) {btrfs_set_path_blocking (p);btrfs_tree_read_lock (b);
@@ -3034,7 +3024,7 @@ again: } level =btrfs_header_level (b); - err =btrfs_try_tree_read_lock (b); + err =btrfs_tree_read_lock_atomic (b);if (!err) {btrfs_set_path_blocking (p);btrfs_tree_read_lock (b);
fs/btrfs/locking.c +21 -3
@@ -128,6 +128,26 @@ again: }/* +* take a spinning read lock. +* returns 1 if we get the read lock and 0 if we don't +* this won't wait for blocking writers +*/ +int btrfs_tree_read_lock_atomic (struct extent_buffer *eb) +{ +if (atomic_read (&eb->blocking_writers)) +return 0 ; + +read_lock (&eb->lock); +if (atomic_read (&eb->blocking_writers)) { +read_unlock (&eb->lock); +return 0 ; + } +atomic_inc (&eb->read_locks); +atomic_inc (&eb->spinning_readers); +return 1 ; +} + +/* * returns 1 if we get the read lock and 0 if we don't * this won't wait for blocking writers */
@@ -158,9 +178,7 @@ int btrfs_try_tree_write_lock(struct extent_buffer *eb) atomic_read(&eb->blocking_readers))return 0 ; -if (!write_trylock (&eb->lock)) -return 0 ; - +write_lock (&eb->lock);if (atomic_read (&eb->blocking_writers) ||atomic_read (&eb->blocking_readers)) {write_unlock (&eb->lock);
fs/btrfs/locking.h +2 -0
@@ -35,6 +35,8 @@ void btrfs_clear_lock_blocking_rw(struct extent_buffer *eb, int rw);void btrfs_assert_tree_locked (struct extent_buffer *eb);int btrfs_try_tree_read_lock (struct extent_buffer *eb);int btrfs_try_tree_write_lock (struct extent_buffer *eb); +int btrfs_tree_read_lock_atomic (struct extent_buffer *eb); +static inline void btrfs_tree_unlock_rw (struct extent_buffer *eb,int rw) {
fs/nfsd/nfs4callback.c +6 -2
@@ -801,8 +801,12 @@ static bool nfsd41_cb_get_slot(struct nfs4_client *clp, struct rpc_task *task) {if (test_and_set_bit (0 , &clp->cl_cb_slot_busy) !=0 ) {rpc_sleep_on (&clp->cl_cb_waitq, task,NULL ); -dprintk ("%s slot is busy\n" , __func__); -return false; +/* Race breaker */ +if (test_and_set_bit (0 , &clp->cl_cb_slot_busy) !=0 ) { +dprintk ("%s slot is busy\n" , __func__); +return false; + } +rpc_wake_up_queued_task (&clp->cl_cb_waitq, task); }return true; }
fs/nfsd/nfsd.h +6 -3
@@ -335,12 +335,15 @@ void nfsd_lockd_shutdown(void); (NFSD4_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SUPPATTR_EXCLCREAT)#ifdef CONFIG_NFSD_V4_SECURITY_LABEL -#define NFSD4_2_SUPPORTED_ATTRS_WORD2 \ - (NFSD4_1_SUPPORTED_ATTRS_WORD2 | FATTR4_WORD2_SECURITY_LABEL) +#define NFSD4_2_SECURITY_ATTRS FATTR4_WORD2_SECURITY_LABEL#else -#define NFSD4_2_SUPPORTED_ATTRS_WORD2 0 +#define NFSD4_2_SECURITY_ATTRS 0#endif +#define NFSD4_2_SUPPORTED_ATTRS_WORD2 \ + (NFSD4_1_SUPPORTED_ATTRS_WORD2 | \ + NFSD4_2_SECURITY_ATTRS) +static inline u32 nfsd_suppattrs0 (u32 minorversion) { return minorversion ? NFSD4_1_SUPPORTED_ATTRS_WORD0
include/dt-bindings/clock/qcom,mmcc-apq8084.h +1 -1
@@ -60,7 +60,7 @@#define ESC1_CLK_SRC 43#define HDMI_CLK_SRC 44#define VSYNC_CLK_SRC 45 -#define RBCPR_CLK_SRC 46 +#define MMSS_RBCPR_CLK_SRC 46#define RBBMTIMER_CLK_SRC 47#define MAPLE_CLK_SRC 48#define VDP_CLK_SRC 49
include/linux/bitops.h +5 -2
@@ -18,8 +18,11 @@* position @h. For example * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. */ -#define GENMASK (h, l) (((U32_C(1) << ((h) - (l) + 1)) - 1) << (l)) -#define GENMASK_ULL (h, l) (((U64_C(1) << ((h) - (l) + 1)) - 1) << (l)) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) + +#define GENMASK_ULL (h, l) \ + (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))extern unsigned int __sw_hweight8 (unsigned int w);extern unsigned int __sw_hweight16 (unsigned int w);
include/linux/clk-provider.h +0 -1
@@ -341,7 +341,6 @@ struct clk_divider {#define CLK_DIVIDER_READ_ONLY BIT(5)extern const struct clk_ops clk_divider_ops; -extern const struct clk_ops clk_divider_ro_ops; struct clk *clk_register_divider(struct device *dev, const char *name, const char *parent_name, unsigned long flags, void __iomem *reg, u8 shift, u8 width,
include/linux/iio/events.h +1 -1
@@ -72,7 +72,7 @@ struct iio_event_data {#define IIO_EVENT_CODE_EXTRACT_TYPE (mask) ((mask >> 56) & 0xFF) -#define IIO_EVENT_CODE_EXTRACT_DIR (mask) ((mask >> 48) & 0xCF) +#define IIO_EVENT_CODE_EXTRACT_DIR (mask) ((mask >> 48) & 0x7F)#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE (mask) ((mask >> 32) & 0xFF)
include/linux/inetdevice.h +1 -1
@@ -242,7 +242,7 @@ static inline void in_dev_put(struct in_device *idev)static __inline____be32 inet_make_mask (int logmask) {if (logmask) -return htonl (~((1 <<(32 -logmask))-1 )); +return htonl (~((1U <<(32 -logmask))-1 ));return 0 ; }
include/linux/pci.h +1 -0
@@ -331,6 +331,7 @@ struct pci_dev { unsigned int is_added:1; unsigned int is_busmaster:1; /* device is busmaster */ unsigned int no_msi:1; /* device may not use msi */ + unsigned int no_64bit_msi:1; /* device may only use 32-bit MSIs */ unsigned int block_cfg_access:1; /* config space access is blocked */ unsigned int broken_parity_status:1; /* Device generates false positive parity */ unsigned int irq_reroute_variant:2; /* device needs IRQ rerouting variant */
include/sound/soc-dpcm.h +2 -0
@@ -102,6 +102,8 @@ struct snd_soc_dpcm_runtime {/* state and update */ enum snd_soc_dpcm_update runtime_update;enum snd_soc_dpcm_state state; + +int trigger_pending;/* trigger cmd + 1 if pending, 0 if not */ };/* can this BE stop and free */
kernel/events/uprobes.c +0 -1
@@ -1640,7 +1640,6 @@ bool uprobe_deny_signal(void)if (__fatal_signal_pending (t) ||arch_uprobe_xol_was_trapped (t)) { utask->state =UTASK_SSTEP_TRAPPED ;set_tsk_thread_flag (t,TIF_UPROBE ); -set_tsk_thread_flag (t,TIF_NOTIFY_RESUME ); } }
net/ipv4/fib_rules.c +4 -0
@@ -62,6 +62,10 @@ int __fib_lookup(struct net *net, struct flowi4 *flp, struct fib_result *res) else res->tclassid = 0;#endif + +if (err == -ESRCH ) + err = -ENETUNREACH ; +return err; }EXPORT_SYMBOL_GPL (__fib_lookup);
net/ipv4/ping.c +2 -0
@@ -217,6 +217,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) &ipv6_hdr(skb)->daddr))continue ;#endif + }else { +continue ; }if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)
net/ipx/af_ipx.c +5 -1
@@ -1764,6 +1764,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,struct ipxhdr *ipx =NULL ;struct sk_buff *skb;int copied, rc; +bool locked = true;lock_sock (sk);/* put the autobinding in */
@@ -1790,6 +1791,8 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,if (sock_flag (sk,SOCK_ZAPPED )) goto out; +release_sock (sk); + locked = false; skb =skb_recv_datagram (sk, flags & ~MSG_DONTWAIT , flags &MSG_DONTWAIT , &rc);if (!skb) {
@@ -1826,7 +1829,8 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock, out_free:skb_free_datagram (sk, skb); out: -release_sock (sk); +if (locked) +release_sock (sk);return rc; }
net/mac80211/aes_ccm.c +3 -0
@@ -53,6 +53,9 @@ int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad,__aligned(__alignof__(struct aead_request)) ;struct aead_request *aead_req = (void *) aead_req_data; +if (data_len ==0 ) +return -EINVAL ; +memset (aead_req,0 ,sizeof (aead_req_data));sg_init_one (&pt, data, data_len);
net/netfilter/nf_conntrack_core.c +8 -6
@@ -611,12 +611,16 @@ __nf_conntrack_confirm(struct sk_buff *skb)*/ NF_CT_ASSERT (!nf_ct_is_confirmed (ct));pr_debug ("Confirming conntrack %p\n" , ct); -/* We have to check the DYING flag inside the lock to prevent -a race against nf_ct_get_next_corpse() possibly called from -user context, else we insert an already 'dead' hash, blocking -further use of that particular connection -JM */ + +/* We have to check the DYING flag after unlink to prevent +* a race against nf_ct_get_next_corpse() possibly called from +* user context, else we insert an already 'dead' hash, blocking +* further use of that particular connection -JM. +*/ +nf_ct_del_from_dying_or_unconfirmed_list (ct);if (unlikely (nf_ct_is_dying (ct))) { +nf_ct_add_to_dying_list (ct);nf_conntrack_double_unlock (hash, reply_hash);local_bh_enable ();return NF_ACCEPT ;
@@ -636,8 +640,6 @@ __nf_conntrack_confirm(struct sk_buff *skb) zone == nf_ct_zone(nf_ct_tuplehash_to_ctrack(h))) goto out; -nf_ct_del_from_dying_or_unconfirmed_list (ct); -/* Timer relative to confirmation time, not original setting time, otherwise we'd get timer wrap in weird delay cases. */
sound/pci/hda/hda_intel.c +19 -5
@@ -296,7 +296,8 @@ enum {/* quirks for ATI/AMD HDMI */ #define AZX_DCAPS_PRESET_ATI_HDMI \ - (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB) + (AZX_DCAPS_NO_TCSEL | AZX_DCAPS_SYNC_WRITE | AZX_DCAPS_POSFIX_LPIB|\ + AZX_DCAPS_NO_MSI64)/* quirks for Nvidia */ #define AZX_DCAPS_PRESET_NVIDIA \
@@ -1484,6 +1485,7 @@ static int azx_first_init(struct azx *chip)struct snd_card *card = chip->card;int err;unsigned short gcap; +unsigned int dma_bits =64 ;#if BITS_PER_LONG !=64 /* Fix up base address on ULI M5461 */
@@ -1507,9 +1509,14 @@ static int azx_first_init(struct azx *chip)return -ENXIO ; } -if (chip->msi) +if (chip->msi) { +if (chip->driver_caps &AZX_DCAPS_NO_MSI64 ) { +dev_dbg (card->dev,"Disabling 64bit MSI\n" ); + pci->no_64bit_msi = true; + }if (pci_enable_msi (pci) <0 ) chip->msi =0 ; + }if (azx_acquire_irq (chip,0 ) <0 )return -EBUSY ;
@@ -1520,9 +1527,14 @@ static int azx_first_init(struct azx *chip) gcap =azx_readw (chip,GCAP );dev_dbg (card->dev,"chipset global capabilities = 0x%x\n" , gcap); +/* AMD devices support 40 or 48bit DMA, take the safe one */ +if (chip->pci->vendor ==PCI_VENDOR_ID_AMD ) + dma_bits =40 ; +/* disable SB600 64bit support for safety */ if (chip->pci->vendor ==PCI_VENDOR_ID_ATI ) {struct pci_dev *p_smbus; + dma_bits =40 ; p_smbus =pci_get_device (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_SBX00_SMBUS ,NULL );
@@ -1552,9 +1564,11 @@ static int azx_first_init(struct azx *chip) }
Lines of this file are not shown. View the raw message.
sound/soc/soc-pcm.c +56 -16
72 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.