1. 25 Aug, 2018 1 commit
    • Rafael J. Wysocki's avatar
      cpuidle: menu: Retain tick when shallow state is selected · 757ab15c
      Rafael J. Wysocki authored
      The case addressed by commit 5ef499cd (cpuidle: menu: Handle
      stopped tick more aggressively) in the stopped tick case is present
      when the tick has not been stopped yet too.  Namely, if only two CPU
      idle states, shallow state A with target residency significantly
      below the tick boundary and deep state B with target residency
      significantly above it, are available and the predicted idle
      duration is above the tick boundary, but below the target residency
      of state B, state A will be selected and the CPU may spend indefinite
      amount of time in it, which is not quite energy-efficient.
      
      However, if the tick has not been stopped yet and the governor is
      about to select a shallow idle state for the CPU even though the idle
      duration predicted by it is above the tick boundary, it should be
      fine to wake up the CPU early, so the tick can be retained then and
      the governor will have a chance to select a deeper state when it runs
      next time.
      
      [Note that when this really happens, it will make the idle duration
       predictor believe that the CPU might be idle longer than predicted,
       which will make it more likely to predict longer idle durations going
       forward, but that will also cause deeper idle states to be selected
       going forward, on average, which is what's needed here.]
      
      Fixes: 87c9fe6e (cpuidle: menu: Avoid selecting shallow states with stopped tick)
      Reported-by: default avatarLeo Yan <leo.yan@linaro.org>
      Cc: 4.17+ <stable@vger.kernel.org> # 4.17+: 5ef499cd (cpuidle: menu: Handle ...)
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      757ab15c
  2. 22 Aug, 2018 21 commits
    • Linus Torvalds's avatar
      Merge tag 'pm-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · dfec4a84
      Linus Torvalds authored
      Pull more power management updates from Rafael Wysocki:
       "These fix the main idle loop and the menu cpuidle governor, clean up
        the latter, fix a mistake in the PCI bus type's support for system
        suspend and resume, fix the ondemand and conservative cpufreq
        governors, address a build issue in the system wakeup framework and
        make the ACPI C-states desciptions less confusing.
      
        Specifics:
      
         - Make the idle loop handle stopped scheduler tick correctly (Rafael
           Wysocki).
      
         - Prevent the menu cpuidle governor from letting CPUs spend too much
           time in shallow idle states when it is invoked with scheduler tick
           stopped and clean it up somewhat (Rafael Wysocki).
      
         - Avoid invoking the platform firmware to make the platform enter the
           ACPI S3 sleep state with suspended PCIe root ports which may
           confuse the firmware and cause it to crash (Rafael Wysocki).
      
         - Fix sysfs-related race in the ondemand and conservative cpufreq
           governors which may cause the system to crash if the governor
           module is removed during an update of CPU frequency limits (Henry
           Willard).
      
         - Select SRCU when building the system wakeup framework to avoid a
           build issue in it (zhangyi).
      
         - Make the descriptions of ACPI C-states vendor-neutral to avoid
           confusion (Prarit Bhargava)"
      
      * tag 'pm-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: menu: Handle stopped tick more aggressively
        sched: idle: Avoid retaining the tick when it has been stopped
        PCI / ACPI / PM: Resume all bridges on suspend-to-RAM
        cpuidle: menu: Update stale polling override comment
        cpufreq: governor: Avoid accessing invalid governor_data
        x86/ACPI/cstate: Make APCI C1 FFH MWAIT C-state description vendor-neutral
        cpuidle: menu: Fix white space
        PM / sleep: wakeup: Fix build error caused by missing SRCU support
      dfec4a84
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 159127ea
      Linus Torvalds authored
      Pull IDE updates from David Miller:
      
       - Remove redundant variables (Colin Ian King)
      
       - Expected switch fall-through annotations (Gustavo A. R. Silva)
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: mark expected switch fall-throughs
        ide-tape: remove redundant variable buffer_size
        ide: remove redundant variables queue_run_ms and left
      159127ea
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 9617ba39
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Nothing super serious:
      
         - Convert sparc32 over to NO_BOOTMEM (Mike Rapoport)
      
         - Use dma_noncoherent_ops on sparc32 (Christoph Hellwig)
      
         - Fix kbuild defconfig handling on sparc32 (Masahiro Yamada)"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32
        sparc32: split ramdisk detection and reservation to a helper function
        sparc32: switch to NO_BOOTMEM
        sparc: mm/init_32: kill trailing whitespace
        sparc: use generic dma_noncoherent_ops
      9617ba39
    • Linus Torvalds's avatar
      Merge tag 'for-4.19' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux · 20a9e57a
      Linus Torvalds authored
      Pull arch/h8300 updates from Yoshinori Sato.
      
      * tag 'for-4.19' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
        h8300: fix IRQ no
        arch/h8300: add a defconfig target
        arch/h8300: eliminate kgbd.c warning
        arch/h8300: eliminate ptrace.h warnings
        h8300:let the checker know that size_t is ulong
        h8300: Don't include linux/kernel.h in asm/atomic.h
        h8300: remove unnecessary of_platform_populate call
        h8300: Correct signature of test_bit()
        h8300: irqchip: fix warning
        h8300: switch to NO_BOOTMEM
        h8300: gcc-8.1 fix
        h8300: Add missing output register.
      20a9e57a
    • Yoshinori Sato's avatar
      h8300: fix IRQ no · 4bdf61cc
      Yoshinori Sato authored
      Old timer handler use 24 (Compare match A).
      But current timer handler use 26 (Overflow).
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      4bdf61cc
    • Randy Dunlap's avatar
      arch/h8300: add a defconfig target · 7b291be8
      Randy Dunlap authored
      Make the "defconfig" target valid for arch/h8300.  Currently
      "make ARCH=h8300 defconfig" produces:
      
      *** Can't find default configuration "arch/h8300/defconfig"!
      ../scripts/kconfig/Makefile:87: recipe for target 'defconfig' failed
      
      By adding a value for KBUILD_DEFCONFIG, "make ARCH=h8300 defconfig"
      successfully produces a kernel .config file:
      
      *** Default configuration is based on 'edosk2674_defconfig'
      
      This is useful for Kconfig editing/testing.
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: uclinux-h8-devel@lists.sourceforge.jp (moderated for non-subscribers)
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      7b291be8
    • Randy Dunlap's avatar
      arch/h8300: eliminate kgbd.c warning · ce156feb
      Randy Dunlap authored
      Drop the "const" qualifier from arch_kgdb_ops to eliminate the gcc
      warning (gcc version is 8.1.0).
      
      arch/h8300/kernel/kgdb.c:132:24: error: conflicting type qualifiers for 'arch_kgdb_ops'
       const struct kgdb_arch arch_kgdb_ops = {
      In file included from ../arch/h8300/kernel/kgdb.c:12:
      ../include/linux/kgdb.h:284:26: note: previous declaration of 'arch_kgdb_ops' was here
       extern struct kgdb_arch  arch_kgdb_ops;
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: uclinux-h8-devel@lists.sourceforge.jp
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      ce156feb
    • Randy Dunlap's avatar
      arch/h8300: eliminate ptrace.h warnings · cfa2d688
      Randy Dunlap authored
      Add a "struct task_struct;" stub to arch/h8300's ptrace.h header to
      eliminate gcc warnings (gcc version is 8.1.0).
      
      ../arch/h8300/include/asm/ptrace.h:32:34: warning: 'struct task_struct' declared inside parameter list will not be visible outside of this definition or declaration
       extern long h8300_get_reg(struct task_struct *task, int regno);
      ../arch/h8300/include/asm/ptrace.h:33:33: warning: 'struct task_struct' declared inside parameter list will not be visible outside of this definition or declaration
       extern int h8300_put_reg(struct task_struct *task, int regno,
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: uclinux-h8-devel@lists.sourceforge.jp
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      cfa2d688
    • Luc Van Oostenryck's avatar
      h8300:let the checker know that size_t is ulong · 1b803a35
      Luc Van Oostenryck authored
      All 64bit archs use unsigned long for size_t and most 32bit
      archs use 'unsigned int'. By default, this is what is assumed
      by sparse.
      
      However, on h8300 (a 32bit arch) size_t is unsigned long which
      can led sparse to emit wrong warnings.
      
      Fix this by passing to sparse the flag -msize-long, telling it
      that size_t is unsigned long.
      Signed-off-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      1b803a35
    • Will Deacon's avatar
      h8300: Don't include linux/kernel.h in asm/atomic.h · 9819d4e4
      Will Deacon authored
      linux/kernel.h isn't needed by asm/atomic.h and will result in circular
      dependencies when the asm-generic atomic bitops are built around the
      tomic_long_t interface.
      
      Remove the broad include and replace it with linux/compiler.h for
      READ_ONCE etc and asm/irqflags.h for arch_local_irq_save etc.
      
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      9819d4e4
    • Rob Herring's avatar
      h8300: remove unnecessary of_platform_populate call · ec3d5f16
      Rob Herring authored
      The DT core will call of_platform_populate, so it is not necessary for
      arch specific code to call it unless there are custom match entries,
      auxdata or parent device. Neither of those apply here, so remove the call.
      
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: uclinux-h8-devel@lists.sourceforge.jp
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      ec3d5f16
    • Geert Uytterhoeven's avatar
      h8300: Correct signature of test_bit() · 5743ee22
      Geert Uytterhoeven authored
          mm/filemap.c: In function 'clear_bit_unlock_is_negative_byte':
          mm/filemap.c:1181:30: warning: passing argument 2 of 'test_bit' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers]
            return test_bit(PG_waiters, mem);
      				  ^~~
          In file included from include/linux/bitops.h:38,
      		     from include/linux/kernel.h:11,
      		     from include/linux/list.h:9,
      		     from include/linux/wait.h:7,
      		     from include/linux/wait_bit.h:8,
      		     from include/linux/fs.h:6,
      		     from include/linux/dax.h:5,
      		     from mm/filemap.c:14:
          arch/h8300/include/asm/bitops.h:69:57: note: expected 'const long unsigned int *' but argument is of type 'volatile void *'
           static inline int test_bit(int nr, const unsigned long *addr)
      					~~~~~~~~~~~~~~~~~~~~~^~~~
      
      Make the bitmask pointed to by the "addr" parameter volatile to fix
      this, like is done on other architectures.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      5743ee22
    • Yoshinori Sato's avatar
      h8300: irqchip: fix warning · 558e6694
      Yoshinori Sato authored
      Var "addr" type incorrect.
      It have interrupt controler register address.
      Type of void __iomem is correct.
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      558e6694
    • Rob Herring's avatar
      h8300: switch to NO_BOOTMEM · c489dfef
      Rob Herring authored
      Commit 0fa1c579 ("of/fdt: use memblock_virt_alloc for early alloc")
      inadvertently switched the DT unflattening allocations from memblock to
      bootmem which doesn't work because the unflattening happens before
      bootmem is initialized. Swapping the order of bootmem init and
      unflattening could also fix this, but removing bootmem is desired. So
      enable NO_BOOTMEM on h8300 like other architectures have done.
      
      Fixes: 0fa1c579 ("of/fdt: use memblock_virt_alloc for early alloc")
      Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
      Cc: uclinux-h8-devel@lists.sourceforge.jp
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      c489dfef
    • Yoshinori Sato's avatar
      h8300: gcc-8.1 fix · 811d1b0e
      Yoshinori Sato authored
      Since gcc 8.1 does not generate an assignment statement to er 0,
      we had to explicitly write it.
      Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
      811d1b0e
    • Yoshinori Sato's avatar
      686320e9
    • Linus Torvalds's avatar
      Merge tag 'fuse-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · ad1d6973
      Linus Torvalds authored
      Pull fuse update from Miklos Szeredi:
       "Various bug fixes and cleanups"
      
      * tag 'fuse-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: reduce allocation size for splice_write
        fuse: use kvmalloc to allocate array of pipe_buffer structs.
        fuse: convert last timespec use to timespec64
        fs: fuse: Adding new return type vm_fault_t
        fuse: simplify fuse_abort_conn()
        fuse: Add missed unlock_page() to fuse_readpages_fill()
        fuse: Don't access pipe->buffers without pipe_lock()
        fuse: fix initial parallel dirops
        fuse: Fix oops at process_init_reply()
        fuse: umount should wait for all requests
        fuse: fix unlocked access to processing queue
        fuse: fix double request_end()
      ad1d6973
    • Linus Torvalds's avatar
      Merge tag 'ovl-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · d9a185f8
      Linus Torvalds authored
      Pull overlayfs updates from Miklos Szeredi:
       "This contains two new features:
      
         - Stack file operations: this allows removal of several hacks from
           the VFS, proper interaction of read-only open files with copy-up,
           possibility to implement fs modifying ioctls properly, and others.
      
         - Metadata only copy-up: when file is on lower layer and only
           metadata is modified (except size) then only copy up the metadata
           and continue to use the data from the lower file"
      
      * tag 'ovl-update-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs: (66 commits)
        ovl: Enable metadata only feature
        ovl: Do not do metacopy only for ioctl modifying file attr
        ovl: Do not do metadata only copy-up for truncate operation
        ovl: add helper to force data copy-up
        ovl: Check redirect on index as well
        ovl: Set redirect on upper inode when it is linked
        ovl: Set redirect on metacopy files upon rename
        ovl: Do not set dentry type ORIGIN for broken hardlinks
        ovl: Add an inode flag OVL_CONST_INO
        ovl: Treat metacopy dentries as type OVL_PATH_MERGE
        ovl: Check redirects for metacopy files
        ovl: Move some dir related ovl_lookup_single() code in else block
        ovl: Do not expose metacopy only dentry from d_real()
        ovl: Open file with data except for the case of fsync
        ovl: Add helper ovl_inode_realdata()
        ovl: Store lower data inode in ovl_inode
        ovl: Fix ovl_getattr() to get number of blocks from lower
        ovl: Add helper ovl_dentry_lowerdata() to get lower data dentry
        ovl: Copy up meta inode data from lowest data inode
        ovl: Modify ovl_lookup() and friends to lookup metacopy dentry
        ...
      d9a185f8
    • Linus Torvalds's avatar
      Merge tag 'xfs-4.19-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · c22fc16d
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
      
       - Fix an uninitialized variable
      
       - Don't use obviously garbage AG header counters to calculate
         transaction reservations
      
       - Trigger icount recalculation on bad icount when mounting
      
      * tag 'xfs-4.19-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        iomap: fix WARN_ON_ONCE on uninitialized variable
        xfs: sanity check ag header values in xrep_calc_ag_resblks
        xfs: recalculate summary counters at mount time if icount is bad
      c22fc16d
    • Linus Torvalds's avatar
      Merge tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · c1fecabe
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
      
       - Improve support for TI bq20z75 in sbs-battery
      
       - Add Qualcomm PM8xxx reboot driver
      
       - Add cros-ec USBPD charger driver
      
       - Move ds2760 battery driver from w1 to power-supply and add DT support
      
       - Misc fixes
      
      * tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (28 commits)
        power: supply: bq27xxx: Update comments
        power: supply: max77693_charger: fix unintentional fall-through
        power: supply: mark expected switch fall-throughs
        power: supply: lego_ev3_battery: fix Vce offset
        power: supply: lego_ev3_battery: Don't ignore iio_read_channel_processed() return value
        power: supply: ds2760_battery: add devicetree probing
        power: supply: ds2760_battery: merge ds2760 supply driver with its w1 slave companion
        w1: core: match sub-nodes of bus masters in devicetree
        dt-bindings: w1: document bindings for ds2760 battery monitor
        dt-bindings: w1: document generic onewire bindings
        power: supply: adp5061: Fix a couple off by ones
        dt-bindings: power: reset: qcom: Add resin binding
        adp5061: New driver for ADP5061 I2C battery charger
        power: generic-adc-battery: check for duplicate properties copied from iio channels
        power: generic-adc-battery: fix out-of-bounds write when copying channel properties
        power: supply: axp288_charger: Fix initial constant_charge_current value
        power: supply: ab8500: stop using getnstimeofday64()
        power: gemini-poweroff: Avoid more spurious poweroffs
        power: vexpress: fix corruption in notifier registration
        power: remove possible deadlock when unregistering power_supply
        ...
      c1fecabe
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 99cc7ad4
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
      
       - the core has now a lockless variant of i2c_smbus_xfer. Some open
         coded versions of this got removed in drivers. This also enables
         proper SCCB support in regmap.
      
       - locking got a more precise naming. i2c_{un}lock_adapter() had to go,
         and we know use i2c_lock_bus() consistently with flags like
         I2C_LOCK_ROOT_ADAPTER and I2C_LOCK_SEGMENT to avoid ambiguity.
      
       - the gpio fault injector got a new delicate testcase
      
       - the bus recovery procedure got fixed to handle the new testcase
         correctly
      
       - a new quirk flag for controllers not able to handle zero length
         messages together with driver updates to use it
      
       - new drivers: FSI bus attached I2C masters, GENI I2C controller, Owl
         family S900
      
       - and a good set of driver improvements and bugfixes
      
      * 'i2c/for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (77 commits)
        i2c: rcar: implement STOP and REP_START according to docs
        i2c: rcar: refactor private flags
        i2c: core: ACPI: Make acpi_gsb_i2c_read_bytes() check i2c_transfer return value
        i2c: core: ACPI: Properly set status byte to 0 for multi-byte writes
        dt-bindings: i2c: rcar: Add r8a774a1 support
        dt-bindings: i2c: sh_mobile: Add r8a774a1 support
        i2c: imx: Simplify stopped state tracking
        i2c: imx: Fix race condition in dma read
        i2c: pasemi: remove hardcoded bus numbers on smbus
        i2c: designware: Add SPDX license tag
        i2c: designware: Convert to use struct i2c_timings
        i2c: core: Parse SDA hold time from firmware
        i2c: designware-pcidrv: Mark expected switch fall-through
        i2c: amd8111: Mark expected switch fall-through
        i2c: sh_mobile: use core to detect 'no zero length read' quirk
        i2c: xlr: use core to detect 'no zero length' quirk
        i2c: rcar: use core to detect 'no zero length' quirk
        i2c: stu300: use core to detect 'no zero length' quirk
        i2c: pmcmsp: use core to detect 'no zero length' quirk
        i2c: mxs: use core to detect 'no zero length' quirk
        ...
      99cc7ad4
  3. 21 Aug, 2018 15 commits
    • Linus Torvalds's avatar
      Merge branch 'siginfo-linus' of... · 0214f46b
      Linus Torvalds authored
      Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
      
      Pull core signal handling updates from Eric Biederman:
       "It was observed that a periodic timer in combination with a
        sufficiently expensive fork could prevent fork from every completing.
        This contains the changes to remove the need for that restart.
      
        This set of changes is split into several parts:
      
         - The first part makes PIDTYPE_TGID a proper pid type instead
           something only for very special cases. The part starts using
           PIDTYPE_TGID enough so that in __send_signal where signals are
           actually delivered we know if the signal is being sent to a a group
           of processes or just a single process.
      
         - With that prep work out of the way the logic in fork is modified so
           that fork logically makes signals received while it is running
           appear to be received after the fork completes"
      
      * 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (22 commits)
        signal: Don't send signals to tasks that don't exist
        signal: Don't restart fork when signals come in.
        fork: Have new threads join on-going signal group stops
        fork: Skip setting TIF_SIGPENDING in ptrace_init_task
        signal: Add calculate_sigpending()
        fork: Unconditionally exit if a fatal signal is pending
        fork: Move and describe why the code examines PIDNS_ADDING
        signal: Push pid type down into complete_signal.
        signal: Push pid type down into __send_signal
        signal: Push pid type down into send_signal
        signal: Pass pid type into do_send_sig_info
        signal: Pass pid type into send_sigio_to_task & send_sigurg_to_task
        signal: Pass pid type into group_send_sig_info
        signal: Pass pid and pid type into send_sigqueue
        posix-timers: Noralize good_sigevent
        signal: Use PIDTYPE_TGID to clearly store where file signals will be sent
        pid: Implement PIDTYPE_TGID
        pids: Move the pgrp and session pid pointers from task_struct to signal_struct
        kvm: Don't open code task_pid in kvm_vcpu_ioctl
        pids: Compute task_tgid using signal->leader_pid
        ...
      0214f46b
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep' · 01ac7c4c
      Rafael J. Wysocki authored
      Merge fixes for the ondemand and conservative cpufreq governors,
      PCI power management and system wakeup framework.
      
      * pm-cpufreq:
        cpufreq: governor: Avoid accessing invalid governor_data
      
      * pm-pci:
        PCI / ACPI / PM: Resume all bridges on suspend-to-RAM
      
      * pm-sleep:
        PM / sleep: wakeup: Fix build error caused by missing SRCU support
      01ac7c4c
    • Linus Torvalds's avatar
      Merge tag 'chrome-platform-for-linus-4.19' of... · 40fafdcb
      Linus Torvalds authored
      Merge tag 'chrome-platform-for-linus-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform
      
      Pull chrome platform updates from Benson Leung.
      
      Everything but the SPDX identifier updates actually came in earlier
      through the MFD merge.
      
      * tag 'chrome-platform-for-linus-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform:
        platform/chrome: chromeos_tbmc - fix SPDX identifier
      40fafdcb
    • Linus Torvalds's avatar
      Merge tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 5e268309
      Linus Torvalds authored
      Pull arch/microblaze updates from Michal Simek:
      
       - use generic noncoherent direct mapping
      
       - use LDFLAGS instead of LD
      
       - pci error path fix
      
       - remove incorrect comments
      
      * tag 'microblaze-v4.19-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze/PCI: Remove stale pcibios_align_resource() comment
        microblaze: delete wrong comment about machine_early_init
        microblaze: add endianness options to LDFLAGS instead of LD
        microblaze: remove consistent_sync and consistent_sync_page
        microblaze: use generic dma_noncoherent_ops
        microblaze: warn if of_iomap() failed
      5e268309
    • Masahiro Yamada's avatar
      sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32 · c84ca616
      Masahiro Yamada authored
      As commit 5ba80096 ("kbuild: update ARCH alias info for sparc")
      addressed, SPARC accepts ARCH=sparc32 as an alias.
      
      However, arch/sparc/Makefile wrongly sets KBUILD_DEFCONFIG, then
      sparc64_defconfig is chosen as the base configuration for ARCH=sparc32.
      
        $ make ARCH=sparc32 defconfig
        *** Default configuration is based on 'sparc64_defconfig'
        #
        # configuration written to .config
        #
      
      Fix the logic to choose sparc64_defconfig only when ARCH=sparc64.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c84ca616
    • David S. Miller's avatar
      Merge branch 'sparc32-NO_BOOTMEM' · aa59fa78
      David S. Miller authored
      Mike Rapoport says:
      
      ====================
      sparc32: switch to NO_BOOTMEM
      
      These patches convert sparc32 to use memblock + nobootmem.
      I've made the conversion as simple as possible, just enough to allow moving
      HAVE_MEMBLOCK and NO_BOOTMEM to the common SPARC configuration.
      
      v2 changes:
      * split whitespace changes to a separate patch
      * address Sam's comments [1]
      
      [1] https://lkml.org/lkml/2018/8/2/403
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa59fa78
    • Mike Rapoport's avatar
      sparc32: split ramdisk detection and reservation to a helper function · 8818d89c
      Mike Rapoport authored
      The detection and reservation of ramdisk memory were separated to allow
      bootmem bitmap initialization after the ramdisk boundaries are detected.
      Since the bootmem initialization is removed, the reservation of ramdisk
      memory is done immediately after its boundaries are found.
      
      Split the entire block into a separate helper function.
      Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
      Suggested-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8818d89c
    • Mike Rapoport's avatar
      sparc32: switch to NO_BOOTMEM · cca079ef
      Mike Rapoport authored
      Each populated sparc_phys_bank is added to memblock.memory. The
      reserve_bootmem() calls are replaced with memblock_reserve(), and the
      bootmem bitmap initialization is droppped.
      Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
      Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cca079ef
    • Mike Rapoport's avatar
      60ef8616
    • Christoph Hellwig's avatar
      sparc: use generic dma_noncoherent_ops · dfaad39c
      Christoph Hellwig authored
      Switch to the generic noncoherent direct mapping implementation.
      
      This removes the previous sync_single_for_device implementation, which
      looks bogus given that no syncing is happening in the similar but more
      important map_single case.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dfaad39c
    • Lorenzo Pieralisi's avatar
      microblaze/PCI: Remove stale pcibios_align_resource() comment · c4347b05
      Lorenzo Pieralisi authored
      commit 01cf9d52 ("microblaze/PCI: Support generic Xilinx AXI PCIe Host
      Bridge IP driver")
      
      and
      
      commit ecf677c8 ("PCI: Add a generic weak pcibios_align_resource()")
      
      first patched then removed pcibios_align_resource() from the microblaze
      architecture code but failed to remove the comment that was added to
      it.
      
      Remove it since it has now become stale and it is quite confusing.
      Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
      Cc: Palmer Dabbelt <palmer@dabbelt.com>
      Cc: Bjorn Helgaas <bhelgaas@google.com>
      Cc: Bharat Kumar Gogada <bharatku@xilinx.com>
      Cc: Michal Simek <monstr@monstr.eu>
      Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
      c4347b05
    • Linus Torvalds's avatar
      Merge tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 778a3395
      Linus Torvalds authored
      Pull ia64 NO_BOOTMEM conversion from Tony Luck:
       "Mike Rapoport kindly fixed up ia64 to work with NO_BOOTMEM"
      
      * tag 'please-pull-noboot' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: switch to NO_BOOTMEM
        ia64: use mem_data to detect nodes' minimal and maximal PFNs
        ia64: remove unused num_dma_physpages member from 'struct early_node_data'
        ia64: contig/paging_init: reduce code duplication
      778a3395
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.19-rc1' of... · 6b2edf27
      Linus Torvalds authored
      Merge tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest update from Shuah Khan:
      
       - add cgroup core selftests
      
       - fix compile warnings in android ion test
      
       - fix to bugs in exclude and skip paths in vDSO test
      
       - remove obsolete config options
      
       - add missing .gitignore file
      
      * tag 'linux-kselftest-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests/ftrace: Fix kprobe string testcase to not probe notrace function
        selftests: mount: remove no longer needed config option
        selftests: cgroup: add gitignore file
        Add cgroup core selftests
        selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run
        selftests: vDSO - fix to exclude x86 test on non-x86 platforms
        selftests/android: initialize heap_type to avoid compiling warning
      6b2edf27
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 7140ad38
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
      
       - Restructure of lockdep and latency tracers
      
         This is the biggest change. Joel Fernandes restructured the hooks
         from irqs and preemption disabling and enabling. He got rid of a lot
         of the preprocessor #ifdef mess that they caused.
      
         He turned both lockdep and the latency tracers to use trace events
         inserted in the preempt/irqs disabling paths. But unfortunately,
         these started to cause issues in corner cases. Thus, parts of the
         code was reverted back to where lockdep and the latency tracers just
         get called directly (without using the trace events). But because the
         original change cleaned up the code very nicely we kept that, as well
         as the trace events for preempt and irqs disabling, but they are
         limited to not being called in NMIs.
      
       - Have trace events use SRCU for "rcu idle" calls. This was required
         for the preempt/irqs off trace events. But it also had to not allow
         them to be called in NMI context. Waiting till Paul makes an NMI safe
         SRCU API.
      
       - New notrace SRCU API to allow trace events to use SRCU.
      
       - Addition of mcount-nop option support
      
       - SPDX headers replacing GPL templates.
      
       - Various other fixes and clean ups.
      
       - Some fixes are marked for stable, but were not fully tested before
         the merge window opened.
      
      * tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (44 commits)
        tracing: Fix SPDX format headers to use C++ style comments
        tracing: Add SPDX License format tags to tracing files
        tracing: Add SPDX License format to bpf_trace.c
        blktrace: Add SPDX License format header
        s390/ftrace: Add -mfentry and -mnop-mcount support
        tracing: Add -mcount-nop option support
        tracing: Avoid calling cc-option -mrecord-mcount for every Makefile
        tracing: Handle CC_FLAGS_FTRACE more accurately
        Uprobe: Additional argument arch_uprobe to uprobe_write_opcode()
        Uprobes: Simplify uprobe_register() body
        tracepoints: Free early tracepoints after RCU is initialized
        uprobes: Use synchronize_rcu() not synchronize_sched()
        tracing: Fix synchronizing to event changes with tracepoint_synchronize_unregister()
        ftrace: Remove unused pointer ftrace_swapper_pid
        tracing: More reverting of "tracing: Centralize preemptirq tracepoints and unify their usage"
        tracing/irqsoff: Handle preempt_count for different configs
        tracing: Partial revert of "tracing: Centralize preemptirq tracepoints and unify their usage"
        tracing: irqsoff: Account for additional preempt_disable
        trace: Use rcu_dereference_raw for hooks from trace-event subsystem
        tracing/kprobes: Fix within_notrace_func() to check only notrace functions
        ...
      7140ad38
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.19-rc1' of git://github.com/ceph/ceph-client · 0a78ac4b
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "The main things are support for cephx v2 authentication protocol and
        basic support for rbd images within namespaces (myself).
      
        Also included are y2038 conversion patches from Arnd, a pile of
        miscellaneous fixes from Chengguang and Zheng's feature bit
        infrastructure for the filesystem"
      
      * tag 'ceph-for-4.19-rc1' of git://github.com/ceph/ceph-client: (40 commits)
        ceph: don't drop message if it contains more data than expected
        ceph: support cephfs' own feature bits
        crush: fix using plain integer as NULL warning
        libceph: remove unnecessary non NULL check for request_key
        ceph: refactor error handling code in ceph_reserve_caps()
        ceph: refactor ceph_unreserve_caps()
        ceph: change to void return type for __do_request()
        ceph: compare fsc->max_file_size and inode->i_size for max file size limit
        ceph: add additional size check in ceph_setattr()
        ceph: add additional offset check in ceph_write_iter()
        ceph: add additional range check in ceph_fallocate()
        ceph: add new field max_file_size in ceph_fs_client
        libceph: weaken sizeof check in ceph_x_verify_authorizer_reply()
        libceph: check authorizer reply/challenge length before reading
        libceph: implement CEPHX_V2 calculation mode
        libceph: add authorizer challenge
        libceph: factor out encrypt_authorizer()
        libceph: factor out __ceph_x_decrypt()
        libceph: factor out __prepare_write_connect()
        libceph: store ceph_auth_handshake pointer in ceph_connection
        ...
      0a78ac4b
  4. 20 Aug, 2018 3 commits
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · bfebeb16
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "It is now possible to add custom sysfs attributes while avoiding a
        possible race condition. Unused code has been removed resulting in a
        nice reduction of the code base. And more drivers have been switched
        to SPDX by their maintainers.
      
       Summary:
      
        Subsystem:
         - new helpers to add custom sysfs attributes
         - struct rtc_task removal along with rtc_irq_[un]register()
         - rtc_irq_set_state and rtc_irq_set_freq are not exported anymore
      
        Drivers:
         - armada38x: reset after rtc power loss
         - ds1307: now supports m41t11
         - isl1208: now supports isl1219 and tamper detection
         - pcf2127: internal SRAM support"
      
      * tag 'rtc-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (34 commits)
        rtc: ds1307: simplify hwmon config
        rtc: s5m: Add SPDX license identifier
        rtc: maxim: Add SPDX license identifiers
        rtc: isl1219: add device tree documentation
        rtc: isl1208: set ev-evienb bit from device tree
        rtc: isl1208: Add "evdet" interrupt source for isl1219
        rtc: isl1208: add support for isl1219 with tamper detection
        rtc: sysfs: facilitate attribute add to rtc device
        rtc: remove struct rtc_task
        char: rtc: remove task handling
        rtc: pcf85063: preserve control register value between stop and start
        rtc: sh: remove unused variable rtc_dev
        rtc: unexport rtc_irq_set_*
        rtc: simplify rtc_irq_set_state/rtc_irq_set_freq
        rtc: remove irq_task and irq_task_lock
        rtc: remove rtc_irq_register/rtc_irq_unregister
        rtc: sh: remove dead code
        rtc: sa1100: don't set PIE frequency
        rtc: ds1307: support m41t11 variant
        rtc: ds1307: fix data pointer to m41t0
        ...
      bfebeb16
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 3933ec73
      Linus Torvalds authored
      Pull livepatching updates from Jiri Kosina:
       "Code cleanups from Kamalesh Babulal"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: Validate module/old func name length
        livepatch: Remove reliable stacktrace check in klp_try_switch_task()
      3933ec73
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7a324b3f
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - touch_max detection improvements and quirk handling fixes in wacom
         driver from Jason Gerecke and Ping Cheng
      
       - Palm rejection from Dmitry Torokhov and _dial support from Benjamin
         Tissoires for hid-multitouch driver
      
       - Low voltage support for i2c-hid driver from Stephen Boyd
      
       - Guitar-Hero support from Nicolas Adenis-Lamarre
      
       - other assorted small fixes and device ID additions
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (40 commits)
        HID: intel_ish-hid: tx_buf memory leak on probe/remove
        HID: intel-ish-hid: Prevent loading of driver on Mehlow
        HID: cougar: Add support for the Cougar 500k Gaming Keyboard
        HID: cougar: make compare_device_paths reusable
        HID: intel-ish-hid: remove redundant variable num_frags
        HID: multitouch: handle palm for touchscreens
        HID: multitouch: touchscreens also use confidence reports
        HID: multitouch: report MT_TOOL_PALM for non-confident touches
        HID: microsoft: support the Surface Dial
        HID: core: do not upper bound the collection stack
        HID: input: enable Totem on the Dell Canvas 27
        HID: multitouch: remove one copy of values
        HID: multitouch: ditch mt_report_id
        HID: multitouch: store a per application quirks value
        HID: multitouch: Store per collection multitouch data
        HID: multitouch: make sure the static list of class is not changed
        input: add MT_TOOL_DIAL
        HID: elan: Add support for touchpad on the Toshiba Click Mini L9W
        HID: elan: Add USB-id for HP x2 10-n000nd touchpad
        HID: elan: Add a flag for selecting if the touchpad has a LED
        ...
      7a324b3f