1. 08 Jul, 2014 4 commits
    • Alex Williamson's avatar
      vgaarb: We can own non-decoded resources · 4e4e7dc5
      Alex Williamson authored
      The VGA arbiter does not allow devices to "own" resources that it
      doesn't "decode".  However, it does allow devices to "lock" resources
      that it doesn't decode.  This gets us into trouble because locking
      the resource goes through the same bridge routing updates regardless
      of whether we decode the resource.  This means that when a non-decoded
      resource is released, the bridge is left with VGA routing enabled and
      locking a different device won't clear it.
      
      This happens in the following scenario:
      
      VGA device 01:00.0 (VGA1) is owned by the radeon driver, which
      registers a set_vga_decode function which releases legacy VGA decodes.
      
      VGA device 02:00.0 (VGA2) is any VGA device.
      
      VGA1 user locks VGA resources triggering first_use callback of
      set_vga_decoded, clearing "decode" and "owns" of legacy resources
      on VGA1.
      
      VGA1 user unlocks VGA resources.
      
      VGA2 user locks VGA resources, which skips VGA1 as conflicting as it
      does not "own" legacy resources, although VGA routing is still enabled
      for the VGA1 bridge.  VGA routing is enabled on VGA2 bridge.
      
      VGA2 may or may not receive VGA transactions depending on the bus
      priority of VGA1 vs VGA2 bridge.
      
      To resolve this, we need to allow devices to "own" resources that they
      do not "decode".  This way we can track bus ownership of VGA.  When a
      device decodes VGA, it only means that we must update the command bits
      in cases where the conflicting device is on the same bus.
      Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Dave Airlie <airlied@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      4e4e7dc5
    • Dave Airlie's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next · f71c5d9d
      Dave Airlie authored
      * 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
        drm/omap: remove null test before kfree
        drm/bochs: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
        drm/ttm: recognize ARM arch in ioprot handler
        drm: enable render-nodes by default
        drm/ttm: remove declaration of ttm_tt_cache_flush
        drm/gem: remove misleading gfp parameter to get_pages()
        drm/omap: use __GFP_DMA32 for shmem-backed gem
        drm/i915: use shmem helpers if possible
      
      Conflicts:
      	drivers/gpu/drm/drm_stub.c
      f71c5d9d
    • Dave Airlie's avatar
      Merge tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel into drm-next · afa95e74
      Dave Airlie authored
      misc core patches picked up by Daniel and Jani.
      
      * tag 'topic/core-stuff-2014-06-30' of git://anongit.freedesktop.org/drm-intel:
        drm/fb-helper: Remove unnecessary list empty check in drm_fb_helper_debug_enter()
        drm/fb-helper: Redundant info->fix.type_aux setting in drm_fb_helper_fill_fix()
        drm/debugfs: add an "edid_override" file per connector
        drm/debugfs: add a "force" file per connector
        drm: add register and unregister functions for connectors
        drm: fix uninitialized acquire_ctx fields (v2)
        drm: Driver-specific ioctls range from 0x40 to 0x9f
        drm: Don't export internal module variables
      afa95e74
    • Dave Airlie's avatar
      Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux into drm-next · 4b7ba869
      Dave Airlie authored
      Pull request of 2014-07-04
      
      * tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux:
        drm/vmwgfx: Fix compat shader namespace
      4b7ba869
  2. 07 Jul, 2014 7 commits
  3. 06 Jul, 2014 4 commits
    • Linus Torvalds's avatar
      Linux 3.16-rc4 · cd3de83f
      Linus Torvalds authored
      cd3de83f
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 100193f5
      Linus Torvalds authored
      Pull devicetree bugfix from Grant Likely:
       "Important bug fix for parsing 64-bit addresses on 32-bit platforms.
        Without this patch the kernel will try to use memory ranges that
        cannot be reached"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        of: Check for phys_addr_t overflows in early_init_dt_add_memory_arch
      100193f5
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 8addf0c7
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of 13 fixes, a MAINTAINERS update and a sparse update.
        The fixes are mostly correct value initialisations, avoiding NULL
        derefs and some uninitialised pointer avoidance.
      
        All the patches have been incubated in -next for a few days.  The
        final patch (use the scsi data buffer length to extract transfer size)
        has been rebased to add a cc to stable, but only the commit message
        has changed"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] use the scsi data buffer length to extract transfer size
        virtio-scsi: fix various bad behavior on aborted requests
        virtio-scsi: avoid cancelling uninitialized work items
        ibmvscsi: Add memory barriers for send / receive
        ibmvscsi: Abort init sequence during error recovery
        qla2xxx: Fix sparse warning in qla_target.c.
        bnx2fc: Improve stats update mechanism
        bnx2fc: do not scan uninitialized lists in case of error.
        fc: ensure scan_work isn't active when freeing fc_rport
        pm8001: Fix potential null pointer dereference and memory leak.
        MAINTAINERS: Update LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) maintainers Email IDs
        be2iscsi: remove potential junk pointer free
        be2iscsi: add an missing goto in error path
        scsi_error: set DID_TIME_OUT correctly
        scsi_error: fix invalid setting of host byte
      8addf0c7
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 110e4308
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "i915, tda998x and vmwgfx fixes,
      
        The main one is i915 fix for missing VGA connectors, along with some
        fixes for the tda998x from Russell fixing some modesetting problems.
      
        (still on holidays, but got a spare moment to find these)"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/vmwgfx: Fix incorrect write to read-only register v2:
        drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
        drm/i915: only apply crt_present check on VLV
        drm/i915: Wait for vblank after enabling the primary plane on BDW
        drm/i2c: tda998x: add some basic mode validation
        drm/i2c: tda998x: faster polling for edid
        drm/i2c: tda998x: move drm_i2c_encoder_destroy call
      110e4308
  4. 05 Jul, 2014 12 commits
  5. 04 Jul, 2014 13 commits
    • Linus Torvalds's avatar
      Merge tag 'md/3.16-fixes' of git://neil.brown.name/md · 77c4cf17
      Linus Torvalds authored
      Pull md bugfixes from Neil Brown:
       "Two minor bugfixes for md in 3.16"
      
      * tag 'md/3.16-fixes' of git://neil.brown.name/md:
        md: flush writes before starting a recovery.
        md: make sure GET_ARRAY_INFO ioctl reports correct "clean" status
      77c4cf17
    • Linus Torvalds's avatar
      Merge tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 88b5a850
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This contains a few fixes for HD-audio: yet another Dell headset pin
        quirk, a fixup for Thinkpad T540P, and an improved fix for
        Haswell/Broadwell HDMI clock setup"
      
      * tag 'sound-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller
        drm/i915: provide interface for audio driver to query cdclk
        ALSA: hda - Add a fixup for Thinkpad T540p
        ALSA: hda - Add another headset pin quirk for some Dell machines
      88b5a850
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · b82207b8
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "We've queued up a few fixes in my for-linus branch"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: fix crash when starting transaction
        Btrfs: fix btrfs_print_leaf for skinny metadata
        Btrfs: fix race of using total_bytes_pinned
        btrfs: use E2BIG instead of EIO if compression does not help
        btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
        Btrfs: fix use-after-free when cloning a trailing file hole
        btrfs: fix null pointer dereference in btrfs_show_devname when name is null
        btrfs: fix null pointer dereference in clone_fs_devices when name is null
        btrfs: fix nossd and ssd_spread mount option regression
        Btrfs: fix race between balance recovery and root deletion
        Btrfs: atomically set inode->i_flags in btrfs_update_iflags
        btrfs: only unlock block in verify_parent_transid if we locked it
        Btrfs: assert send doesn't attempt to start transactions
        btrfs compression: reuse recently used workspace
        Btrfs: fix crash when mounting raid5 btrfs with missing disks
        btrfs: create sprout should rename fsid on the sysfs as well
        btrfs: dev replace should replace the sysfs entry
        btrfs: dev add should add its sysfs entry
        btrfs: dev delete should remove sysfs entry
        btrfs: rename add_device_membership to btrfs_kobj_add_device
      b82207b8
    • Marc Zyngier's avatar
      arm64: fix el2_setup check of CurrentEL · 974c8e45
      Marc Zyngier authored
      The CurrentEL system register reports the Current Exception Level
      of the CPU. It doesn't say anything about the stack handling, and
      yet we compare it to PSR_MODE_EL2t and PSR_MODE_EL2h.
      
      It works by chance because PSR_MODE_EL2t happens to match the right
      bits, but that's otherwise a very bad idea. Just check for the EL
      value instead.
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      [catalin.marinas@arm.com: fixed arch/arm64/kernel/efi-entry.S]
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      974c8e45
    • Steve Capper's avatar
      arm64: mm: Make icache synchronisation logic huge page aware · 923b8f50
      Steve Capper authored
      The __sync_icache_dcache routine will only flush the dcache for the
      first page of a compound page, potentially leading to stale icache
      data residing further on in a hugetlb page.
      
      This patch addresses this issue by taking into consideration the
      order of the page when flushing the dcache.
      Reported-by: default avatarMark Brown <broonie@linaro.org>
      Tested-by: default avatarMark Brown <broonie@linaro.org>
      Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Cc: <stable@vger.kernel.org> # v3.11+
      923b8f50
    • Steve Capper's avatar
      arm64: mm: Fix horrendous config typo · f3b766a2
      Steve Capper authored
      The define ARM64_64K_PAGES is tested for rather than
      CONFIG_ARM64_64K_PAGES. Correct that typo here.
      Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      f3b766a2
    • Thomas Hellstrom's avatar
      drm/vmwgfx: Fix compat shader namespace · 18e4a466
      Thomas Hellstrom authored
      Contrary to the host-backed shader interface that has a per-context
      name-space for shaders, the compat shader namespace was per client
      (or rather, per file). Fix this so that the compat shader namespace is per
      context, and at the same time, make command buffer managed context resource
      management generic.
      Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
      18e4a466
    • Mengdong Lin's avatar
      ALSA: hda - restore BCLK M/N value as per CDCLK for HSW/BDW display HDA controller · e4d9e513
      Mengdong Lin authored
      For HSW/BDW display HD-A controller, hda_set_bclk() is defined to set BCLK
      by programming the M/N values as per the core display clock (CDCLK) queried from
      i915 display driver.
      
      And the audio driver will also set BCLK in azx_first_init() since the display
      driver can turn off the shared power in boot phase if only eDP is connected
      and M/N values will be lost and must be reprogrammed.
      Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      e4d9e513
    • Jani Nikula's avatar
      drm/i915: provide interface for audio driver to query cdclk · c149dcb5
      Jani Nikula authored
      For Haswell and Broadwell, if the display power well has been disabled,
      the display audio controller divider values EM4 M VALUE and EM5 N VALUE
      will have been lost. The CDCLK frequency is required for reprogramming them
      to generate 24MHz HD-A link BCLK. So provide a private interface for the
      audio driver to query CDCLK.
      
      This is a stopgap solution until a more generic interface between audio
      and display drivers has been implemented.
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
      Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      c149dcb5
    • Linus Torvalds's avatar
      Merge tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 034a0f6b
      Linus Torvalds authored
      Pull USB bugfixes from Greg KH:
       "Here's a round of USB bugfixes, quirk additions, and new device ids
        for 3.16-rc4.  Nothing major in here at all, just a bunch of tiny
        changes.  All have been in linux-next with no reported issues"
      
      * tag 'usb-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
        usb: chipidea: udc: delete td from req's td list at ep_dequeue
        usb: Kconfig: make EHCI_MSM selectable for QCOM SOCs
        usb-storage/SCSI: Add broken_fua blacklist flag
        usb: musb: dsps: fix the base address for accessing the mode register
        tools: ffs-test: fix header values endianess
        usb: phy: msm: Do not do runtime pm if the phy is not idle
        usb: musb: Ensure that cppi41 timer gets armed on premature DMA TX irq
        usb: gadget: gr_udc: Fix check for invalid number of microframes
        usb: musb: Fix panic upon musb_am335x module removal
        usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
        Revert "tools: ffs-test: convert to new descriptor format fixing compilation error"
        xhci: Fix runtime suspended xhci from blocking system suspend.
        xhci: clear root port wake on bits if controller isn't wake-up capable
        xhci: correct burst count field for isoc transfers on 1.0 xhci hosts
        xhci: Use correct SLOT ID when handling a reset device command
        MAINTAINERS: update e-mail address
        usb: option: add/modify Olivetti Olicard modems
        USB: ftdi_sio: fix null deref at port probe
        MAINTAINERS: drop two usb-serial subdriver entries
        USB: option: add device ID for SpeedUp SU9800 usb 3g modem
        ...
      034a0f6b
    • Linus Torvalds's avatar
      Merge tag 'staging-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 9911f2e1
      Linus Torvalds authored
      Pull staging driver bugfixes from Greg KH:
       "Nothing major here, just 4 small bugfixes that resolve some issues
        reported for the IIO (staging and non-staging) and the tidspbridge
        driver"
      
      * tag 'staging-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: tidspbridge: fix an erroneous removal of parentheses
        iio: of_iio_channel_get_by_name() returns non-null pointers for error legs
        staging: iio/ad7291: fix error code in ad7291_probe()
        iio:adc:ad799x: Fix reading and writing of event values, apply shift
      9911f2e1
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.16-rc4' of... · 3089f54a
      Linus Torvalds authored
      Merge tag 'driver-core-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg KH:
       "Well, one drivercore fix for kernfs to resolve a reported issue with
        sysfs files being updated from atomic contexts, and another lz4 bugfix
        for testing potential buffer overflows"
      
      * tag 'driver-core-3.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        lz4: add overrun checks to lz4_uncompress_unknownoutputsize()
        kernfs: kernfs_notify() must be useable from non-sleepable contexts
      3089f54a
    • Linus Torvalds's avatar
      Merge tag 'trace-fixes-v3.16-rc3' of... · ef34c6ce
      Linus Torvalds authored
      Merge tag 'trace-fixes-v3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Oleg Nesterov found and fixed a bug in the perf/ftrace/uprobes code
        where running:
      
          # perf probe -x /lib/libc.so.6 syscall
          # echo 1 >> /sys/kernel/debug/tracing/events/probe_libc/enable
          # perf record -e probe_libc:syscall whatever
      
        kills the uprobe.  Along the way he found some other minor bugs and
        clean ups that he fixed up making it a total of 4 patches.
      
        Doing unrelated work, I found that the reading of the ftrace trace
        file disables all function tracer callbacks.  This was fine when
        ftrace was the only user, but now that it's used by perf and kprobes,
        this is a bug where reading trace can disable kprobes and perf.  A
        very unexpected side effect and should be fixed"
      
      * tag 'trace-fixes-v3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Remove ftrace_stop/start() from reading the trace file
        tracing/uprobes: Fix the usage of uprobe_buffer_enable() in probe_event_enable()
        tracing/uprobes: Kill the bogus UPROBE_HANDLER_REMOVE code in uprobe_dispatcher()
        uprobes: Change unregister/apply to WARN() if uprobe/consumer is gone
        tracing/uprobes: Revert "Support mix of ftrace and perf"
      ef34c6ce