02 Jun, 2016

21 commits


29 May, 2016

8 commits

  • Pull more MIPS updates from Ralf Baechle:
    "This is the secondnd batch of MIPS patches for 4.7. Summary:

    CPS:
    - Copy EVA configuration when starting secondary VPs.

    EIC:
    - Clear Status IPL.

    Lasat:
    - Fix a few off by one bugs.

    lib:
    - Mark intrinsics notrace. Not only are the intrinsics
    uninteresting, it would cause infinite recursion.

    MAINTAINERS:
    - Add file patterns for MIPS BRCM device tree bindings.
    - Add file patterns for mips device tree bindings.

    MT7628:
    - Fix MT7628 pinmux typos.
    - wled_an pinmux gpio.
    - EPHY LEDs pinmux support.

    Pistachio:
    - Enable KASLR

    VDSO:
    - Build microMIPS VDSO for microMIPS kernels.
    - Fix aliasing warning by building with `-fno-strict-aliasing' for
    debugging but also tracing them might result in recursion.

    Misc:
    - Add missing FROZEN hotplug notifier transitions.
    - Fix clk binding example for varioius PIC32 devices.
    - Fix cpu interrupt controller node-names in the DT files.
    - Fix XPA CPU feature separation.
    - Fix write_gc0_* macros when writing zero.
    - Add inline asm encoding helpers.
    - Add missing VZ accessor microMIPS encodings.
    - Fix little endian microMIPS MSA encodings.
    - Add 64-bit HTW fields and fix its configuration.
    - Fix sigreturn via VDSO on microMIPS kernel.
    - Lots of typo fixes.
    - Add definitions of SegCtl registers and use them"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (49 commits)
    MIPS: Add missing FROZEN hotplug notifier transitions
    MIPS: Build microMIPS VDSO for microMIPS kernels
    MIPS: Fix sigreturn via VDSO on microMIPS kernel
    MIPS: devicetree: fix cpu interrupt controller node-names
    MIPS: VDSO: Build with `-fno-strict-aliasing'
    MIPS: Pistachio: Enable KASLR
    MIPS: lib: Mark intrinsics notrace
    MIPS: Fix 64-bit HTW configuration
    MIPS: Add 64-bit HTW fields
    MAINTAINERS: Add file patterns for mips device tree bindings
    MAINTAINERS: Add file patterns for mips brcm device tree bindings
    MIPS: Simplify DSP instruction encoding macros
    MIPS: Add missing tlbinvf/XPA microMIPS encodings
    MIPS: Fix little endian microMIPS MSA encodings
    MIPS: Add missing VZ accessor microMIPS encodings
    MIPS: Add inline asm encoding helpers
    MIPS: Spelling fix lets -> let's
    MIPS: VR41xx: Fix typo
    MIPS: oprofile: Fix typo
    MIPS: math-emu: Fix typo
    ...

    Linus Torvalds
     
  • Pull string hash improvements from George Spelvin:
    "This series does several related things:

    - Makes the dcache hash (fs/namei.c) useful for general kernel use.

    (Thanks to Bruce for noticing the zero-length corner case)

    - Converts the string hashes in to use the
    above.

    - Avoids 64-bit multiplies in hash_64() on 32-bit platforms. Two
    32-bit multiplies will do well enough.

    - Rids the world of the bad hash multipliers in hash_32.

    This finishes the job started in commit 689de1d6ca95 ("Minimal
    fix-up of bad hashing behavior of hash_64()")

    The vast majority of Linux architectures have hardware support for
    32x32-bit multiply and so derive no benefit from "simplified"
    multipliers.

    The few processors that do not (68000, h8/300 and some models of
    Microblaze) have arch-specific implementations added. Those
    patches are last in the series.

    - Overhauls the dcache hash mixing.

    The patch in commit 0fed3ac866ea ("namei: Improve hash mixing if
    CONFIG_DCACHE_WORD_ACCESS") was an off-the-cuff suggestion.
    Replaced with a much more careful design that's simultaneously
    faster and better. (My own invention, as there was noting suitable
    in the literature I could find. Comments welcome!)

    - Modify the hash_name() loop to skip the initial HASH_MIX(). This
    would let us salt the hash if we ever wanted to.

    - Sort out partial_name_hash().

    The hash function is declared as using a long state, even though
    it's truncated to 32 bits at the end and the extra internal state
    contributes nothing to the result. And some callers do odd things:

    - fs/hfs/string.c only allocates 32 bits of state
    - fs/hfsplus/unicode.c uses it to hash 16-bit unicode symbols not bytes

    - Modify bytemask_from_count to handle inputs of 1..sizeof(long)
    rather than 0..sizeof(long)-1. This would simplify users other
    than full_name_hash"

    Special thanks to Bruce Fields for testing and finding bugs in v1. (I
    learned some humbling lessons about "obviously correct" code.)

    On the arch-specific front, the m68k assembly has been tested in a
    standalone test harness, I've been in contact with the Microblaze
    maintainers who mostly don't care, as the hardware multiplier is never
    omitted in real-world applications, and I haven't heard anything from
    the H8/300 world"

    * 'hash' of git://ftp.sciencehorizons.net/linux:
    h8300: Add
    microblaze: Add
    m68k: Add
    : Add support for architecture-specific functions
    fs/namei.c: Improve dcache hash function
    Eliminate bad hash multipliers from hash_32() and hash_64()
    Change hash_64() return value to 32 bits
    : Define hash_str() in terms of hashlen_string()
    fs/namei.c: Add hashlen_string() function
    Pull out string hash to

    Linus Torvalds
     
  • The "simplified" prime multipliers made very bad hash functions, so get rid
    of them. This completes the work of 689de1d6ca.

    To avoid the inefficiency which was the motivation for the "simplified"
    multipliers, hash_64() on 32-bit systems is changed to use a different
    algorithm. It makes two calls to hash_32() instead.

    drivers/media/usb/dvb-usb-v2/af9015.c uses the old GOLDEN_RATIO_PRIME_32
    for some horrible reason, so it inherits a copy of the old definition.

    Signed-off-by: George Spelvin
    Cc: Antti Palosaari
    Cc: Mauro Carvalho Chehab

    George Spelvin
     
  • Pull i2c fix from Wolfram Sang:
    "A fix for a regression introduced yesterday.

    The regression didn't show up here locally because I did not have
    PAGE_POISONING enabled. And buildbots discovered this only after it
    hit your tree. Thanks to Dan for the quick response"

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
    i2c: dev: use after free in detach

    Linus Torvalds
     
  • Pull chrome platform updates from Olof Johansson
    "A handful of Chrome driver and binding changes this merge window:

    - a few patches to fix probing and configuration of pstore

    - a few patches adding Elan touchpad registration on a few devices

    - EC changes: a security fix dealing with max message sizes and
    addition of compat_ioctl support.

    - keyboard backlight control support

    There was also an accidential duplicate registration of trackpads on
    'Leon', which was reverted just recently"

    * tag 'chrome-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
    Revert "platform/chrome: chromeos_laptop: Add Leon Touch"
    platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf
    platform/chrome: chromeos_laptop - Add elan trackpad option for C720
    platform/chrome: cros_ec_dev - Populate compat_ioctl
    platform/chrome: cros_ec_lightbar - use name instead of ID to hide lightbar attributes
    platform/chrome: cros_ec_dev - Fix security issue
    platform/chrome: Add Chrome OS keyboard backlight LEDs support
    platform/chrome: use to_platform_device()
    platform/chrome: pstore: Move to larger record size.
    platform/chrome: pstore: probe for ramoops buffer using acpi
    platform/chrome: chromeos_laptop: Add Leon Touch

    Linus Torvalds
     
  • Pull more sound updates from Takashi Iwai:
    "This is the second update round for 4.7-rc1. Most of changes are
    about the pending ASoC updates and fixes, including a few new drivers.
    Below are some highlights:

    ASoC:
    - New drivers for MAX98371 and TAS5720
    - SPI support for TLV320AIC32x4, along with the module split
    - TDM support for STI Uniperf IPs
    - Remaining topology API fixes / updates

    HDA:
    - A couple of Dell quirks and new Realtek codec support"

    * tag 'sound-4.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (63 commits)
    ALSA: hda - Fix headset mic detection problem for one Dell machine
    spi: spi-ep93xx: Fix the PTR_ERR() argument
    ALSA: hda/realtek - Add support for ALC295/ALC3254
    ASoC: kirkwood: fix build failure
    ALSA: hda - Fix headphone noise on Dell XPS 13 9360
    ASoC: ak4642: Enable cache usage to fix crashes on resume
    ASoC: twl6040: Disconnect AUX output pads on digital mute
    ASoC: tlv320aic32x4: Properly implement the positive and negative pins into the mixers
    rcar: src: skip disabled-SRC nodes
    ASoC: max98371 Remove duplicate entry in max98371_reg
    ASoC: twl6040: Select LPPLL during standby
    ASoC: rsnd: don't use prohibited number to PDMACHCRn.SRS
    ASoC: simple-card: Add pm callbacks to platform driver
    ASoC: pxa: Fix module autoload for platform drivers
    ASoC: topology: Fix memory leak in widget creation
    ASoC: Add max98371 codec driver
    ASoC: rsnd: count .probe/.remove for rsnd_mod_call()
    ASoC: topology: Check size mismatch of ABI objects before parsing
    ASoC: topology: Check failure to create a widget
    ASoC: add support for TAS5720 digital amplifier
    ...

    Linus Torvalds
     
  • Pull SCSI target updates from Nicholas Bellinger:
    "Here are the outstanding target pending updates for v4.7-rc1.

    The highlights this round include:

    - Allow external PR/ALUA metadata path be defined at runtime via top
    level configfs attribute (Lee)
    - Fix target session shutdown bug for ib_srpt multi-channel (hch)
    - Make TFO close_session() and shutdown_session() optional (hch)
    - Drop se_sess->sess_kref + convert tcm_qla2xxx to internal kref
    (hch)
    - Add tcm_qla2xxx endpoint attribute for basic FC jammer (Laurence)
    - Refactor iscsi-target RX/TX PDU encode/decode into common code
    (Varun)
    - Extend iscsit_transport with xmit_pdu, release_cmd, get_rx_pdu,
    validate_parameters, and get_r2t_ttt for generic ISO offload
    (Varun)
    - Initial merge of cxgb iscsi-segment offload target driver (Varun)

    The bulk of the changes are Chelsio's new driver, along with a number
    of iscsi-target common code improvements made by Varun + Co along the
    way"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (29 commits)
    iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race
    cxgbit: Use type ISCSI_CXGBIT + cxgbit tpg_np attribute
    iscsi-target: Convert transport drivers to signal rdma_shutdown
    iscsi-target: Make iscsi_tpg_np driver show/store use generic code
    tcm_qla2xxx Add SCSI command jammer/discard capability
    iscsi-target: graceful disconnect on invalid mapping to iovec
    target: need_to_release is always false, remove redundant check and kfree
    target: remove sess_kref and ->shutdown_session
    iscsi-target: remove usage of ->shutdown_session
    tcm_qla2xxx: introduce a private sess_kref
    target: make close_session optional
    target: make ->shutdown_session optional
    target: remove acl_stop
    target: consolidate and fix session shutdown
    cxgbit: add files for cxgbit.ko
    iscsi-target: export symbols
    iscsi-target: call complete on conn_logout_comp
    iscsi-target: clear tx_thread_active
    iscsi-target: add new offload transport type
    iscsi-target: use conn_transport->transport_type in text rsp
    ...

    Linus Torvalds
     
  • Pull more rdma updates from Doug Ledford:
    "This is the second group of code for the 4.7 merge window. It looks
    large, but only in one sense. I'll get to that in a minute. The list
    of changes here breaks down as follows:

    - Dynamic counter infrastructure in the IB drivers

    This is a sysfs based code to allow free form access to the
    hardware counters RDMA devices might support so drivers don't need
    to code this up repeatedly themselves

    - SendOnlyFullMember multicast support

    - IB router support

    - A couple misc fixes

    - The big item on the list: hfi1 driver updates, plus moving the hfi1
    driver out of staging

    There was a group of 15 patches in the hfi1 list that I thought I had
    in the first pull request but they weren't. So that added to the
    length of the hfi1 section here.

    As far as these go, everything but the hfi1 is pretty straight
    forward.

    The hfi1 is, if you recall, the driver that Al had complaints about
    how it used the write/writev interfaces in an overloaded fashion. The
    write portion of their interface behaved like the write handler in the
    IB stack proper and did bi-directional communications. The writev
    interface, on the other hand, only accepts SDMA request structures.
    The completions for those structures are sent back via an entirely
    different event mechanism.

    With the security patch, we put security checks on the write
    interface, however, we also knew they would be going away soon. Now,
    we've converted the write handler in the hfi1 driver to use ioctls
    from the IB reserved magic area for its bidirectional communications.
    With that change, Intel has addressed all of the items originally on
    their TODO when they went into staging (as well as many items added to
    the list later).

    As such, I moved them out, and since they were the last item in the
    staging/rdma directory, and I don't have immediate plans to use the
    staging area again, I removed the staging/rdma area.

    Because of the move out of staging, as well as a series of 5 patches
    in the hfi1 driver that removed code people thought should be done in
    a different way and was optional to begin with (a snoop debug
    interface, an eeprom driver for an eeprom connected directory to their
    hfi1 chip and not via an i2c bus, and a few other things like that),
    the line count, especially the removal count, is high"

    * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (56 commits)
    staging/rdma: Remove the entire rdma subdirectory of staging
    IB/core: Make device counter infrastructure dynamic
    IB/hfi1: Fix pio map initialization
    IB/hfi1: Correct 8051 link parameter settings
    IB/hfi1: Update pkey table properly after link down or FM start
    IB/rdamvt: Fix rdmavt s_ack_queue sizing
    IB/rdmavt: Max atomic value should be a u8
    IB/hfi1: Fix hard lockup due to not using save/restore spin lock
    IB/hfi1: Add tracing support for send with invalidate opcode
    IB/hfi1, qib: Add ieth to the packet header definitions
    IB/hfi1: Move driver out of staging
    IB/hfi1: Do not free hfi1 cdev parent structure early
    IB/hfi1: Add trace message in user IOCTL handling
    IB/hfi1: Remove write(), use ioctl() for user cmds
    IB/hfi1: Add ioctl() interface for user commands
    IB/hfi1: Remove unused user command
    IB/hfi1: Remove snoop/diag interface
    IB/hfi1: Remove EPROM functionality from data device
    IB/hfi1: Remove UI char device
    IB/hfi1: Remove multiple device cdev
    ...

    Linus Torvalds
     

28 May, 2016

11 commits

  • This reverts commit bff3c624dc7261a084a4d25a0b09c3fb0fec872a.

    Board "Leon" is otherwise known as "Toshiba CB35" and we already have
    the entry that supports that board as of this commit :
    963cb6f platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch

    Remove this duplicate.

    Signed-off-by: Benson Leung
    Signed-off-by: Olof Johansson

    Benson Leung
     
  • The call to put_i2c_dev() frees "i2c_dev" so there is a use after
    free when we call cdev_del(&i2c_dev->cdev).

    Fixes: d6760b14d4a1 ('i2c: dev: switch from register_chrdev to cdev API')
    Signed-off-by: Dan Carpenter
    Signed-off-by: Wolfram Sang

    Dan Carpenter
     
  • When EIC mode is in use (cpu_has_veic is true) enable it on each CPU
    during GIC initialisation. Otherwise there may be a mismatch between the
    hardware default interrupt model & that expected by the kernel.

    Signed-off-by: Paul Burton
    Reviewed-by: Matt Redfearn
    Tested-by: Matt Redfearn
    Acked-by: Thomas Gleixner
    Cc: Paul Burton
    Cc: Marc Zyngier
    Cc: Jason Cooper
    Cc: Thomas Gleixner
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/13274/
    Signed-off-by: Ralf Baechle

    Paul Burton
     
  • Pull more input subsystem updates from Dmitry Torokhov:
    "Just a few more driver fixes; new drivers will be coming in the next
    merge window"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
    Input: pwm-beeper - fix - scheduling while atomic
    Input: xpad - xbox one elite controller support
    Input: xpad - add more third-party controllers
    Input: xpad - prevent spurious input from wired Xbox 360 controllers
    Input: xpad - move pending clear to the correct location
    Input: uinput - handle compat ioctl for UI_SET_PHYS

    Linus Torvalds
     
  • Pull more i2c updates from Wolfram Sang:
    "Here is the second pull request from I2C for this merge window:

    - one new feature (which nearly fell through the cracks): i2c-dev
    does now use the cdev API so it can handle >256 minors. Seems
    people do need that.

    - two fixes for the just added DMA feature for i2c-rcar

    - some typo fixes"

    * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
    i2c: dev: don't start function name with 'return'
    i2c: dev: switch from register_chrdev to cdev API
    i2c: xlr: rename ARCH_TANGOX to ARCH_TANGO
    i2c: at91: change log when dma configuration fails
    misc: at24: Fix typo in at24 header file
    i2c: rcar: should depend on HAS_DMA
    i2c: rcar: use dma_request_chan()

    Linus Torvalds
     
  • Pull UBI/UBIFS updates from Richard Weinberger:
    "This contains mostly cleanups and minor improvements of UBI and UBIFS"

    * tag 'upstream-4.7-rc1' of git://git.infradead.org/linux-ubifs:
    ubifs: ubifs_dump_inode: Fix dumping field bulk_read
    UBI: Fix static volume checks when Fastmap is used
    UBI: Set free_count to zero before walking through erase list
    UBI: Silence an unintialized variable warning
    UBI: Clean up return in ubi_remove_volume()
    UBI: Modify wrong comment in ubi_leb_map function.
    UBI: Don't read back all data in ubi_eba_copy_leb()
    UBI: Add ro-mode sysfs attribute

    Linus Torvalds
     
  • Pull vfs fixes from Al Viro:
    "Followups to the parallel lookup work:

    - update docs

    - restore killability of the places that used to take ->i_mutex
    killably now that we have down_write_killable() merged

    - Additionally, it turns out that I missed a prerequisite for
    security_d_instantiate() stuff - ->getxattr() wasn't the only thing
    that could be called before dentry is attached to inode; with smack
    we needed the same treatment applied to ->setxattr() as well"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    switch ->setxattr() to passing dentry and inode separately
    switch xattr_handler->set() to passing dentry and inode separately
    restore killability of old mutex_lock_killable(&inode->i_mutex) users
    add down_write_killable_nested()
    update D/f/directory-locking

    Linus Torvalds
     
  • smack ->d_instantiate() uses ->setxattr(), so to be able to call it before
    we'd hashed the new dentry and attached it to inode, we need ->setxattr()
    instances getting the inode as an explicit argument rather than obtaining
    it from dentry.

    Similar change for ->getxattr() had been done in commit ce23e64. Unlike
    ->getxattr() (which is used by both selinux and smack instances of
    ->d_instantiate()) ->setxattr() is used only by smack one and unfortunately
    it got missed back then.

    Reported-by: Seung-Woo Kim
    Tested-by: Casey Schaufler
    Signed-off-by: Al Viro

    Al Viro
     
  • Pwm config may sleep so defer it using a worker.

    On a Freescale i.MX53 based board we ran into "BUG: scheduling while
    atomic" because input_inject_event locks interrupts, but
    imx_pwm_config_v2 sleeps.

    Tested on Freescale i.MX53 SoC with 4.6.0.

    Signed-off-by: Manfred Schlaegl
    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Torokhov

    Manfred Schlaegl
     
  • added the according id and incresed XPAD_PKT_LEN to 64 as the elite
    controller sends at least 33 byte messages [1].
    Verified to be working by [2].

    [1]: https://franticrain.github.io/sniffs/XboxOneSniff.html
    [2]: https://github.com/paroj/xpad/issues/23

    Signed-off-by: Pierre-Loup A. Griffais
    Signed-off-by: Pavel Rojtberg
    Signed-off-by: Dmitry Torokhov

    Pavel Rojtberg
     
  • Signed-off-by: Pierre-Loup A. Griffais
    Signed-off-by: Thomas Debesse
    Signed-off-by: aronschatz
    Signed-off-by: Pavel Rojtberg
    Signed-off-by: Dmitry Torokhov

    Pavel Rojtberg