1. 20 Feb, 2014 1 commit
  2. 19 Feb, 2014 11 commits
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · e95003c3
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include stable fixes for the following bugs:
      
         - General performance regression due to NFS_INO_INVALID_LABEL being
           set when the server doesn't support labeled NFS
         - Hang in the RPC code due to a socket out-of-buffer race
         - Infinite loop when trying to establish the NFSv4 lease
         - Use-after-free bug in the RPCSEC gss code.
         - nfs4_select_rw_stateid is returning with a non-zero error value on
           success
      
        Other bug fixes:
      
        - Potential memory scribble in the RPC bi-directional RPC code
        - Pipe version reference leak
        - Use the correct net namespace in the new NFSv4 migration code"
      
      * tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS fix error return in nfs4_select_rw_stateid
        NFSv4: Use the correct net namespace in nfs4_update_server
        SUNRPC: Fix a pipe_version reference leak
        SUNRPC: Ensure that gss_auth isn't freed before its upcall messages
        SUNRPC: Fix potential memory scribble in xprt_free_bc_request()
        SUNRPC: Fix races in xs_nospace()
        SUNRPC: Don't create a gss auth cache unless rpc.gssd is running
        NFS: Do not set NFS_INO_INVALID_LABEL unless server supports labeled NFS
      e95003c3
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd · 981adacd
      Linus Torvalds authored
      Pull MFD fixes from Lee Jones:
       "Couple of small issues solved:
         - Suspend/Resume call-backs require CONFIG_PM_SLEEP
         - Some drivers written for 32bit architectures fail when compiled
           with a 64bit compiler.  The fixes will future proof the drivers"
      
      * tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd:
        mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP
        mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP
        mfd: tps65217: Naturalise cross-architecture discrepancies
        mfd: wm8994-core: Naturalise cross-architecture discrepancies
        mfd: max8998: Naturalise cross-architecture discrepancies
        mfd: max8997: Naturalise cross-architecture discrepancies
      981adacd
    • Andy Adamson's avatar
      NFS fix error return in nfs4_select_rw_stateid · 146d70ca
      Andy Adamson authored
      Do not return an error when nfs4_copy_delegation_stateid succeeds.
      Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
      Link: http://lkml.kernel.org/r/1392737765-41942-1-git-send-email-andros@netapp.com
      Fixes: ef1820f9 (NFSv4: Don't try to recover NFSv4 locks when...)
      Cc: NeilBrown <neilb@suse.de>
      Cc: stable@vger.kernel.org # 3.12+
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
      146d70ca
    • Geert Uytterhoeven's avatar
      mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP · 8321bbf8
      Geert Uytterhoeven authored
      If CONFIG_PM_SLEEP=n:
      
      drivers/mfd/sec-core.c:349: warning: ‘sec_pmic_suspend’ defined but not used
      drivers/mfd/sec-core.c:371: warning: ‘sec_pmic_resume’ defined but not used
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      8321bbf8
    • Geert Uytterhoeven's avatar
      mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP · 3edeb1e4
      Geert Uytterhoeven authored
      If CONFIG_PM_SLEEP=n:
      
      drivers/mfd/max14577.c:177: warning: ‘max14577_suspend’ defined but not used
      drivers/mfd/max14577.c:200: warning: ‘max14577_resume’ defined but not used
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      3edeb1e4
    • Lee Jones's avatar
      mfd: tps65217: Naturalise cross-architecture discrepancies · 5c6fbd56
      Lee Jones authored
      If we compile the TPS65217 for a 64bit architecture we receive the following
      warnings:
      
      drivers/mfd/tps65217.c: In function ‘tps65217_probe’:
      drivers/mfd/tps65217.c:173:13:
        warning: cast from pointer to integer of different size
         chip_id = (unsigned int)match->data;
                   ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      5c6fbd56
    • Lee Jones's avatar
      mfd: wm8994-core: Naturalise cross-architecture discrepancies · 7f8279ce
      Lee Jones authored
      If we compile the WM8994 for a 64bit architecture we receive the following
      warnings:
      
      drivers/mfd/wm8994-core.c: In function ‘wm8994_i2c_probe’:
      drivers/mfd/wm8994-core.c:639:19:
        warning: cast from pointer to integer of different size
          wm8994->type = (int)of_id->data;
                         ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      7f8279ce
    • Lee Jones's avatar
      mfd: max8998: Naturalise cross-architecture discrepancies · 8bace2d5
      Lee Jones authored
      If we compile the MAX8998 for a 64bit architecture we receive the following
      warnings:
      
        drivers/mfd/max8998.c: In function ‘max8998_i2c_get_driver_data’:
        drivers/mfd/max8998.c:178:10:
          warning: cast from pointer to integer of different size
           return (int)match->data;
                  ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      8bace2d5
    • Lee Jones's avatar
      mfd: max8997: Naturalise cross-architecture discrepancies · 05fb7a56
      Lee Jones authored
      If we compile the MAX8997 for a 64bit architecture we receive the following
      warnings:
      
        drivers/mfd/max8997.c: In function ‘max8997_i2c_get_driver_data’:
        drivers/mfd/max8997.c:173:10:
          warning: cast from pointer to integer of different size
           return (int)match->data;
                  ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      05fb7a56
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 960dfc4e
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Lots of little small things, nothing too major: nouveau regression
        fixes, vmware fixes for the new hw support, memory leaks in error path
        fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
        drm/radeon/ni: fix typo in dpm sq ramping setup
        drm/radeon/si: fix typo in dpm sq ramping setup
        drm/radeon: fix CP semaphores on CIK
        drm/radeon: delete a stray tab
        drm/radeon: fix display tiling setup on SI
        drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
        drm/radeon: fill in DRM_CAPs for cursor size
        drm: add DRM_CAPs for cursor size
        drm/radeon: unify bpc handling
        drm/ttm: Fix memory leak in ttm_agp_backend.c
        drm/ttm: declare 'struct device' in ttm_page_alloc.h
        drm/nouveau: fix TTM_PL_TT memtype on pre-nv50
        drm/nv50/disp: use correct register to determine DP display bpp
        drm/nouveau/fb: use correct ram oclass for nv1a hardware
        drm/nv50/gr: add missing nv_error parameter priv
        drm/nouveau: fix ENG_RUNLIST register address
        drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
        drm/nv4c/vga: decode register is in a different place on nv4x igp's
        drm/nv4c/mc: nv4x igp's have a different msi rearm register
        drm/nouveau: set irq_enabled manually
        ...
      960dfc4e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 525b8709
      Linus Torvalds authored
      Pull HID update from Jiri Kosina:
      
       - fixes for several bugs in incorrect allocations of buffers by David
         Herrmann and Benjamin Tissoires.
      
       - support for a few new device IDs by Archana Patni, Benjamin
         Tissoires, Huei-Horng Yo, Reyad Attiyat and Yufeng Shen
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: hyperv: make sure input buffer is big enough
        HID: Bluetooth: hidp: make sure input buffers are big enough
        HID: hid-sensor-hub: quirk for STM Sensor hub
        HID: apple: add Apple wireless keyboard 2011 JIS model support
        HID: fix buffer allocations
        HID: multitouch: add FocalTech FTxxxx support
        HID: microsoft: Add ID's for Surface Type/Touch Cover 2
        HID: usbhid: quirk for CY-TM75 75 inch Touch Overlay
      525b8709
  3. 18 Feb, 2014 28 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b0d3f6d4
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) kvaser CAN driver has fixed limits of some of it's table, validate
          that we won't exceed those limits at probe time.  Fix from Olivier
          Sobrie.
      
       2) Fix rtl8192ce disabling interrupts for too long, from Olivier
          Langlois.
      
       3) Fix botched shift in ath5k driver, from Dan Carpenter.
      
       4) Fix corruption of deferred packets in TIPC, from Erik Hugne.
      
       5) Fix newlink error path in macvlan driver, from Cong Wang.
      
       6) Fix netpoll deadlock in bonding, from Ding Tianhong.
      
       7) Handle GSO packets properly in forwarding path when fragmentation is
          necessary on egress, from Florian Westphal.
      
       8) Fix axienet build errors, from Michal Simek.
      
       9) Fix refcounting of ubufs on tx in vhost net driver, from Michael S
          Tsirkin.
      
      10) Carrier status isn't set properly in hyperv driver, from Haiyang
          Zhang.
      
      11) Missing pci_disable_device() in tulip_remove_one), from Ingo Molnar.
      
      12) AF_PACKET qdisc bypass mode doesn't adhere to driver provided TX
          queue selection method.  Add a fallback method mechanism to fix this
          bug, from Daniel Borkmann.
      
      13) Fix regression in link local route handling on GRE tunnels, from
          Nicolas Dichtel.
      
      14) Bonding can assign dup aggregator IDs in some sequences of
          configuration, fix by making the allocation counter per-bond instead
          of global.  From Jiri Bohac.
      
      15) sctp_connectx() needs compat translations, from Daniel Borkmann.
      
      16) Fix of_mdio PHY interrupt parsing, from Ben Dooks
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
        MAINTAINERS: add entry for the PHY library
        of_mdio: fix phy interrupt passing
        net: ethernet: update dependency and help text of mvneta
        NET: fec: only enable napi if we are successful
        af_packet: remove a stray tab in packet_set_ring()
        net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode
        ipv4: fix counter in_slow_tot
        irtty-sir.c: Do not set_termios() on irtty_close()
        bonding: 802.3ad: make aggregator_identifier bond-private
        usbnet: remove generic hard_header_len check
        gre: add link local route when local addr is any
        batman-adv: fix potential kernel paging error for unicast transmissions
        batman-adv: avoid double free when orig_node initialization fails
        batman-adv: free skb on TVLV parsing success
        batman-adv: fix TT CRC computation by ensuring byte order
        batman-adv: fix potential orig_node reference leak
        batman-adv: avoid potential race condition when adding a new neighbour
        batman-adv: properly check pskb_may_pull return value
        batman-adv: release vlan object after checking the CRC
        batman-adv: fix TT-TVLV parsing on OGM reception
        ...
      b0d3f6d4
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 91c6c8dc
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A range of ARM fixes.  Biggest change is the stage-2 attributes used
        for for hyp mode which were wrong.  I've killed some bits in a couple
        of DT files which turned out not to be required, and a few other
        fixes.
      
        One fix touches code outside of arch/arm, which is related to sorting
        out the DMA masks correctly.  There is a long standing issue with the
        conversion from PFNs to addresses where people assume that shifting an
        unsigned long left by PAGE_SHIFT results in a correct address.  This
        is not the case with C: the integer promotion happens at assignment
        after evaluation.  This fixes the recently introduced dma_max_pfn()
        function, but there's a number of other places where we try this
        directly on an unsigned long in the mm code"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: 7957/1: add DSB after icache flush in __flush_icache_all()
        Fix uses of dma_max_pfn() when converting to a limiting address
        ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev
        ARM: 7953/1: mm: ensure TLB invalidation is complete before enabling MMU
        ARM: 7952/1: mm: Fix the memblock allocation for LPAE machines
        ARM: 7950/1: mm: Fix stage-2 device memory attributes
        ARM: dts: fix spdif pinmux configuration
      91c6c8dc
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy · 341bbdc5
      Linus Torvalds authored
      Pull jfs fix from David Kleikamp:
       "Another ACL regression. This one more subtle"
      
      * tag 'jfs-3.14-rc4' of git://github.com/kleikamp/linux-shaggy:
        jfs: set i_ctime when setting ACL
      341bbdc5
    • Florian Fainelli's avatar
      MAINTAINERS: add entry for the PHY library · 22f08ad9
      Florian Fainelli authored
      The PHY library has been subject to some changes, new drivers and DT
      interactions over the past few months. Add myself as a maintainer for
      the core PHY library parts and drivers. Make sure the PHY library entry
      also covers the Device Tree files which have a close interaction with
      the MDIO bus, PHY connection and Ethernet PHY mode parsing.
      
      CC: Grant Likely <grant.likely@linaro.org>
      CC: Shaohui Xie <shaohui.xie@freescale.com>
      CC: Andy Fleming <afleming@gmail.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      22f08ad9
    • Ben Dooks's avatar
      of_mdio: fix phy interrupt passing · f15c586d
      Ben Dooks authored
      The of_mdiobus_register_phy() is not setting phy->irq thus causing
      some drivers to incorrectly assume that the PHY does not have an
      IRQ associated with it. Not only do some drivers report no IRQ
      they do not install an interrupt handler for the PHY.
      
      Simplify the code setting irq and set the phy->irq at the same
      time so that we cover the following issues, which should cover
      all the cases the code will find:
      
      - Set phy->irq if node has irq property and mdio->irq is NULL
      - Set phy->irq if node has no irq and mdio->irq is not NULL
      - Leave phy->irq as PHY_POLL default if none of the above
      
      This fixes the issue:
       net eth0: attached PHY 1 (IRQ -1) to driver Micrel KSZ8041RNLI
      
      to the correct:
       net eth0: attached PHY 1 (IRQ 416) to driver Micrel KSZ8041RNLI
      Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f15c586d
    • Thomas Petazzoni's avatar
      net: ethernet: update dependency and help text of mvneta · 4b636b53
      Thomas Petazzoni authored
      With the introduction of the support for Armada 375 and Armada 38x,
      the hidden Kconfig option MACH_ARMADA_370_XP is being renamed to
      MACH_MVEBU_V7. Therefore, the dependency that was used for the mvneta
      driver can no longer work. This commit replaces this dependency by a
      dependency on PLAT_ORION, which is used similarly for the mv643xx_eth
      driver.
      
      In addition to this, it takes this opportunity to adjust the
      description and help text to indicate that the driver can is also used
      for Armada 38x. Note that Armada 375 cannot use this driver as it has
      a completely different networking unit, which will require a separate
      driver.
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4b636b53
    • Russell King's avatar
      NET: fec: only enable napi if we are successful · ce5eaf02
      Russell King authored
      If napi is left enabled after a failed attempt to bring the interface
      up, we BUG:
      
      fec 2188000.ethernet eth0: no PHY, assuming direct connection to switch
      libphy: PHY fixed-0:00 not found
      fec 2188000.ethernet eth0: could not attach to PHY
      ------------[ cut here ]------------
      kernel BUG at include/linux/netdevice.h:502!
      Internal error: Oops - BUG: 0 [#1] SMP ARM
      ...
      PC is at fec_enet_open+0x4d0/0x500
      LR is at __dev_open+0xa4/0xfc
      
      Only enable napi after we are past all the failure paths.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ce5eaf02
    • Dan Carpenter's avatar
      af_packet: remove a stray tab in packet_set_ring() · d7cf0c34
      Dan Carpenter authored
      At first glance it looks like there is a missing curly brace but
      actually the code works the same either way.  I have adjusted the
      indenting but left the code the same.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d7cf0c34
    • Dave Airlie's avatar
      Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes · 75936c65
      Dave Airlie authored
      Pull request of 2014-02-18
      
      One compile fix and one memory leak.
      
      * tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux:
        drm/ttm: Fix memory leak in ttm_agp_backend.c
        drm/ttm: declare 'struct device' in ttm_page_alloc.h
      75936c65
    • Dave Airlie's avatar
      Merge tag 'vmwgfx-fixes-3.14-2014-02-18' of... · 9830e44f
      Dave Airlie authored
      Merge tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes
      
      Pull request of 2014-02-18.
      
      Nothing special. The biggest change is adding a couple of command defines and
      packing the command data correctly.
      
      * tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux:
        drm/vmwgfx: Fix command defines and checks
        drm/vmwgfx: Fix possible integer overflow
        drm/vmwgfx: Remove stray const
        drm/vmwgfx: unlock on error path in vmw_execbuf_process()
        drm/vmwgfx: Get maximum mob size from register SVGA_REG_MOB_MAX_SIZE
        drm/vmwgfx: Fix a couple of sparse warnings and errors
      9830e44f
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 560591f1
      Dave Airlie authored
      Fix for 128x128 cursors, along with some misc fixes.
      
      * 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon/ni: fix typo in dpm sq ramping setup
        drm/radeon/si: fix typo in dpm sq ramping setup
        drm/radeon: fix CP semaphores on CIK
        drm/radeon: delete a stray tab
        drm/radeon: fix display tiling setup on SI
        drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
        drm/radeon: fill in DRM_CAPs for cursor size
        drm: add DRM_CAPs for cursor size
        drm/radeon: unify bpc handling
      560591f1
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · d3ec67c0
      David S. Miller authored
      John W. Linville says:
      
      ====================
      Please pull this batch of fixes intended for the 3.14 stream...
      
      For the iwlwifi one, Emmanuel says:
      
      "As explicitly written in the commit message, we prefer to disable Tx
      AMPDU on NICs supported by iwldvm. This feature gives a big boost in
      Tx performance, but the firmware is buggy and we can't rely on it.
      Our hope is that most of the users out there want wifi to surf on
      the web which means that they care more for Rx traffic than for Tx.
      People who want to enable it can do so with the help of a module
      parameter."
      
      On top of that...
      
      Dan Carpenter fixes a typo/thinko in ath5k.
      
      Olivier Langlois fixes a couple of rtlwifi issues, one which leaves
      IRQs disabled too long (causing a variety of problems elsewhere),
      and one which fixes an incorrect return code when failing to enable
      the NIC.
      
      Russell King fixes a NULL pointer dereference in hostap.
      
      Stanislaw Gruszka fixes a DMA coherence issue in the rtl8187 driver.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d3ec67c0
    • Daniel Borkmann's avatar
      net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode · ffd59393
      Daniel Borkmann authored
      SCTP's sctp_connectx() abi breaks for 64bit kernels compiled with 32bit
      emulation (e.g. ia32 emulation or x86_x32). Due to internal usage of
      'struct sctp_getaddrs_old' which includes a struct sockaddr pointer,
      sizeof(param) check will always fail in kernel as the structure in
      64bit kernel space is 4bytes larger than for user binaries compiled
      in 32bit mode. Thus, applications making use of sctp_connectx() won't
      be able to run under such circumstances.
      
      Introduce a compat interface in the kernel to deal with such
      situations by using a 'struct compat_sctp_getaddrs_old' structure
      where user data is copied into it, and then sucessively transformed
      into a 'struct sctp_getaddrs_old' structure with the help of
      compat_ptr(). That fixes sctp_connectx() abi without any changes
      needed in user space, and lets the SCTP test suite pass when compiled
      in 32bit and run on 64bit kernels.
      
      Fixes: f9c67811 ("sctp: Fix regression introduced by new sctp_connectx api")
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ffd59393
    • David S. Miller's avatar
      Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge · 7ffb0d31
      David S. Miller authored
      Included changes:
      - fix soft-interface MTU computation
      - fix bogus pointer mangling when parsing the TT-TVLV
        container. This bug led to a wrong memory access.
      - fix memory leak by properly releasing the VLAN object
        after CRC check
      - properly check pskb_may_pull() return value
      - avoid potential race condition while adding new neighbour
      - fix potential memory leak by removing all the references
        to the orig_node object in case of initialization failure
      - fix the TT CRC computation by ensuring that every node uses
        the same byte order when hosts with different endianess are
        part of the same network
      - fix severe memory leak by freeing skb after a successful
        TVLV parsing
      - avoid potential double free when orig_node initialization
        fails
      - fix potential kernel paging error caused by the usage of
        the old value of skb->data after skb reallocation
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7ffb0d31
    • Alex Deucher's avatar
      drm/radeon/ni: fix typo in dpm sq ramping setup · 21ed4947
      Alex Deucher authored
      inverted logic.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      21ed4947
    • Alex Deucher's avatar
      drm/radeon/si: fix typo in dpm sq ramping setup · 5b43c3cd
      Alex Deucher authored
      inverted logic.
      Noticed-by: default avatarSylvain BERTRAND <sylware@legeek.net>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      5b43c3cd
    • Christian König's avatar
      drm/radeon: fix CP semaphores on CIK · 8f53492f
      Christian König authored
      The CP semaphore queue on CIK has a bug that triggers if uncompleted
      waits use the same address while a signal is still pending. Work around
      this by using different addresses for each sync.
      Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      8f53492f
    • Dan Carpenter's avatar
      drm/radeon: delete a stray tab · ebc54ffe
      Dan Carpenter authored
      Static checkers complain that probably curly braces were intended here,
      but actually it makes more sense to remove the extra tab.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      ebc54ffe
    • Alex Deucher's avatar
      drm/radeon: fix display tiling setup on SI · 6d8ea7de
      Alex Deucher authored
      Apply the same logic as CI to SI for setting up the
      display tiling parameters.  The num banks may vary
      per tiling index just like CI.
      
      Bugs:
      https://bugs.freedesktop.org/show_bug.cgi?id=71488
      https://bugs.freedesktop.org/show_bug.cgi?id=73946
      https://bugs.freedesktop.org/show_bug.cgi?id=74927Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      6d8ea7de
    • Alex Deucher's avatar
      drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200 · 78b03510
      Alex Deucher authored
      Most laptops seems to have a vblank period of less than
      300 and mclk switching works fine.  Drop the quirk and
      set the default threshold to 200.
      
      bug:
      https://bugzilla.kernel.org/show_bug.cgi?id=70701Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      78b03510
    • Alex Deucher's avatar
      drm/radeon: fill in DRM_CAPs for cursor size · bea61c59
      Alex Deucher authored
      CIK parts are 128x128, older parts are 64x64.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      bea61c59
    • Alex Deucher's avatar
      drm: add DRM_CAPs for cursor size · 8716ed4e
      Alex Deucher authored
      Some hardware may not support standard 64x64 cursors.  Add
      a drm cap to query the cursor size from the kernel.  Some examples
      include radeon CIK parts (128x128 cursors) and armada (32x64 or 64x32).
      This allows things like device specific ddxes to remove asics specific
      logic and also allows xf86-video-modesetting to work properly with hw
      cursors on this hardware. Default to 64 if the driver doesn't specify
      a size.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
      8716ed4e
    • Alex Deucher's avatar
      drm/radeon: unify bpc handling · 7d5a33b0
      Alex Deucher authored
      We were already storing the bpc (bits per color) information
      in radeon_crtc, so just use that everywhere rather than
      calculating it everywhere we use it.  This also allows us
      to change it in one place if we ever want to override it.
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      7d5a33b0
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 805937cf
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "Miscellaneous ext4 bug fixes for v3.14"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        jbd2: fix use after free in jbd2_journal_start_reserved()
        ext4: don't leave i_crtime.tv_sec uninitialized
        ext4: fix online resize with a non-standard blocks per group setting
        ext4: fix online resize with very large inode tables
        ext4: don't try to modify s_flags if the the file system is read-only
        ext4: fix error paths in swap_inode_boot_loader()
        ext4: fix xfstest generic/299 block validity failures
      805937cf
    • Masanari Iida's avatar
      drm/ttm: Fix memory leak in ttm_agp_backend.c · 7a444d1f
      Masanari Iida authored
      This patch fix a memory leak found by cppcheck.
      [drivers/gpu/drm/ttm/ttm_agp_backend.c:129]:
      (error) Memory leak: agp_be
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Reviewed-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      7a444d1f
    • Alexandre Courbot's avatar
      drm/ttm: declare 'struct device' in ttm_page_alloc.h · 728a0cdf
      Alexandre Courbot authored
      Declare 'struct device' explicitly in ttm_page_alloc.h as this file
      does not include any file declaring it. This removes the following
      warning:
      
      	warning: 'struct device' declared inside parameter list
      Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
      Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
      728a0cdf
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of... · c2288d4d
      Dave Airlie authored
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
      
      Nothing too exciting, mostly fixes for ancient boards, but a pretty important fix for DP on some systems.
      
      Thanks,
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau: fix TTM_PL_TT memtype on pre-nv50
        drm/nv50/disp: use correct register to determine DP display bpp
        drm/nouveau/fb: use correct ram oclass for nv1a hardware
        drm/nv50/gr: add missing nv_error parameter priv
        drm/nouveau: fix ENG_RUNLIST register address
        drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
        drm/nv4c/vga: decode register is in a different place on nv4x igp's
        drm/nv4c/mc: nv4x igp's have a different msi rearm register
        drm/nouveau: set irq_enabled manually
      c2288d4d
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel into drm-fixes · 42738c2b
      Dave Airlie authored
      3 fixes plus 1 prep patch, all four cc: stable. Jani will take over from
      here and the plan is that he'll do 3.14-fixes for the entire release just
      to work things out a bit.
      
      * tag 'drm-intel-fixes-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel:
        drm/i915/dp: add native aux defer retry limit
        drm/i915/dp: increase native aux defer retry timeout
        drm/i915: Prevent MI_DISPLAY_FLIP straddling two cachelines on IVB
        drm/i915: Add intel_ring_cachline_align()
      42738c2b