1. 23 4月, 2015 5 次提交
    • L
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7d2b6ef1
      Linus Torvalds 提交于
      Pull ARM SoC driver updates from Olof Johansson:
       "Driver updates for v4.1.  Some of these are for drivers/soc, where we
        find more and more SoC-specific drivers these days.  Some are for
        other driver subsystems where we have received acks from the
        appropriate maintainers.
      
        The larger parts of this branch are:
      
         - MediaTek support for their PMIC wrapper interface, a high-level
           interface for talking to the system PMIC over a dedicated I2C
           interface.
      
         - Qualcomm SCM driver has been moved to drivers/firmware.  It's used
           for CPU up/down and needs to be in a shared location for arm/arm64
           common code.
      
         - cleanup of ARM-CCI PMU code.
      
         - another set of cleanusp to the OMAP GPMC code"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        soc/mediatek: Remove unused variables
        clocksource: atmel-st: select MFD_SYSCON
        soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
        arm-cci: Fix CCI PMU event validation
        arm-cci: Split the code for PMU vs driver support
        arm-cci: Get rid of secure transactions for PMU driver
        arm-cci: Abstract the CCI400 PMU specific definitions
        arm-cci: Rearrange code for splitting PMU vs driver code
        drivers: cci: reject groups spanning multiple HW PMUs
        ARM: at91: remove useless include
        clocksource: atmel-st: remove mach/hardware dependency
        clocksource: atmel-st: use syscon/regmap
        ARM: at91: time: move the system timer driver to drivers/clocksource
        ARM: at91: properly initialize timer
        ARM: at91: at91rm9200: remove deprecated arm_pm_restart
        watchdog: at91rm9200: implement restart handler
        watchdog: at91rm9200: use the system timer syscon
        mfd: syscon: Add atmel system timer registers definition
        ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
        soc: qcom: gsbi: Add support for ADM CRCI muxing
        ...
      7d2b6ef1
    • L
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 5c73cc4b
      Linus Torvalds 提交于
      Pull ARM DT updates from Olof Johansson:
       "As always, this tends to be one of our bigger branches.  There are
        lots of updates this release, but not that many jumps out as something
        that needs more detailed coverage.  Some of the highlights are:
      
         - DTs for the new Annapurna Labs Alpine platform
      
         - more graphics DT pieces falling into place on Exynos, bridges,
           clocks.
      
         - plenty of DT updates for Qualcomm platforms for various IP blocks
      
         - some churn on Tegra due to switch-over to tool-generated pinctrl
           data
      
         - misc fixes and updates for Atmel at91 platforms
      
         - various DT updates to add IP block support on Broadcom's Cygnus
           platforms
      
         - more updates for Renesas platforms as DT support is added for
           various IP blocks (IPMMU, display, audio, etc)"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (231 commits)
        ARM: dts: alpine: add internal pci
        Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
        ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
        ARM: dts: qcom: Add idle state device nodes for 8064
        ARM: dts: qcom: Add idle states device nodes for 8084
        ARM: dts: qcom: Add idle states device nodes for 8974/8074
        ARM: dts: qcom: Update power-controller device node for 8064 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8084 Krait CPUs
        ARM: dts: qcom: Add power-controller device node for 8074 Krait CPUs
        devicetree: bindings: Document qcom,idle-states
        devicetree: bindings: Update qcom,saw2 node bindings
        dt-bindings: Add #defines for MSM8916 clocks and resets
        arm: dts: qcom: Add LPASS Audio HW to IPQ8064 device tree
        arm: dts: qcom: Add APQ8084 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add 8x74 chipset SPMI PMIC's nodes
        arm: dts: qcom: Add SPMI PMIC Arbiter nodes for APQ8084 and MSM8974
        arm: dts: qcom: Add LCC nodes
        arm: dts: qcom: Add TCSR support for MSM8960
        arm: dts: qcom: Add TCSR support for MSM8660
        arm: dts: qcom: Add TCSR support for IPQ8064
        ...
      5c73cc4b
    • L
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · e6c81cce
      Linus Torvalds 提交于
      Pull ARM SoC platform updates from Olof Johansson:
       "Our SoC branch usually contains expanded support for new SoCs and
        other core platform code.  In this case, that includes:
      
         - support for the new Annapurna Labs "Alpine" platform
      
         - a rework greatly simplifying adding new platform support to the
           MCPM subsystem (Multi-cluster power management)
      
         - cpuidle and PM improvements for Exynos3250
      
         - misc updates for Renesas, OMAP, Meson, i.MX.  Some of these could
           have gone in other branches but ended up here for various reasons"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
        ARM: alpine: add support for generic pci
        ARM: Exynos: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: migrate DCSCB to the new MCPM backend abstraction
        ARM: vexpress: DCSCB: tighten CPU validity assertion
        ARM: vexpress: migrate TC2 to the new MCPM backend abstraction
        ARM: MCPM: move the algorithmic complexity to the core code
        ARM: EXYNOS: allow cpuidle driver usage on Exynos3250 SoC
        ARM: EXYNOS: add AFTR mode support for Exynos3250
        ARM: EXYNOS: add code for setting/clearing boot flag
        ARM: EXYNOS: fix CPU1 hotplug on Exynos3250
        ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
        ARM: cygnus: fix const declaration bcm_cygnus_dt_compat
        ARM: DRA7: hwmod: Fix the hwmod class for GPTimer4
        ARM: DRA7: hwmod: Add data for GPTimers 13 through 16
        ARM: EXYNOS: Remove left over 'extra_save'
        ARM: EXYNOS: Constify exynos_pm_data array
        ARM: EXYNOS: use static in suspend.c
        ARM: EXYNOS: Use platform device name as power domain name
        ARM: EXYNOS: add support for async-bridge clocks for pm_domains
        ARM: omap-device: add missed callback for suspend-to-disk
        ...
      e6c81cce
    • L
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d0440c59
      Linus Torvalds 提交于
      Pull ARM SoC cleanups from Olof Johansson:
       "We've got a fairly large cleanup branch this time.  The bulk of this
        is removal of non-DT platforms of several flavors:
      
         - Atmel at91 platforms go full-DT, with removal of remaining
           board-file based support
      
         - OMAP removes legacy board files for three more platforms
      
         - removal of non-DT mach-msm, newer Qualcomm platforms now live in
           mach-qcom
      
         - Freescale i.MX25 also removes non-DT platform support"
      
      Most of the rest of the changes here are fallout from the above, i.e. for
      example removal of drivers that now lack platforms, etc.
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (58 commits)
        mmc: Remove msm_sdcc driver
        gpio: Remove gpio-msm-v1 driver
        ARM: Remove mach-msm and associated ARM architecture code
        ARM: shmobile: cpuidle: Remove the pointless default driver
        ARM: davinci: dm646x: Add interrupt resource for McASPs
        ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
        ARM: davinci: dm646x: Clean up the McASP DMA resources
        ARM: davinci: devices-da8xx: Add support for McASP2 on da830
        ARM: davinci: devices-da8xx: Clean up and correct the McASP device creation
        ARM: davinci: devices-da8xx: Add interrupt resource to McASP structs
        ARM: davinci: devices-da8xx: Add resource name for the McASP DMA request
        ARM: OMAP2+: Remove legacy support for omap3 TouchBook
        ARM: OMAP3: Remove legacy support for devkit8000
        ARM: OMAP3: Remove legacy support for EMA-Tech Stalker board
        ARM: shmobile: Consolidate the pm code for R-Car Gen2
        ARM: shmobile: r8a7791: Correct SYSCIER value
        ARM: shmobile: r8a7790: Correct SYSCIER value
        ARM: at91: remove old setup
        ARM: at91: sama5d4: remove useless map_io
        ARM: at91: sama5 use SoC detection infrastructure
        ...
      d0440c59
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 38eb1dbb
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Here's the usual "low-priority fixes that didn't make it into the last
        few -rcs, with a twist: We had a fixes pull request that I didn't send
        in time to get into 4.0, so we'll send some of them to Greg for
        -stable as well.
      
        Contents here is as usual not all that controversial:
      
         - a handful of randconfig fixes from Arnd, in particular for older
           Samsung platforms
      
         - Exynos fixes, !SMP building, DTS updates for MMC and lid switch
      
         - Kbuild fix to create output subdirectory for DTB files
      
         - misc minor fixes for OMAP"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
        ARM: at91/dt: sama5d3 xplained: add phy address for macb1
        kbuild: Create directory for target DTB
        ARM: mvebu: Disable CPU Idle on Armada 38x
        ARM: DRA7: Enable Cortex A15 errata 798181
        ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
        ARM: dts: DRA7: Add bandgap and related thermal nodes
        bus: ocp2scp: SYNC2 value should be changed to 0x6
        ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
        ARM: OMAP2+: remove superfluous NULL pointer check
        ARM: EXYNOS: Fix build breakage cpuidle on !SMP
        ARM: dts: fix lid and power pin-functions for exynos5250-spring
        ARM: dts: fix mmc node updates for exynos5250-spring
        ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
        MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
        ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
        ARM: cns3xxx: don't export static symbol
        ARM: S3C24XX: avoid a Kconfig warning
        ARM: S3C24XX: fix header file inclusions
        ARM: S3C24XX: fix building without PM_SLEEP
        ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
        ...
      38eb1dbb
  2. 22 4月, 2015 18 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · db4fd9c5
      Linus Torvalds 提交于
      Pull sparc fixes from David Miller:
      
       1) ldc_alloc_exp_dring() can be called from softints, so use
          GFP_ATOMIC.  From Sowmini Varadhan.
      
       2) Some minor warning/build fixups for the new iommu-common code on
          certain archs and with certain debug options enabled.  Also from
          Sowmini Varadhan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context
        sparc64: Use M7 PMC write on all chips T4 and onward.
        iommu-common: rename iommu_pool_hash to iommu_hash_common
        iommu-common: fix x86_64 compiler warnings
      db4fd9c5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8aaa51b6
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "Just a few fixes trickling in at this point.
      
        1) If we see an attached socket on an skb in the ipv4 forwarding path,
           bail.  This can happen due to races with FIB rule addition, and
           deletion, and we should just drop such frames.  From Sebastian
           Pöhn.
      
        2) pppoe receive should only accept packets destined for this hosts's
           MAC address.  From Joakim Tjernlund.
      
        3) Handle checksum unwrapping properly in ppp receive properly when
           it's encapsulated in UDP in some way, fix from Tom Herbert.
      
        4) Fix some bugs in mv88e6xxx DSA driver resulting from the conversion
           from register offset constants to mnenomic macros.  From Vivien
           Didelot.
      
        5) Fix handling of HCA max message size in mlx4 adapters, from Eran
           Ben ELisha"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP
        tcp: add memory barriers to write space paths
        altera tse: Error-Bit on tx-avalon-stream always set.
        net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN
        net: dsa: mv88e6xxx: fix setup of port control 1
        ppp: call skb_checksum_complete_unset in ppp_receive_frame
        net: add skb_checksum_complete_unset
        pppoe: Lacks DST MAC address check
        ip_forward: Drop frames with attached skb->sk
      8aaa51b6
    • L
      Merge branch 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · f614c817
      Linus Torvalds 提交于
      Pull parisc fixes from Helge Deller:
       "The patch by Guenter Roeck fixes the build on parisc which got broken
        because of commit f24ffde4 ("parisc: expose number of page table
        levels on Kconfig level") and the patch from Matthew Wilcox converts
        our code to use the generic scatterlist.h header file"
      
      * 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
        parisc: Eliminate sg_virt_addr() and private scatterlist.h
      f614c817
    • E
      net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP · fab9adfb
      Eran Ben Elisha 提交于
      Currently we parse max_msg_sz from the wrong offset in QUERY_DEV_CAP,
      fix to use the right offset.
      
      Fixes: 0b131561 ('net/mlx4_en: Add Flow control statistics [..]')
      Signed-off-by: NEran Ben Elisha <eranbe@mellanox.com>
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fab9adfb
    • S
      sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context · 0edfad59
      Sowmini Varadhan 提交于
      Since it is possible for vnet_event_napi to end up doing
      vnet_control_pkt_engine -> ... -> vnet_send_attr ->
      vnet_port_alloc_tx_ring -> ldc_alloc_exp_dring -> kzalloc()
      (i.e., in softirq context), kzalloc() should be called with
      GFP_ATOMIC from ldc_alloc_exp_dring.
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0edfad59
    • D
      sparc64: Use M7 PMC write on all chips T4 and onward. · df386375
      David S. Miller 提交于
      They both work equally well, and the M7 implementation is
      simpler and cheaper (less register writes).
      
      With help from David Ahern.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      df386375
    • G
      parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS · c19edb69
      Guenter Roeck 提交于
      The following warning is seen when compiling parisc images
      
      ./arch/parisc/include/asm/pgalloc.h: In function 'pgd_alloc':
      ./arch/parisc/include/asm/pgalloc.h:29:5: warning: "PT_NLEVELS" is not defined
      
      Some definitions of PT_NLEVELS were missed with the conversion to
      CONFIG_PGTABLE_LEVELS.
      
      Fixes: f24ffde4 ("parisc: expose number of page table levels
      	on Kconfig level")
      Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      Acked-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Signed-off-by: NHelge Deller <deller@gmx.de>
      c19edb69
    • M
      parisc: Eliminate sg_virt_addr() and private scatterlist.h · 8bf8a1d1
      Matthew Wilcox 提交于
      The only reason to keep parisc's private asm/scatterlist.h was that it
      had the macro sg_virt_addr().  Convert all callers to use something else
      (sometimes just sg->offset was enough, others should use sg_virt()), and
      we can just use the asm-generic scatterlist.h instead.
      Signed-off-by: NMatthew Wilcox <willy@linux.intel.com>
      Signed-off-by: NDave Anglin <dave.anglin@bell.net>
      Signed-off-by: NHelge Deller <deller@gmx.de>
      8bf8a1d1
    • J
      tcp: add memory barriers to write space paths · 3c715127
      jbaron@akamai.com 提交于
      Ensure that we either see that the buffer has write space
      in tcp_poll() or that we perform a wakeup from the input
      side. Did not run into any actual problem here, but thought
      that we should make things explicit.
      Signed-off-by: NJason Baron <jbaron@akamai.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3c715127
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · b8ce8d72
      Linus Torvalds 提交于
      Pull more input subsystem updates from Dmitry Torokhov:
      
       - an update to Atmel MXT driver that makes it functional on Google
         Pixel 2 boxes (both touchpad and touchscreen)
      
       - a new VMware VMMouse driver that should allow us drop X vmmouse
         driver that requires root privileges (since it accesses ioports)
      
       - XBox One controllers now support force feedback (rumble)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: lm8333 - fix broken email address
        Input: cyapa - fix setting suspend scan rate
        Input: elan_i2c - fix calculating number of x and y traces.
        Input: elan_i2c - report hovering contacts
        Input: elants_i2c - zero-extend hardware ID in firmware name
        Input: alps - document separate pointstick button bits for V2 devices
        Input: atmel_mxt_ts - add support for Google Pixel 2
        Input: xpad - add rumble support for Xbox One controller
        Input: ff-core - use new debug macros
        Input: add vmmouse driver
        Input: elan_i2c - adjust for newer firmware pressure reporting
      b8ce8d72
    • L
      media: remove unused variable that causes a warning · 1d11437f
      Linus Torvalds 提交于
      My 'allmodconfig' build is _almost_ free of warnings, and most of the
      remaining ones are for legacy drivers that just do bad things that I
      can't find it in my black heart to care too much about.  But this one
      was just annoying me:
      
         drivers/media/v4l2-core/videobuf2-core.c:3256:26: warning: unused variable ‘fileio’ [-Wunused-variable]
      
      because commit 0e661006 ("[media] vb2: fix 'UNBALANCED' warnings
      when calling vb2_thread_stop()") removed all users of 'fileio' and
      instead calls "__vb2_cleanup_fileio(q)" to clean up q->fileio.  But the
      now unused 'fileio' variable was left around.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1d11437f
    • D
      Merge branch 'next' into for-linus · 48853389
      Dmitry Torokhov 提交于
      Prepare second round of updates for 4.1 merge window.
      48853389
    • L
      Merge tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 0c8027d5
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
      
       - a new frontend driver for new ATSC devices: lgdt3306a
      
       - a new sensor driver: ov2659
      
       - a new platform driver: xilinx
      
       - the m88ts2022 tuner driver was merged at ts2020 driver
      
       - the media controller gained experimental support for DVB and hybrid
         devices
      
       - lots of random cleanups, fixes and improvements on media drivers
      
      * tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (404 commits)
        [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
        [media] uvcvideo: fix cropcap v4l2-compliance failure
        [media] media: omap3isp: remove unused clkdev
        [media] coda: Add tracing support
        [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
        [media] coda: fix fill bitstream errors in nonstreaming case
        [media] coda: call SEQ_END when the first queue is stopped
        [media] coda: fail to start streaming if userspace set invalid formats
        [media] coda: remove duplicate error messages for buffer allocations
        [media] coda: move parameter buffer in together with context buffer allocation
        [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
        [media] coda: allocate per-context buffers from REQBUFS
        [media] coda: use strlcpy instead of snprintf
        [media] coda: bitstream payload is unsigned
        [media] coda: fix double call to debugfs_remove
        [media] coda: check kasprintf return value in coda_open
        [media] coda: bitrate can only be set in kbps steps
        [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
        [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
        [media] coda: set allow_zero_bytesused flag for vb2_queue_init
        ...
      0c8027d5
    • L
      Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 1fc14993
      Linus Torvalds 提交于
      Pull char/misc driver updates from Greg KH:
       "Here's the big char/misc driver patchset for 4.1-rc1.
      
        Lots of different driver subsystem updates here, nothing major, full
        details are in the shortlog.
      
        All of this has been in linux-next for a while"
      
      * tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
        mei: trace: remove unused TRACE_SYSTEM_STRING
        DTS: ARM: OMAP3-N900: Add lis3lv02d support
        Documentation: DT: lis302: update wakeup binding
        lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
        lis3lv02d: DT: use s32 to support negative values
        Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
        Drivers: hv: hv_balloon: correctly handle val.freeram<num_pages case
        mei: replace check for connection instead of transitioning
        mei: use mei_cl_is_connected consistently
        mei: fix mei_poll operation
        hv_vmbus: Add gradually increased delay for retries in vmbus_post_msg()
        Drivers: hv: hv_balloon: survive ballooning request with num_pages=0
        Drivers: hv: hv_balloon: eliminate jumps in piecewiese linear floor function
        Drivers: hv: hv_balloon: do not online pages in offline blocks
        hv: remove the per-channel workqueue
        hv: don't schedule new works in vmbus_onoffer()/vmbus_onoffer_rescind()
        hv: run non-blocking message handlers in the dispatch tasklet
        coresight: moving to new "hwtracing" directory
        coresight-tmc: Adding a status interface to sysfs
        coresight: remove the unnecessary configuration coresight-default-sink
        ...
      1fc14993
    • L
      Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 41d5e08e
      Linus Torvalds 提交于
      Pull tty/serial updates from Greg KH:
       "Here's the big tty/serial driver update for 4.1-rc1.
      
        It was delayed for a bit due to some questions surrounding some of the
        console command line parsing changes that are in here.  There's still
        one tiny regression for people who were previously putting multiple
        console command lines and expecting them all to be ignored for some
        odd reason, but Peter is working on fixing that.  If not, I'll send a
        revert for the offending patch, but I have faith that Peter can
        address it.
      
        Other than the console work here, there's the usual serial driver
        updates and changes, and a buch of 8250 reworks to try to make that
        driver easier to maintain over time, and have it support more devices
        in the future.
      
        All of these have been in linux-next for a while"
      
      * tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
        n_gsm: Drop unneeded cast on netdev_priv
        sc16is7xx: expose RTS inversion in RS-485 mode
        serial: 8250_pci: port failed after wakeup from S3
        earlycon: 8250: Document kernel command line options
        earlycon: 8250: Fix command line regression
        earlycon: Fix __earlycon_table stride
        tty: clean up the tty time logic a bit
        serial: 8250_dw: only get the clock rate in one place
        serial: 8250_dw: remove useless ACPI ID check
        dmaengine: hsu: move memory allocation to GFP_NOWAIT
        dmaengine: hsu: remove redundant pieces of code
        serial: 8250_pci: add Intel Tangier support
        dmaengine: hsu: add Intel Tangier PCI ID
        serial: 8250_pci: replace switch-case by formula for Intel MID
        serial: 8250_pci: replace switch-case by formula
        tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1
        serial: jsm: some off by one bugs
        serial: xuartps: Fix check in console_setup().
        serial: xuartps: Get rid of register access macros.
        serial: xuartps: Fix iobase use.
        ...
      41d5e08e
    • L
      Merge tag 'pinctrl-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8d582b94
      Linus Torvalds 提交于
      Pull pincontrol Kconfig fix from Linus Walleij:
       "This fixes the annoying Kconfig noise from pin control.  Mea Culpa"
      
      * tag 'pinctrl-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: fix allmodconfig noise
      8d582b94
    • L
      Merge tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · e98bf5ce
      Linus Torvalds 提交于
      Pull clock framework updates from Michael Turquette:
       "The changes to the common clock framework for 4.0 are mostly new clock
        drivers and updates to existing ones for feature enhancements and bug
        fixes.
      
        There is more churn than usual in the framework core due to the change
        to introduce per-user unique struct clk pointers in 4.0.  This caused
        several regressions to surface, some of which were sent as fixes to
        4.0.  New generic clock drivers were added for GPIO- and PWM-based
        clock controllers.
      
        Additionally the common clk-divider code recieved several fixes to the
        way it rounds rates"
      
      * tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (91 commits)
        clk: check ->determine/round_rate() return value in clk_calc_new_rates
        clk: at91: usb: propagate rate modification to the parent clk
        clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
        clk: don't use __initconst for non-const arrays
        clk: at91: change to using endian agnositc IO
        clk: clk-gpio-gate: Fix active low
        clk: Add PWM clock driver
        clk: Add clock driver for mb86s7x
        clk: pxa: pxa3xx: add missing os timer clock
        clk: tegra: Use the proper parent for plld_dsi
        clk: tegra: Use generic tegra_osc_clk_init() on Tegra114
        clk: tegra: Model oscillator as clock
        clk: tegra: Add peripheral registers for bank Y
        clk: tegra: Register the proper number of resets
        clk: tegra: Remove needless initializations
        clk: tegra: Use consistent indentation
        clk: tegra: Various whitespace cleanups
        clk: tegra: Enable HDA to HDMI clocks on Tegra124
        clk: tegra: Fix a bunch of sparse warnings
        clk: tegra: Fix typo tabel -> table
        ...
      e98bf5ce
    • L
      Revert "ocfs2: incorrect check for debugfs returns" · 8f443e23
      Linus Torvalds 提交于
      This reverts commit e2ac55b6.
      
      Huang Ying reports that this causes a hang at boot with debugfs disabled.
      
      It is true that the debugfs error checks are kind of confusing, and this
      code certainly merits more cleanup and thinking about it, but there's
      something wrong with the trivial "check not just for NULL, but for error
      pointers too" patch.
      
      Yes, with debugfs disabled, we will end up setting the o2hb_debug_dir
      pointer variable to an error pointer (-ENODEV), and then continue as if
      everything was fine.  But since debugfs is disabled, all the _users_ of
      that pointer end up being compiled away, so even though the pointer can
      not be dereferenced, that's still fine.
      
      So it's confusing and somewhat questionable, but the "more correct"
      error checks end up causing more trouble than they fix.
      Reported-by: NHuang Ying <ying.huang@intel.com>
      Acked-by: NAndrew Morton <akpm@linux-foundation.org>
      Acked-by: NChengyu Song <csong84@gatech.edu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8f443e23
  3. 21 4月, 2015 17 次提交
    • M
      Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus · 64131a87
      Mauro Carvalho Chehab 提交于
      * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
        media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
        hexdump: avoid warning in test function
        fs: take i_mutex during prepare_binprm for set[ug]id executables
        smp: Fix error case handling in smp_call_function_*()
        iommu-common: Fix PARISC compile-time warnings
        sparc: Make LDC use common iommu poll management functions
        sparc: Make sparc64 use scalable lib/iommu-common.c functions
        Break up monolithic iommu table/lock into finer graularity pools and lock
        sparc: Revert generic IOMMU allocator.
        tools/power turbostat: correct dumped pkg-cstate-limit value
        tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
        tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
        tools/power turbostat: Initial Skylake support
        tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
        tools/power turbostat: modprobe msr, if needed
        tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
        tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
        Bluetooth: hidp: Fix regression with older userspace and flags validation
        config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
        perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
        ...
      
      That solves several merge conflicts:
      	Documentation/DocBook/media/v4l/subdev-formats.xml
      	Documentation/devicetree/bindings/vendor-prefixes.txt
      	drivers/staging/media/mn88473/mn88473.c
      	include/linux/kconfig.h
      	include/uapi/linux/media-bus-format.h
      
      The ones at subdev-formats.xml and media-bus-format.h are not trivial.
      That's why we opted to merge from DRM.
      64131a87
    • M
      Merge branch 'patchwork' into v4l_for_linus · 676ee36b
      Mauro Carvalho Chehab 提交于
      * patchwork: (404 commits)
        [media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
        [media] uvcvideo: fix cropcap v4l2-compliance failure
        [media] media: omap3isp: remove unused clkdev
        [media] coda: Add tracing support
        [media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
        [media] coda: fix fill bitstream errors in nonstreaming case
        [media] coda: call SEQ_END when the first queue is stopped
        [media] coda: fail to start streaming if userspace set invalid formats
        [media] coda: remove duplicate error messages for buffer allocations
        [media] coda: move parameter buffer in together with context buffer allocation
        [media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
        [media] coda: allocate per-context buffers from REQBUFS
        [media] coda: use strlcpy instead of snprintf
        [media] coda: bitstream payload is unsigned
        [media] coda: fix double call to debugfs_remove
        [media] coda: check kasprintf return value in coda_open
        [media] coda: bitrate can only be set in kbps steps
        [media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
        [media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
        [media] coda: set allow_zero_bytesused flag for vb2_queue_init
        ...
      676ee36b
    • A
      altera tse: Error-Bit on tx-avalon-stream always set. · 71cd26e7
      Andreas Oetken 提交于
      The Error-Bit on the avalon streaming interface of the
      tx-dma-channel was always set. In SGMII configurations
      this leads to error-symbols on the PCS and packet-rejection
      on the receiver side (e.g. SGMII/1000Base-X connected switch).
      
      This only applies to the tse-configuration with MSGDMA.
      
      This issue was detected and fixed on a custom board with
      a direct connection to a Marvell switch in SGMII-PHY-Mode.
      (incl. custom patches for SGMII-PCS).
      
      According to the datasheet if ff_tx_err (avalon-streaming)
      is set it is forwarded to gm_tx_err. As a result the PCS
      is forwarding the error by sending a "/V/"-caracter.
      Signed-off-by: NAndreas Oetken <ennoerlangen@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      71cd26e7
    • V
      net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN · 47cf1e65
      Vivien Didelot 提交于
      Minor, use the explicit PORT_DEFAULT_VLAN define instead of 0x07.
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Acked-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      47cf1e65
    • V
      net: dsa: mv88e6xxx: fix setup of port control 1 · 614f03fc
      Vivien Didelot 提交于
      mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
      offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).
      
      Fixes: cca8b133 ("net: dsa: Use mnemonics rather than register numbers")
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Acked-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      614f03fc
    • D
      Merge branch 'ppp_csum_unset' · 91f5bd84
      David S. Miller 提交于
      Tom Herbert says:
      
      ====================
      net: Fix "hw csum failure" message flood for ppp tunnel
      
      This patch set addresses bug "Bug 95171 - "hw csum failure" message
      flood for ppp tunnel since upgrade to 3.16". The problem is that pppoe
      is being used over UDP with UDP checksusm enabled. On receive
      checksum conversion turns checksum-unnecessary in checksum-
      complete. The PPP receive functions do not properly pull
      the checksum over its headers, so that when an encapsulated
      checksums is considered the checksum-complete value is incorrect.
      
      This patch adds skb_checksum_complete_unset which can be called
      in the receive path in lieu of pulling checksum complete in
      layer. This is useful when the packet is being modified (e.g.
      decompressed) and the checksum-complete value is no longer
      relevant.
      
      In the ppp_receive_frame we call skb_checksum_complete_unset to toss
      out checksum-complete. This should eliminate the reported messages.
      Alternatively, we could add skb_postpull_rcsum and probably
      special case handling for VJ compression if maintaining the
      checksum-complete is needed (not clear to me this is worth the
      effort).
      
      I haven't tested this since setting up the failure scenario doesn't
      seem trivial to configure.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      91f5bd84
    • T
      ppp: call skb_checksum_complete_unset in ppp_receive_frame · 3dfb0534
      Tom Herbert 提交于
      Call checksum_complete_unset in PPP receive to discard checksum-complete
      value. PPP does not pull checksum for headers and also modifies packet
      as in VJ compression.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3dfb0534
    • T
      net: add skb_checksum_complete_unset · 4e18b9ad
      Tom Herbert 提交于
      This function changes ip_summed to CHECKSUM_NONE if CHECKSUM_COMPLETE
      is set. This is called to discard checksum-complete when packet
      is being modified and checksum is not pulled for headers in a layer.
      Signed-off-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4e18b9ad
    • L
      Merge tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 646da631
      Linus Torvalds 提交于
      Pull remoteproc update from Ohad Ben-Cohen:
       "Suman Anna is adding remoteproc support for processors not behind
        IOMMUs"
      
      * tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: add IOMMU hardware capability flag
      646da631
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 8f49309a
      Linus Torvalds 提交于
      Pull misc kbuild updates:
       "This is the remaining part of kbuild stuff for v4.1-rc1:
      
         - One wew coccinelle script and a clarification of the proposed fix
           in bugon.coccinelle
      
         - CONFIG_KERNEL_LZ4 support for extract-ikconfig"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/coccinelle/misc/bugon.cocci: update bug_on conversion warning
        scripts/extract-ikconfig: Support LZ4-compressed images.
        irqf_oneshot.cocci: add check of devm_request_threaded_irq()
      8f49309a
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · b153f1d3
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "I'd like to say these were a set of regressions for the recent merge
        window code.  Unfortunately, they all predate the merge window code
        (stable cc'd).
      
        There are two fixes for data integrity (mostly only showing up on
        module removal), an mvsas crash with expander attached SATA devices
        which goes back to the dawn of the driver but is only just being
        picked up as sas expanders become a standard item in low end server
        hardware, an am53c974 one because the interrupt data isn't fully
        initialised before the line is and a megaraid_sas one because it uses
        smp_processor_id() to select MSI-X queues and that now triggers a
        WARN_ON()"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        mvsas: fix panic on expander attached SATA devices
        am53c974: Fix crash during modprobe
        megaraid_sas: use raw_smp_processor_id()
        sd: Fix missing ATO tag check
        sd: Unregister integrity profile
      b153f1d3
    • L
      Merge tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · bf2ae5d3
      Linus Torvalds 提交于
      Pull fbdev updates from Tomi Valkeinen:
       "Small fixes and improvements to various fbdev drivers"
      
      * tag 'fbdev-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (24 commits)
        omapdss: extend pm notifier to handle hibernation
        OMAPDSS: Correct video ports description file path in DT binding doc
        OMAPDSS: disable VT switch
        fbdev: sh_mobile_lcdc: Fix destruction of uninitialized mutex
        video: fbdev: sh_mobile_lcdcfb: Fix ROP3 sysfs attribute parsing
        fbdev: pm3fb: cleanup some confusing indenting
        hyperv: hyperv_fb: match wait_for_completion_timeout return type
        video: fbdev: use msecs_to_jiffies for time conversions
        fbdev: via/via_clock: fix sparse warning
        video: fbdev: make of_device_id array const
        fbdev: sm501fb: use memset_io
        OMAPDSS: workaround for MFLAG + NV12 issue
        OMAPDSS: Add support for MFLAG
        OMAPDSS: setup default fifo thresholds
        OMAPDSS: DISPC: lock access to DISPC_CONTROL & DISPC_CONFIG
        OMAPDSS: DISPC: fix div by zero issue in overlay scaling
        OMAPDSS: DISPC: change sync_pclk_edge default value
        OMAPDSS: change signal_level & signal_edge enum values
        OMAPDSS: DISPC: explicit handling for sync and de levels
        OMAPDSS: DISPC: remove OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES
        ...
      bf2ae5d3
    • L
      Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux · 14aa0244
      Linus Torvalds 提交于
      Pull drm updates from Dave Airlie:
       "Highlights:
      
        Core:
         - Virtual GEM layer merged, this has been around for a long time, and
           it provides a software backed device that allows userspace to use
           it as a GEM shared memory handler.  This makes it a lot easier to
           do certain things when you have no GPU but still have to deal with
           DRI expectations.
         - atomic helper updates.
         - framebuffer modifier interface added.
         - i2c over auxch displayport fixes.
         - fb width/height confusion fixes.
         - new driver for ps8622/ps8625 bridge chips
         - lots of new panels
      
        i915:
         - more plane atomic conversion
         - vGPU guest support for XenGT
         - Skylake workarounds and fixes
         - Y-tiling support
         - work on dynamic pagetable allocation
         - EU count report param for gen9+
         - CHV fixes (no longer prelim)
         - remove ilk rc6
         - frontbuffer tracking for fbc
         - Displayport link rate refactoring
         - sprite colorkey refactor
      
        radeon:
         - Displayport MST support (not enabled by default)
         - non-ATOM native hw auxch support (DCE5+)
         - output csc support
         - new queries for userspace debug support
         - new VCE packet
      
        nouveau:
         - gk20a iommu support
         - gm107 graphics support
         - more gm20x bringup (waiting on signed nvidia fw).
      
        amdkfd:
         - multiple kgd instance support
         - use 64-bit time accessors
      
        msm:
         - stolen memory support
         - DSI and dual-DSI support
         - snapdragon 410 support
      
        exynos:
         - cleanups for atomic and pageflip
      
        imx-drm:
         - more media-bus formats
         - TV output prep
         - drm panel support
      
        tegra:
         - hw vblank counter using host1x syncpoints
      
        omap:
         - universal plane support
         - prep work for atomic modesetting
      
        rcar-du:
         - ported to atomic modesetting
      
        atmel-hlcdc:
         - ported to atomic modesetting
         - added suspend/resume support
      
        sti:
         - ported to atomic modesetting
      
        dwhdmi:
         - more compliant audio support
         - update rockchip phy support
      
        tda998x:
         - DT probing for attached crtcs
         - simplified EDID reading
      
        rockchip:
         - fixes
      
        adv7511:
         - fixes"
      
      * 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (689 commits)
        media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
        drm/i915: Dont enable CS_PARSER_ERROR interrupts at all
        drm/i915: Move drm_framebuffer_unreference out of struct_mutex for takeover
        drm: fix trivial typo mistake
        drm: Make integer overflow checking cover universal cursor updates (v2)
        drm/nouveau/bios: fix fetching from acpi on certain systems
        drm/nouveau/gr/gm206: initial init+ctx code
        drm/nouveau/ce/gm206: enable support via gm204 code
        drm/nouveau/fifo/gm206: enable support via gm204 code
        drm/nouveau/gr/gm204: initial init+ctx code
        drm/nouveau: support for buffer moves via MaxwellDmaCopyA
        drm/nouveau/ce/gm204: initial support
        drm/nouveau: add support for gm20x fifo channels
        drm/nouveau/fifo/gm204: initial support
        drm/nouveau/gr/gk104-: prevent reading non-existent regs in intr handler
        drm/nouveau/gr/gm107: very slightly demagic part of attrib cb setup
        drm/nouveau/gr/gk104-: correct crop/zrop num_active_fbps setting
        drm/nouveau/gr/gf100-: add symbolic names for classes
        drm/nouveau/gr/gm107: support tpc "strand" ctxsw in gpccs ucode
        drm/nouveau/gr/gf100-: support mmio access with gpc offset from gpccs ucode
        ...
      14aa0244
    • J
      pppoe: Lacks DST MAC address check · a068833b
      Joakim Tjernlund 提交于
      A pppoe session is identified by its session ID and MAC address.
      Currently pppoe does not check if the received pkg has the correct
      MAC address. This is a problem when the eth I/F is in promisc mode
      as then any DST MAC address is accepted.
      Signed-off-by: NJoakim Tjernlund <joakim.tjernlund@transmode.se>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a068833b
    • D
      Merge branch 'iommu-common-fixes' · 41137566
      David S. Miller 提交于
      Sowmini Varadhan says:
      
      ====================
      iommu-common build warning fixes.
      
      This patchset has fixes for 2 architectures
      - Part 1: x86_64 warnings generated by sparse
      - Part 2: allmodconfig build error for powerpc, identified by Guenter Roeck.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      41137566
    • S
      iommu-common: rename iommu_pool_hash to iommu_hash_common · 7b3372d4
      Sowmini Varadhan 提交于
      When CONFIG_DEBUG_FORCE_WEAK_PER_CPU is set, the DEFINE_PER_CPU_SECTION
      macro will define an extern __pcpu_unique_##name variable that could
      conflict with the same definition in powerpc at this time. Avoid that
      conflict by renaming iommu_pool_hash in iommu-common.c
      
      Thanks to Guenter Roeck for catching this, and helping to test the fix.
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Tested-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7b3372d4
    • S
      iommu-common: fix x86_64 compiler warnings · b0cc836d
      Sowmini Varadhan 提交于
      Declare iommu_large_alloc as static. Remove extern definition  for
      iommu_tbl_pool_init().
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Tested-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b0cc836d