1. 14 Jul, 2016 2 commits
    • Thierry Reding's avatar
      dt-bindings: display: tegra: Add source clock for SOR · 5d2304c1
      Thierry Reding authored
      The SOR clock can have various sources, with the most commonly used
      being the sor_safe, pll_d2_out0, pll_dp and sor_brick clocks. These
      are configured using a three level mux, of which the first 2 levels
      can be treated as one. The direct parents of the SOR clock are the
      sor_safe, sor_brick and sor_src clocks, whereas the pll_d2_out0 and
      pll_dp clocks can be selected as parents of the sor_src clock via a
      second mux.
      
      Previous generations of Tegra have only supported eDP and LVDS with
      the SOR, where LVDS was never used on publicly available hardware.
      Clocking for this only ever required the first level mux (to select
      between sor_safe and sor_brick).
      
      Tegra210 has a new revision of the SOR that supports HDMI and hence
      needs to support the second level mux to allow selecting pll_d2_out0
      as the SOR clock's parent. This second mux is knows as sor_src, and
      operating system software needs a reference to it in order to select
      the proper parent.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      5d2304c1
    • Thierry Reding's avatar
      drm/tegra: sor: Implement sor1_brick clock · b299221c
      Thierry Reding authored
      sor1_brick is a clock that can be used as a source for the sor1 clock.
      The registers to control the clock output are part of the sor1 IP block
      and hence the sor driver is the best place to implement it.
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      b299221c
  2. 04 Jul, 2016 7 commits
  3. 01 Jul, 2016 3 commits
  4. 30 Jun, 2016 6 commits
    • Jon Hunter's avatar
      drm/tegra: dpaux: Add pinctrl support · 0751bb5c
      Jon Hunter authored
      The DPAUX pins are shared with an internal I2C controller. To allow
      these pins to be muxed to the I2C controller, register a pinctrl device
      for the DPAUX device.
      
      This is based upon work by Thierry Reding <treding@nvidia.com>.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      0751bb5c
    • Jon Hunter's avatar
      dt-bindings: Add bindings for Tegra DPAUX pinctrl driver · 6cb68e46
      Jon Hunter authored
      On Tegra124, Tegra132 and Tegra210 devices the pads used by the Display
      Port Auxiliary (DPAUX) channel are multiplexed such that they can also
      be used by one of the internal I2C controllers. Note that this is
      different from I2C-over-AUX supported by the DPAUX controller. The
      register that configures these pads is part of the DPAUX controllers
      register set and so a pinctrl driver is being added for the DPAUX device
      to share these pads. Add the device-tree binding documentation for the
      DPAUX pad controller.
      
      Although there is only one group of pads associated with the DPAUX that
      can be multiplexed, the group still needs to be described by the binding.
      If the 'groups' property is not present in the binding, then the pads
      will not be allocated by the pinctrl core for a client and this would
      allow another client to re-configure the same pads that may already be
      in-use.
      
      Please note that although the "off" function for the DPAUX pads is not
      technically a pin-mux setting but more of a pin-conf setting it is
      simpler to expose these as a function so that the user can simply select
      either "aux", "i2c" or "off" as the current function/mode.
      
      Update the main DPAUX binding documentation to reference the DPAUX pad
      controller binding document and add the 'i2c-bus' subnode. The 'i2c-bus'
      subnode is used for populating I2C slaves for the DPAUX device so that
      the I2C driver core does not attempt to add the DPAUX pad controller
      nodes as I2C slaves.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      6cb68e46
    • Jon Hunter's avatar
      drm/tegra: Prepare DPAUX for supporting generic PM domains · 9b99044a
      Jon Hunter authored
      To utilise the DPAUX on Tegra, the SOR power partition must be enabled.
      Now that Tegra supports the generic PM domain framework we manage the
      SOR power partition via this framework for DPAUX. However, the sequence
      for gating/ungating the SOR power partition requires that the DPAUX
      reset is asserted/de-asserted at the time the SOR power partition is
      gated/ungated, respectively. Now that the reset control core assumes
      that resets are exclusive, the Tegra generic PM domain code and the
      DPAUX driver cannot request the same reset unless we mark the resets as
      shared. Sharing resets will not work in this case because we cannot
      guarantee that the reset will be asserted/de-asserted at the appropriate
      time. Therefore, given that the Tegra generic PM domain code will handle
      the DPAUX reset, do not request the reset in the DPAUX driver if the
      DPAUX device has a PM domain associated.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      9b99044a
    • Jon Hunter's avatar
      dt-bindings: display: Update Tegra DPAUX documentation · caf8a6c4
      Jon Hunter authored
      Update the DPAUX compatibility string information for Tegra124, Tegra132
      and Tegra210.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      caf8a6c4
    • Jon Hunter's avatar
      drm/tegra: dpaux: Add helpers for setting up pads · 9d0e09c1
      Jon Hunter authored
      In preparation for adding pinctrl support for the DPAUX pads, add a
      couple of helpers functions to configure the pads and control their
      power.
      
      Please note that although a simple if-statement could be used instead
      of a case statement for configuring the pads as there are only two
      possible modes, a case statement is used because when integrating with
      the pinctrl framework, we need to be able to handle invalid modes that
      could be passed.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      9d0e09c1
    • Jon Hunter's avatar
      drm/tegra: dpaux: Clean-up on probe failure · bcbd63df
      Jon Hunter authored
      If the probing of the DPAUX fails, then clocks are left enabled and the
      DPAUX reset de-asserted. Add code to perform the necessary clean-up on
      probe failure by disabling clocks and asserting the reset.
      Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      bcbd63df
  5. 23 Jun, 2016 13 commits
  6. 29 May, 2016 3 commits
  7. 28 May, 2016 6 commits
    • Mikulas Patocka's avatar
      hpfs: implement the show_options method · 037369b8
      Mikulas Patocka authored
      The HPFS filesystem used generic_show_options to produce string that is
      displayed in /proc/mounts.  However, there is a problem that the options
      may disappear after remount.  If we mount the filesystem with option1
      and then remount it with option2, /proc/mounts should show both option1
      and option2, however it only shows option2 because the whole option
      string is replaced with replace_mount_options in hpfs_remount_fs.
      
      To fix this bug, implement the hpfs_show_options function that prints
      options that are currently selected.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      037369b8
    • Mikulas Patocka's avatar
      affs: fix remount failure when there are no options changed · 01d6e087
      Mikulas Patocka authored
      Commit c8f33d0b ("affs: kstrdup() memory handling") checks if the
      kstrdup function returns NULL due to out-of-memory condition.
      
      However, if we are remounting a filesystem with no change to
      filesystem-specific options, the parameter data is NULL.  In this case,
      kstrdup returns NULL (because it was passed NULL parameter), although no
      out of memory condition exists.  The mount syscall then fails with
      ENOMEM.
      
      This patch fixes the bug.  We fail with ENOMEM only if data is non-NULL.
      
      The patch also changes the call to replace_mount_options - if we didn't
      pass any filesystem-specific options, we don't call
      replace_mount_options (thus we don't erase existing reported options).
      
      Fixes: c8f33d0b ("affs: kstrdup() memory handling")
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org	# v4.1+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01d6e087
    • Mikulas Patocka's avatar
      hpfs: fix remount failure when there are no options changed · 44d51706
      Mikulas Patocka authored
      Commit ce657611 ("hpfs: kstrdup() out of memory handling") checks if
      the kstrdup function returns NULL due to out-of-memory condition.
      
      However, if we are remounting a filesystem with no change to
      filesystem-specific options, the parameter data is NULL.  In this case,
      kstrdup returns NULL (because it was passed NULL parameter), although no
      out of memory condition exists.  The mount syscall then fails with
      ENOMEM.
      
      This patch fixes the bug.  We fail with ENOMEM only if data is non-NULL.
      
      The patch also changes the call to replace_mount_options - if we didn't
      pass any filesystem-specific options, we don't call
      replace_mount_options (thus we don't erase existing reported options).
      
      Fixes: ce657611 ("hpfs: kstrdup() out of memory handling")
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      44d51706
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 4029632c
      Linus Torvalds authored
      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
        ...
      4029632c
    • Guenter Roeck's avatar
      fs: fix binfmt_aout.c build error · d66492bc
      Guenter Roeck authored
      Various builds (such as i386:allmodconfig) fail with
      
        fs/binfmt_aout.c:133:2: error: expected identifier or '(' before 'return'
        fs/binfmt_aout.c:134:1: error: expected identifier or '(' before '}' token
      
      [ Oops. My bad, I had stupidly thought that "allmodconfig" covered this
        on x86-64 too, but it obviously doesn't.  Egg on my face.  - Linus ]
      
      Fixes: 5d22fc25 ("mm: remove more IS_ERR_VALUE abuses")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d66492bc
    • Linus Torvalds's avatar
      Merge branch 'hash' of git://ftp.sciencehorizons.net/linux · 7e0fb73c
      Linus Torvalds authored
      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 <linux/sunrpc/svcauth.h> 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 689de1d6 ("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 0fed3ac8 ("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 <asm/hash.h>
        microblaze: Add <asm/hash.h>
        m68k: Add <asm/hash.h>
        <linux/hash.h>: 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
        <linux/sunrpc/svcauth.h>: Define hash_str() in terms of hashlen_string()
        fs/namei.c: Add hashlen_string() function
        Pull out string hash to <linux/stringhash.h>
      7e0fb73c