1. 07 Oct, 2016 10 commits
  2. 06 Oct, 2016 26 commits
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 4c1fad64
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, we've investigated how f2fs deals with errors given by
        our fault injection facility. With this, we could fix several corner
        cases. And, in order to improve the performance, we set inline_dentry
        by default and enhance the exisiting discard issue flow. In addition,
        we added f2fs_migrate_page for better memory management.
      
        Enhancements:
         - set inline_dentry by default
         - improve discard issue flow
         - add more fault injection cases in f2fs
         - allow block preallocation for encrypted files
         - introduce migrate_page callback function
         - avoid truncating the next direct node block at every checkpoint
      
        Bug fixes:
         - set page flag correctly between write_begin and write_end
         - missing error handling cases detected by fault injection
         - preallocate blocks regarding to 4KB alignement correctly
         - dentry and filename handling of encryption
         - lost xattrs of directories"
      
      * tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (69 commits)
        f2fs: introduce update_ckpt_flags to clean up
        f2fs: don't submit irrelevant page
        f2fs: fix to commit bio cache after flushing node pages
        f2fs: introduce get_checkpoint_version for cleanup
        f2fs: remove dead variable
        f2fs: remove redundant io plug
        f2fs: support checkpoint error injection
        f2fs: fix to recover old fault injection config in ->remount_fs
        f2fs: do fault injection initialization in default_options
        f2fs: remove redundant value definition
        f2fs: support configuring fault injection per superblock
        f2fs: adjust display format of segment bit
        f2fs: remove dirty inode pages in error path
        f2fs: do not unnecessarily null-terminate encrypted symlink data
        f2fs: handle errors during recover_orphan_inodes
        f2fs: avoid gc in cp_error case
        f2fs: should put_page for summary page
        f2fs: assign return value in f2fs_gc
        f2fs: add customized migrate_page callback
        f2fs: introduce cp_lock to protect updating of ckpt_flags
        ...
      4c1fad64
    • Linus Torvalds's avatar
      Merge tag 'pstore-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 0fb3ca44
      Linus Torvalds authored
      Pull pstore updates from Kees Cook:
      
       - Fix bug in module unloading
      
       - Switch to always using spinlock over cmpxchg
      
       - Explicitly define pstore backend's supported modes
      
       - Remove bounce buffer from pmsg
      
       - Switch to using memcpy_to/fromio()
      
       - Error checking improvements
      
      * tag 'pstore-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        ramoops: move spin_lock_init after kmalloc error checking
        pstore/ram: Use memcpy_fromio() to save old buffer
        pstore/ram: Use memcpy_toio instead of memcpy
        pstore/pmsg: drop bounce buffer
        pstore/ram: Set pstore flags dynamically
        pstore: Split pstore fragile flags
        pstore/core: drop cmpxchg based updates
        pstore/ramoops: fixup driver removal
      0fb3ca44
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · 3940ee36
      Linus Torvalds authored
      Pull orangefs updates from Mike Marshall:
       "Miscellaneous improvements:
         - clean up debugfs globals
         - remove dead code in sysfs
         - reorganize duplicated sysfs attribute structs
         - consolidate sysfs show and store functions
         - remove duplicated sysfs_ops structures
         - describe organization of sysfs
         - make devreq_mutex static
         - g_orangefs_stats -> orangefs_stats for consistency
         - rename most remaining global variables
      
        Feature negotiation:
         - enable Orangefs userspace and kernel module to negotiate mutually
           supported features"
      
      * tag 'for-linus-4.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        Revert "orangefs: bump minimum userspace version"
        orangefs: bump minimum userspace version
        orangefs: rename most remaining global variables
        orangefs: g_orangefs_stats -> orangefs_stats for consistency
        orangefs: make devreq_mutex static
        orangefs: describe organization of sysfs
        orangefs: remove duplicated sysfs_ops structures
        orangefs: consolidate sysfs show and store functions
        orangefs: reorganize duplicated sysfs attribute structs
        orangefs: remove dead code in sysfs
        orangefs: clean up debugfs globals
        orangefs: do not allow client readahead cache without feature bit
        orangefs: add features op
        orangefs: record userspace version for feature compatbility
        orangefs: add readahead count and size to sysfs
        orangefs: re-add flush_racache from out-of-tree
        orangefs: turn param response value into union
        orangefs: add missing param request ops
        orangefs: rename remaining bits of mmap readahead cache
      3940ee36
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 95107b30
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This release cycle is rather small.  Just a few fixes to tracing.
      
        The big change is the addition of the hwlat tracer. It not only
        detects SMIs, but also other latency that's caused by the hardware. I
        have detected some latency from large boxes having bus contention"
      
      * tag 'trace-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Call traceoff trigger after event is recorded
        ftrace/scripts: Add helper script to bisect function tracing problem functions
        tracing: Have max_latency be defined for HWLAT_TRACER as well
        tracing: Add NMI tracing in hwlat detector
        tracing: Have hwlat trace migrate across tracing_cpumask CPUs
        tracing: Add documentation for hwlat_detector tracer
        tracing: Added hardware latency tracer
        ftrace: Access ret_stack->subtime only in the function profiler
        function_graph: Handle TRACE_BPUTS in print_graph_comment
        tracing/uprobe: Drop isdigit() check in create_trace_uprobe
      95107b30
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 541efb76
      Linus Torvalds authored
      Pull xen updates from David Vrabel:
       "xen features and fixes for 4.9:
      
         - switch to new CPU hotplug mechanism
      
         - support driver_override in pciback
      
         - require vector callback for HVM guests (the alternate mechanism via
           the platform device has been broken for ages)"
      
      * tag 'for-linus-4.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/x86: Update topology map for PV VCPUs
        xen/x86: Initialize per_cpu(xen_vcpu, 0) a little earlier
        xen/pciback: support driver_override
        xen/pciback: avoid multiple entries in slot list
        xen/pciback: simplify pcistub device handling
        xen: Remove event channel notification through Xen PCI platform device
        xen/events: Convert to hotplug state machine
        xen/x86: Convert to hotplug state machine
        x86/xen: add missing \n at end of printk warning message
        xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc()
        xen: Make VPMU init message look less scary
        xen: rename xen_pmu_init() in sys-hypervisor.c
        hotplug: Prevent alloc/free of irq descriptors during cpu up/down (again)
        xen/x86: Move irq allocation from Xen smp_op.cpu_up()
      541efb76
    • Linus Torvalds's avatar
      Merge tag 'kvm-4.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 6218590b
      Linus Torvalds authored
      Pull KVM updates from Radim Krčmář:
       "All architectures:
         - move `make kvmconfig` stubs from x86
         - use 64 bits for debugfs stats
      
        ARM:
         - Important fixes for not using an in-kernel irqchip
         - handle SError exceptions and present them to guests if appropriate
         - proxying of GICV access at EL2 if guest mappings are unsafe
         - GICv3 on AArch32 on ARMv8
         - preparations for GICv3 save/restore, including ABI docs
         - cleanups and a bit of optimizations
      
        MIPS:
         - A couple of fixes in preparation for supporting MIPS EVA host
           kernels
         - MIPS SMP host & TLB invalidation fixes
      
        PPC:
         - Fix the bug which caused guests to falsely report lockups
         - other minor fixes
         - a small optimization
      
        s390:
         - Lazy enablement of runtime instrumentation
         - up to 255 CPUs for nested guests
         - rework of machine check deliver
         - cleanups and fixes
      
        x86:
         - IOMMU part of AMD's AVIC for vmexit-less interrupt delivery
         - Hyper-V TSC page
         - per-vcpu tsc_offset in debugfs
         - accelerated INS/OUTS in nVMX
         - cleanups and fixes"
      
      * tag 'kvm-4.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (140 commits)
        KVM: MIPS: Drop dubious EntryHi optimisation
        KVM: MIPS: Invalidate TLB by regenerating ASIDs
        KVM: MIPS: Split kernel/user ASID regeneration
        KVM: MIPS: Drop other CPU ASIDs on guest MMU changes
        KVM: arm/arm64: vgic: Don't flush/sync without a working vgic
        KVM: arm64: Require in-kernel irqchip for PMU support
        KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register
        KVM: PPC: Book3S PR: Support 64kB page size on POWER8E and POWER8NVL
        KVM: PPC: Book3S: Remove duplicate setting of the B field in tlbie
        KVM: PPC: BookE: Fix a sanity check
        KVM: PPC: Book3S HV: Take out virtual core piggybacking code
        KVM: PPC: Book3S: Treat VTB as a per-subcore register, not per-thread
        ARM: gic-v3: Work around definition of gic_write_bpr1
        KVM: nVMX: Fix the NMI IDT-vectoring handling
        KVM: VMX: Enable MSR-BASED TPR shadow even if APICv is inactive
        KVM: nVMX: Fix reload apic access page warning
        kvmconfig: add virtio-gpu to config fragment
        config: move x86 kvm_guest.config to a common location
        arm64: KVM: Remove duplicating init code for setting VMID
        ARM: KVM: Support vgic-v3
        ...
      6218590b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 14986a34
      Linus Torvalds authored
      Pull namespace updates from Eric Biederman:
       "This set of changes is a number of smaller things that have been
        overlooked in other development cycles focused on more fundamental
        change. The devpts changes are small things that were a distraction
        until we managed to kill off DEVPTS_MULTPLE_INSTANCES. There is an
        trivial regression fix to autofs for the unprivileged mount changes
        that went in last cycle. A pair of ioctls has been added by Andrey
        Vagin making it is possible to discover the relationships between
        namespaces when referring to them through file descriptors.
      
        The big user visible change is starting to add simple resource limits
        to catch programs that misbehave. With namespaces in general and user
        namespaces in particular allowing users to use more kinds of
        resources, it has become important to have something to limit errant
        programs. Because the purpose of these limits is to catch errant
        programs the code needs to be inexpensive to use as it always on, and
        the default limits need to be high enough that well behaved programs
        on well behaved systems don't encounter them.
      
        To this end, after some review I have implemented per user per user
        namespace limits, and use them to limit the number of namespaces. The
        limits being per user mean that one user can not exhause the limits of
        another user. The limits being per user namespace allow contexts where
        the limit is 0 and security conscious folks can remove from their
        threat anlysis the code used to manage namespaces (as they have
        historically done as it root only). At the same time the limits being
        per user namespace allow other parts of the system to use namespaces.
      
        Namespaces are increasingly being used in application sand boxing
        scenarios so an all or nothing disable for the entire system for the
        security conscious folks makes increasing use of these sandboxes
        impossible.
      
        There is also added a limit on the maximum number of mounts present in
        a single mount namespace. It is nontrivial to guess what a reasonable
        system wide limit on the number of mount structure in the kernel would
        be, especially as it various based on how a system is using
        containers. A limit on the number of mounts in a mount namespace
        however is much easier to understand and set. In most cases in
        practice only about 1000 mounts are used. Given that some autofs
        scenarious have the potential to be 30,000 to 50,000 mounts I have set
        the default limit for the number of mounts at 100,000 which is well
        above every known set of users but low enough that the mount hash
        tables don't degrade unreaonsably.
      
        These limits are a start. I expect this estabilishes a pattern that
        other limits for resources that namespaces use will follow. There has
        been interest in making inotify event limits per user per user
        namespace as well as interest expressed in making details about what
        is going on in the kernel more visible"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (28 commits)
        autofs:  Fix automounts by using current_real_cred()->uid
        mnt: Add a per mount namespace limit on the number of mounts
        netns: move {inc,dec}_net_namespaces into #ifdef
        nsfs: Simplify __ns_get_path
        tools/testing: add a test to check nsfs ioctl-s
        nsfs: add ioctl to get a parent namespace
        nsfs: add ioctl to get an owning user namespace for ns file descriptor
        kernel: add a helper to get an owning user namespace for a namespace
        devpts: Change the owner of /dev/pts/ptmx to the mounter of /dev/pts
        devpts: Remove sync_filesystems
        devpts: Make devpts_kill_sb safe if fsi is NULL
        devpts: Simplify devpts_mount by using mount_nodev
        devpts: Move the creation of /dev/pts/ptmx into fill_super
        devpts: Move parse_mount_options into fill_super
        userns: When the per user per user namespace limit is reached return ENOSPC
        userns; Document per user per user namespace limits.
        mntns: Add a limit on the number of mount namespaces.
        netns: Add a limit on the number of net namespaces
        cgroupns: Add a limit on the number of cgroup namespaces
        ipcns: Add a  limit on the number of ipc namespaces
        ...
      14986a34
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs · 8d370595
      Linus Torvalds authored
      Pull xfs and iomap updates from Dave Chinner:
       "The main things in this update are the iomap-based DAX infrastructure,
        an XFS delalloc rework, and a chunk of fixes to how log recovery
        schedules writeback to prevent spurious corruption detections when
        recovery of certain items was not required.
      
        The other main chunk of code is some preparation for the upcoming
        reflink functionality. Most of it is generic and cleanups that stand
        alone, but they were ready and reviewed so are in this pull request.
      
        Speaking of reflink, I'm currently planning to send you another pull
        request next week containing all the new reflink functionality. I'm
        working through a similar process to the last cycle, where I sent the
        reverse mapping code in a separate request because of how large it
        was. The reflink code merge is even bigger than reverse mapping, so
        I'll be doing the same thing again....
      
        Summary for this update:
      
         - change of XFS mailing list to linux-xfs@vger.kernel.org
      
         - iomap-based DAX infrastructure w/ XFS and ext2 support
      
         - small iomap fixes and additions
      
         - more efficient XFS delayed allocation infrastructure based on iomap
      
         - a rework of log recovery writeback scheduling to ensure we don't
           fail recovery when trying to replay items that are already on disk
      
         - some preparation patches for upcoming reflink support
      
         - configurable error handling fixes and documentation
      
         - aio access time update race fixes for XFS and
           generic_file_read_iter"
      
      * tag 'xfs-for-linus-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs: (40 commits)
        fs: update atime before I/O in generic_file_read_iter
        xfs: update atime before I/O in xfs_file_dio_aio_read
        ext2: fix possible integer truncation in ext2_iomap_begin
        xfs: log recovery tracepoints to track current lsn and buffer submission
        xfs: update metadata LSN in buffers during log recovery
        xfs: don't warn on buffers not being recovered due to LSN
        xfs: pass current lsn to log recovery buffer validation
        xfs: rework log recovery to submit buffers on LSN boundaries
        xfs: quiesce the filesystem after recovery on readonly mount
        xfs: remote attribute blocks aren't really userdata
        ext2: use iomap to implement DAX
        ext2: stop passing buffer_head to ext2_get_blocks
        xfs: use iomap to implement DAX
        xfs: refactor xfs_setfilesize
        xfs: take the ilock shared if possible in xfs_file_iomap_begin
        xfs: fix locking for DAX writes
        dax: provide an iomap based fault handler
        dax: provide an iomap based dax read/write path
        dax: don't pass buffer_head to copy_user_dax
        dax: don't pass buffer_head to dax_insert_mapping
        ...
      8d370595
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · d230ec72
      Linus Torvalds authored
      Pull networking fixups from David Miller:
       "Here are the build and merge fixups for the networking stuff"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        phy: micrel.c: Enable ksz9031 energy-detect power-down mode
        netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
        netfilter: nft_limit: fix divided by zero panic
        netfilter: fix namespace handling in nf_log_proc_dostring
        netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division
        netfilter: accommodate different kconfig in nf_set_hooks_head
        netfilter: Fix potential null pointer dereference
      d230ec72
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f84d9fa8
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Besides some cleanups the major thing here is supporting relaxed
        ordering PCIe transactions on newer sparc64 machines, from Chris
        Hyser"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: fixing ident and beautifying code
        sparc64: Enable setting "relaxed ordering" in IOMMU mappings
        sparc64: Enable PCI IOMMU version 2 API
        sparc: migrate exception table users off module.h and onto extable.h
      f84d9fa8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 82fa407d
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - Correct ARMs dma-mapping to use the correct printk format strings.
      
       - Avoid defining OBJCOPYFLAGS globally which upsets lkdtm rodata
         testing.
      
       - Cleanups to ARMs asm/memory.h include.
      
       - L2 cache cleanups.
      
       - Allow flat nommu binaries to be executed on ARM MMU systems.
      
       - Kernel hardening - add more read-only after init annotations,
         including making some kernel vdso variables const.
      
       - Ensure AMBA primecell clocks are appropriately defaulted.
      
       - ARM breakpoint cleanup.
      
       - Various StrongARM 11x0 and companion chip (SA1111) updates to bring
         this legacy platform to use more modern APIs for (eg) GPIOs and
         interrupts, which will allow us in the future to reduce some of the
         board-level driver clutter and elimate function callbacks into board
         code via platform data. There still appears to be interest in these
         platforms!
      
       - Remove the now redundant secure_flush_area() API.
      
       - Module PLT relocation optimisations. Ard says: This series of 4
         patches optimizes the ARM PLT generation code that is invoked at
         module load time, to get rid of the O(n^2) algorithm that results in
         pathological load times of 10 seconds or more for large modules on
         certain STB platforms.
      
       - ARMv7M cache maintanence support.
      
       - L2 cache PMU support
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (35 commits)
        ARM: sa1111: provide to_sa1111_device() macro
        ARM: sa1111: add sa1111_get_irq()
        ARM: sa1111: clean up duplication in IRQ chip implementation
        ARM: sa1111: implement a gpio_chip for SA1111 GPIOs
        ARM: sa1111: move irq cleanup to separate function
        ARM: sa1111: use devm_clk_get()
        ARM: sa1111: use devm_kzalloc()
        ARM: sa1111: ensure we only touch RAB bus type devices when removing
        ARM: 8611/1: l2x0: add PMU support
        ARM: 8610/1: V7M: Add dsb before jumping in handler mode
        ARM: 8609/1: V7M: Add support for the Cortex-M7 processor
        ARM: 8608/1: V7M: Indirect proc_info construction for V7M CPUs
        ARM: 8607/1: V7M: Wire up caches for V7M processors with cache support.
        ARM: 8606/1: V7M: introduce cache operations
        ARM: 8605/1: V7M: fix notrace variant of save_and_disable_irqs
        ARM: 8604/1: V7M: Add support for reading the CTR with read_cpuid_cachetype()
        ARM: 8603/1: V7M: Add addresses for mem-mapped V7M cache operations
        ARM: 8602/1: factor out CSSELR/CCSIDR operations that use cp15 directly
        ARM: kernel: avoid brute force search on PLT generation
        ARM: kernel: sort relocation sections before allocating PLTs
        ...
      82fa407d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · c7f5d36a
      Linus Torvalds authored
      Pull ARM fix from Russell King:
       "A 5% error in delay calculation was introduced during the last merge
        window, which had gone un-noticed until yesterday"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: fix delays
      c7f5d36a
    • Boris Ostrovsky's avatar
      xen/x86: Update topology map for PV VCPUs · a6a198bc
      Boris Ostrovsky authored
      Early during boot topology_update_package_map() computes
      logical_pkg_ids for all present processors.
      
      Later, when processors are brought up, identify_cpu() updates
      these values based on phys_pkg_id which is a function of
      initial_apicid. On PV guests the latter may point to a
      non-existing node, causing logical_pkg_ids to be set to -1.
      
      Intel's RAPL uses logical_pkg_id (as topology_logical_package_id())
      to index its arrays and therefore in this case will point to index
      65535 (since logical_pkg_id is a u16). This could lead to either a
      crash or may actually access random memory location.
      
      As a workaround, we recompute topology during CPU bringup to reset
      logical_pkg_id to a valid value.
      
      (The reason for initial_apicid being bogus is because it is
      initial_apicid of the processor from which the guest is launched.
      This value is CPUID(1).EBX[31:24])
      Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
      a6a198bc
    • Russell King's avatar
      Merge branch 'devel-stable' into for-linus · 81a63001
      Russell King authored
      81a63001
    • Russell King's avatar
      301a36fa
    • Russell King's avatar
      ARM: fix delays · fb833b1f
      Russell King authored
      Commit 215e362d ("ARM: 8306/1: loop_udelay: remove bogomips value
      limitation") tried to increase the bogomips limitation, but in doing
      so messed up udelay such that it always gives about a 5% error in the
      delay, even if we use a timer.
      
      The calculation is:
      
      	loops = UDELAY_MULT * us_delay * ticks_per_jiffy >> UDELAY_SHIFT
      
      Originally, UDELAY_MULT was ((UL(2199023) * HZ) >> 11) and UDELAY_SHIFT
      30.  Assuming HZ=100, us_delay of 1000 and ticks_per_jiffy of 1660000
      (eg, 166MHz timer, 1ms delay) this would calculate:
      
      	((UL(2199023) * HZ) >> 11) * 1000 * 1660000 >> 30
      		=> 165999
      
      With the new values of 2047 * HZ + 483648 * HZ / 1000000 and 31, we get:
      
      	(2047 * HZ + 483648 * HZ / 1000000) * 1000 * 1660000 >> 31
      		=> 158269
      
      which is incorrect.  This is due to a typo - correcting it gives:
      
      	(2147 * HZ + 483648 * HZ / 1000000) * 1000 * 1660000 >> 31
      		=> 165999
      
      i.o.w, the original value.
      
      Fixes: 215e362d ("ARM: 8306/1: loop_udelay: remove bogomips value limitation")
      Cc: <stable@vger.kernel.org>
      Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      fb833b1f
    • netmonk@netmonk.org's avatar
      sparc: fixing ident and beautifying code · 98e98eb6
      netmonk@netmonk.org authored
      Good evening,
      
      Following LinuxCodingStyle documentation and with the help of Sam, fixed
      severals identation issues in the code, and few others cosmetic changes
      
      And last and i hope least fixing my name :)
      
      Signed-off-by : Dominique Carrel <netmonk@netmonk.org>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      98e98eb6
    • David S. Miller's avatar
      Merge branch 'sparc-pcie-perf' · 27f145e7
      David S. Miller authored
      Chris Hyser says:
      
      ====================
      sparc64: PCIe performance enhancements
      
      Ver 2 is redone for 4.8 where commit 00085f1e
      changed DMA attributes from struct pointer to unsigned long.
      
      This set of patches initiates a series of PCIe performance enhancement patch
      submittals.
      
      Patch 1/2 enables version 2 of the SPARC sun4v IOMMU I/O address translation
      services need for subsequent enhancements.
      
      Patch 2/2 allows drivers to specify DMA_ATTR_WEAK_ORDERING via DMA attributes
      to the SPARC DMA mapping routines enabling "relaxed ordering" for the buffer
      being mapped.
      
      [Still relevant write-up]
      PCI-Express Relaxed Ordering and the Sun SPARC Enterprise M-class Servers
      https://blogs.oracle.com/olympus/entry/relaxed_ordering
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      27f145e7
    • chris hyser's avatar
      sparc64: Enable setting "relaxed ordering" in IOMMU mappings · aa7bde1a
      chris hyser authored
      Enable relaxed ordering for memory writes in IOMMU TSB entry from
      dma_4v_alloc_coherent(), dma_4v_map_page() and dma_4v_map_sg() when
      dma_attrs DMA_ATTR_WEAK_ORDERING is set. This requires PCI IOMMU I/O
      Translation Services version 2.0 API.
      
      Many PCIe devices allow enabling relaxed-ordering (memory writes bypassing
      other memory writes) for various DMA buffers. A notable exception is the
      Mellanox mlx4 IB adapter. Due to the nature of x86 HW this appears to have
      little performance impact there. On SPARC HW however, this results in major
      performance degradation getting only about 3Gbps. Enabling RO in the IOMMU
      entries corresponding to mlx4 data buffers increases the throughput to
      about 13 Gbps.
      
      Orabug: 19245907
      Signed-off-by: default avatarChris Hyser <chris.hyser@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa7bde1a
    • chris hyser's avatar
      sparc64: Enable PCI IOMMU version 2 API · 8914391b
      chris hyser authored
      Enable Version 2 of the PCI IOMMU API needed for advanced features
      such as PCI Relaxed Ordering and greater than 2 GB DMA address
      space per root complex.
      Signed-off-by: default avatarChris Hyser <chris.hyser@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8914391b
    • Paul Gortmaker's avatar
      sparc: migrate exception table users off module.h and onto extable.h · cdd4f4c7
      Paul Gortmaker authored
      These files were only including module.h for exception table
      related functions.  We've now separated that content out into its
      own file "extable.h" so now move over to that and avoid all the
      extra header content in module.h that we don't really need to compile
      these files.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: sparclinux@vger.kernel.org
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cdd4f4c7
    • Mike Looijmans's avatar
      phy: micrel.c: Enable ksz9031 energy-detect power-down mode · af70c1f9
      Mike Looijmans authored
      Set bit 0 in register 1C.23 to enable the EDPD feature of the
      KSZ9031 PHY. This reduces power consumption when the link is
      down.
      Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
      Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: Florian Fainelli <f.fainelli@gmail.com
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      af70c1f9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · a6930aae
      Linus Torvalds authored
      Pull m68knommu updates from Greg Ungerer:
       "The bulk of the changes here are to clean up the ColdFire 5441x SoC
        support so that it can run with MMU enabled. We have only supported it
        with MMU disabled up to now.
      
        There is also a few individual bug fixes across the ColdFire support
        code"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: let clk_disable() return immediately if clk is NULL
        m68knommu: convert printk(KERN_INFO) to pr_info()
        m68knommu: clean up uClinux boot log output
        m68k: generalize uboot command line support
        m68k: don't panic if no hardware FPU defined
        m68k: only generate FPU instructions if CONFIG_FPU enabled
        m68k: always make available dump_fpu()
        m68k: generalize io memory region setup for ColdFire ACR registers
        m68k: move ColdFire _bootmem_alloc code
        m68k: report correct FPU type on ColdFire MMU platforms
        m68k: set appropriate machine type for m5411x SoC platforms
        m68k: move CONFIG_FPU set to per-CPU configuration
        m68knommu: fix IO write size in nettel pin set
        m68knommu: switch to using IO access methods in WildFire board code
        m68knommu: fix early setup to not access variables
      a6930aae
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa · d8ea757b
      Linus Torvalds authored
      Pull Xtensa updates from Max Filippov:
       "Updates for the xtensa architecture.  It is a combined set of patches
        for 4.8 that never got to the mainline and new patches for 4.9.
      
         - add new kernel memory layouts for MMUv3 cores: with 256MB and 512MB
           KSEG size, starting at physical address other than 0
      
         - make kernel load address configurable
      
         - clean up kernel memory layout macros
      
         - drop sysmem early allocator and switch to memblock
      
         - enable kmemleak and memory reservation from the device tree
      
         - wire up new syscalls: userfaultfd, membarrier, mlock2,
           copy_file_range, preadv2 and pwritev2
      
         - add new platform: Cadence Configurable System Platform (CSP) and
           new core variant for it: xt_lnx
      
         - rearrange CCOUNT calibration code, make most of it generic
      
         - improve machine reset code (XTFPGA now reboots reliably with MMUv3
           cores)
      
         - provide default memmap command line option for configurations
           without device tree support
      
         - ISS fixes: simdisk is now capable of using highmem pages, panic
           correctly terminates simulator"
      
      * tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa: (24 commits)
        xtensa: disable MMU initialization option on MMUv2 cores
        xtensa: add default memmap and mmio32native options to defconfigs
        xtensa: add default memmap option to common_defconfig
        xtensa: add default memmap option to iss_defconfig
        xtensa: ISS: allow simdisk to use high memory buffers
        xtensa: ISS: define simc_exit and use it instead of inline asm
        xtensa: xtfpga: group platform_* functions together
        xtensa: rearrange CCOUNT calibration
        xtensa: xtfpga: use clock provider, don't update DT
        xtensa: Tweak xuartps UART driver Rx watermark for Cadence CSP config.
        xtensa: initialize MMU before jumping to reset vector
        xtensa: fix icountlevel setting in cpu_reset
        xtensa: extract common CPU reset code into separate function
        xtensa: Added Cadence CSP kernel configuration for Xtensa
        xtensa: fix default kernel load address
        xtensa: wire up new syscalls
        xtensa: support reserved-memory DT node
        xtensa: drop sysmem and switch to memblock
        xtensa: minimize use of PLATFORM_DEFAULT_MEM_{ADDR,SIZE}
        xtensa: cleanup MMU setup and kernel layout macros
        ...
      d8ea757b
    • Stephen Rothwell's avatar
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 5bfb88a1
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net-next
      
      This is a pull request to address fallout from previous nf-next pull
      request, only fixes going on here:
      
      1) Address a potential null dereference in nf_unregister_net_hook()
         when becomes nf_hook_entry_head is NULL, from Aaron Conole.
      
      2) Missing ifdef for CONFIG_NETFILTER_INGRESS, also from Aaron.
      
      3) Fix linking problems in xt_hashlimit in x86_32, from Pai.
      
      4) Fix permissions of nf_log sysctl from unpriviledge netns, from
         Jann Horn.
      
      5) Fix possible divide by zero in nft_limit, from Liping Zhang.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5bfb88a1
  3. 05 Oct, 2016 4 commits
    • Linus Torvalds's avatar
      Merge tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 41844e36
      Linus Torvalds authored
      Pull staging and IIO updates from Greg KH:
       "Here is the big staging and IIO driver pull request for 4.9-rc1.
      
        There are a lot of patches in here, the majority due to the
        drivers/staging/greybus/ subsystem being merged in with full
        development history that went back a few years, in order to preserve
        the work that those developers did over time.
      
        Lots and lots of tiny cleanups happened in the tree as well, due to
        the Outreachy application process and lots of other developers showing
        up for the first time to clean code up.  Along with those changes, we
        deleted a wireless driver, and added a raspberrypi driver (currently
        marked broken), and lots of new iio drivers.
      
        Overall the tree still shrunk with more lines removed than added,
        about 10 thousand lines removed in total. Full details are in the very
        long shortlog below.
      
        All of this has been in the linux-next tree with no issues. There will
        be some merge problems with other subsystem trees, but those are all
        minor problems and shouldn't be hard to work out when they happen
        (MAINTAINERS and some lustre build problems with the IB tree)"
      
      And furter from me asking for clarification about greybus:
       "Right now there is a phone from Motorola shipping with this code (a
        slightly older version, but the same tree), so even though Ara is not
        alive in the same form, the functionality is happening. We are working
        with the developers of that phone to merge the newer stuff in with
        their fork so they can use the upstream version in future versions of
        their phone product line.
      
        Toshiba has at least one chip shipping in their catalog that
        needs/uses this protocol over a Unipro link, and rumor has it that
        there might be more in the future.
      
        There are also other users of the greybus protocols, there is a talk
        next week at ELC that shows how it is being used across a network
        connection to control a device, and previous ELC talks have showed the
        protocol stack being used over USB to drive embedded Linux boards.
        I've also talked to some people who are starting to work to add a host
        controller driver to control arduinos as the greybus PHY protocols are
        very useful to control a serial/i2c/spio/whatever device across a
        random physical link, as it is a way to have a self-describing device
        be attached to a host without needing manual configuration.
      
        So yes, people are using it, and there is still the chance that it
        will show up in a phone/laptop/tablet/whatever from Google in the
        future as well, the tech isn't dead, even if the original large phone
        project happens to be"
      
      * tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (3703 commits)
        Staging: fbtft: Fix bug in fbtft-core
        staging: rtl8188eu: fix double unlock error in rtw_resume_process()
        staging:r8188eu: remove GEN_MLME_EXT_HANDLER macro
        staging:r8188eu: remove GEN_DRV_CMD_HANDLER macro
        staging:r8188eu: remove GEN_EVT_CODE macro
        staging:r8188eu: remove GEN_CMD_CODE macro
        staging:r8188eu: remove pkt_newalloc member of the recv_buf structure
        staging:r8188eu: remove rtw_handle_dualmac declaration
        staging:r8188eu: remove (RGTRY|BSSID)_(OFT|SZ) macros
        staging:r8188eu: change rtl8188e_process_phy_info function argument type
        Staging: fsl-mc: Remove blank lines
        Staging: fsl-mc: Fix unaligned * in block comments
        Staging: comedi: Align the * in block comments
        Staging : ks7010 : Fix block comments warninig
        Staging: vt6655: Remove explicit NULL comparison using Coccinelle
        staging: rtl8188eu: core: rtw_xmit: Use macros instead of constants
        staging: rtl8188eu: core: rtw_xmit: Move constant of the right side
        staging: dgnc: Fix lines longer than 80 characters
        Staging: dgnc: constify attribute_group structures
        Staging: most: hdm-dim2: constify attribute_group structures
        ...
      41844e36
    • Linus Torvalds's avatar
      Merge tag 'sound-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 5691f0e9
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "Again the diffstat shows a widely distributed pattern at this cycle,
        as there've been many code cleanups and refactoring allover the
        places. Other than that, the development was relatively calm, and no
        big surprise shouldn't be expected. Here are some highlights:
      
        Core:
         - Sequencer code refactoring / documentation updates
         - TLV code moved to uapi, following some relevant cleanups
      
        USB-Audio:
         - Lots of LINE6 driver fixes / updates
         - DragonFly and TEAC device quirk updates
      
        HD-audio:
         - Usual fixupes for Dell, Lenovo and HP machines
         - Link-audio time reporting capability
      
        ASoC:
         - Large refactoring of simple-card code to be shared with rcar driver
         - Removal of some duplicated ops over lots of CODEC drivers
         - Again quite a few Intel SKL driver updates
         - New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663"
      
      * tag 'sound-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (465 commits)
        ASoC: fsl: Fix lockups with recent cache changes
        ASoC: Intel: Skylake: fix memory leak of module on error exit path
        ASoC: rsnd: add SNDRV_PCM_TRIGGER_SUSPEND/RESUME
        ASoC: wm8960: remove usage of obsoleted TLV-related macro
        ASoC: rt5616: remove usage of obsoleted TLV-related macro
        ASoC: max9867: remove usage of obsoleted TLV-related macro
        ASoC: trivial: system spelling fix
        ASoC: da7219: fix inappropriate condition statement
        ASoC: tlv320aic31xx: do not declare support for mono DAI
        ASoC: stac9766: fix wrong usage of DECLARE_TLV_DB_LINEAR()
        ASoC: wm8991: remove unused variable
        ASoC: wm8991: fix wrong usage of DECLARE_TLV_DB_LINEAR()
        ASOC: tpa6130a2: add static qualifier for file local symbols
        ASoC: sst-bxt-rt298: fix obsoleted initializers for array
        ASoC: sst-bxt-da7219_max98357a: fix obsoleted initializers for array
        ASoC: rt5616: add static qualifier for file local symbols
        ASoC: arizona: Add output power up/down delays for speaker path
        ASoC: arizona: Add debug prints for output power up/down times
        ALSA: hda - Add the top speaker pin config for HP Spectre x360
        ASoC: Intel: Add DMIC channel constraint for bxt machine
        ...
      5691f0e9
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 878fb5dc
      Linus Torvalds authored
      Pull DeviceTree updates from Rob Herring:
      
       - update changeset documentation on locking to reflect current code
      
       - fix alphabetizing of vendor-prefixes.txt
      
       - add various vendor prefixes
      
       - add ESP8089 WiFi binding
      
       - add new variable sized array parsing functions
      
      * tag 'devicetree-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (21 commits)
        DT: irqchip: renesas-irqc: document R8A7743/5 support
        dt-bindings: Add Keith&Koep vendor prefix
        dt-bindings: add vendor prefix for Auvidea GmbH
        of: Add vendor prefix for Engicam s.r.l company
        devicetree: Add vendor-prefix for Silead Inc.
        devicetree: bindings: Add vendor prefix for Topeet.
        dt-bindings: Add summit vendor id
        of/platform: Initialise dev->fwnode appropriately
        of: Add array read functions with min/max size limits
        of: Make of_find_property_value_of_size take a length range
        dt: net: enhance DWC EQoS binding to support Tegra186
        bindings: PCI: artpec: correct pci binding example
        Documentation: devicetree: Fix max77693 spelling errors
        dt: bindings: Add binding for ESP8089 wifi chips
        PCI: Xilinx NWL PCIe: Updating device tree documentation with prefetchable memory space
        Documentation: devicetree: spi: fix wrong spi-bus documentation
        dt-bindings: Add Japan Display Inc vendor id
        dt-bindings: vendor-prefixes: Add Sierra Wireless
        devicetree: Add vendor prefix for Shenzhen Sunchip Technology Co., Ltd
        devicetree: Sort vendor prefixes in alphabetical order
        ...
      878fb5dc
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 6a497e9d
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.9 series:
      
        Subsystem improvements:
      
         - do away with the last users of the obsolete Kconfig options
           ARCH_REQUIRE_GPIOLIB and ARCH_WANT_OPTIONAL_GPIOLIB (the latter
           always sounded like an item on a wishlist to Santa Claus to me). We
           can now select GPIOLIB and be done with it, for all archs. After
           some struggle it even work on UM. Not that it has GPIO, but if it
           wants to, it can select the library.
      
         - continued efforts to make drivers properly either tristate or bool.
      
         - introduce a warning for drivers assigning default triggers to their
           irqchip lines when probed from device tree, so we find and fix
           these ambigous drivers. It is agreed that in the OF config path,
           the device tree defines trigger characteristics.
      
         - the same warning, mutatis mutandis, for ACPI-probed GPIO irqchips.
      
         - we introduce the ability to mark certain IRQ lines as "unusable" as
           they can be taken by BIOS/firmware, unrouted in silicon and
           generally nasty if you use them, and such things. This is put to
           good use in the STMPE driver and also in the Cherryview pin control
           driver.
      
         - a new "mockup" virtual GPIO device that can be used for testing.
           The plan is to add unit tests under tools/* for exercising this
           device and verify that the kernel code paths are working as they
           should.
      
         - make memory-mapped I/O-drivers depend on HAS_IOMEM. This was
           implicit all the time, but when people started building UM with
           allyesconfig or allmodconfig it exploded in their face.
      
         - move some stray bits of device tree and ACPI HW description
           callbacks down into their respective implementation silo. These
           were causing issues when compiling on !HAS_IOMEM as well, so now
           eventually UM compiles the GPIOLIB library if it wants to.
      
        New drivers:
      
         - new driver for the Aspeed GPIO front-end companion to the pin
           controller merged through the pin control tree.
      
         - new driver for the LP873x PMIC GPIO portions.
      
         - new driver for Technologic Systems' I2C FPGA GPIO such as TS4900,
           TS-7970, TS-7990 and TS-4100.
      
         - new driver for the Broadcom BCM63xx series including BCM6338 and
           BCM6345.
      
         - new driver for the Intel WhiskeyCove PMIC GPIO.
      
         - new driver for the Allwinner AXP209 PMIC GPIO portions.
      
         - new driver for Diamond Systems 48 line GPIO-MM, another of these
           port-mapped I/O expansion cards.
      
         - support the STMicroelectronics STMPE1600 variant in the STMPE
           driver.
      
        Driver improvements:
      
         - the STMPE driver now supports rising/falling edge detection
           properly for IRQs.
      
         - the PCA954x will now fetch and enable its VCC regulator properly.
      
         - major rework of the PCA953x driver with the goal of eventually
           switching it over to use regmap and thus modernize it even more.
      
         - switch the IOP driver to use the generic MMIO GPIO library.
      
         - move the ages old HTC EGPIO (extended GPIO) GPIO expander driver
           over to this subsystem from MFD, achieveing some separation of
           concerns"
      
      * tag 'gpio-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (81 commits)
        gpio: add missing static inline
        gpio: OF: localize some gpiochip init functions
        gpio: acpi: separation of concerns
        gpio: OF: separation of concerns
        gpio: make memory-mapped drivers depend on HAS_IOMEM
        gpio: stmpe: use BIT() macro
        gpio: stmpe: forbid unused lines to be mapped as IRQs
        mfd/gpio: Move HTC GPIO driver to GPIO subsystem
        gpio: MAINTAINERS: Add an entry for GPIO mockup driver
        gpio/mockup: add virtual gpio device
        gpio: Added zynq specific check for special pins on bank zero
        gpio: axp209: Implement get_direction
        gpio: aspeed: remove redundant return value check
        gpio: loongson1: remove redundant return value check
        ARM: omap2: fix missing include
        gpio: tc3589x: fix up complaints on unsigned
        gpio: tc3589x: add .get_direction() and small cleanup
        gpio: f7188x: use gpiochip_get_data instead of container_of
        gpio: tps65218: use devm_gpiochip_add_data() for gpio registration
        gpio: aspeed: fix return value check in aspeed_gpio_probe()
        ...
      6a497e9d