1. 21 6月, 2018 1 次提交
  2. 14 6月, 2018 1 次提交
    • I
      Merge tag 'perf-urgent-for-mingo-4.18-20180611' of... · a89d0c2a
      Ingo Molnar 提交于
      Merge tag 'perf-urgent-for-mingo-4.18-20180611' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes and improvements from Arnaldo Carvalho de Melo:
      
      perf stat:
      
      - Fix metric column header display alignment (Jiri Olsa)
      
      - Improve error messages for default attributes, providing better output
        for error in command lines such as:
      
        $ perf stat -T
        Cannot set up transaction events
        event syntax error: '..cycles,cpu/cycles-t/,cpu/tx-start/,cpu/el-start/,cpu/cycles-ct/}'
                                          \___ unknown term
      
        Where the "event syntax error" line now appears (Jiri Olsa)
      
      - Add --interval-clear option, to provide a 'watch' like printing (Jiri Olsa)
      
      perf script:
      
      - Show hw-cache events too (Seeteena Thoufeek)
      
      perf c2c:
      
      - Fix data dependency problem in layout of 'struct c2c_hist_entry', where
        its member 'struct hist_entry' must be at the end because it has a ZLA
        as its last member, that gets space when handling callchains (Jiri Olsa)
      
      Core:
      
      - We cannot assume that a 'struct perf_evsel'  is to be obtained from a
        container_of operation on a 'struct hists' as there are tools, such as
        'perf c2c' that uses 'struct hist' instances without having them in
        container structs that also have 'struct perf_evsel' in a particular
        layout, so provide a different way of figuring out if a 'struct hists'
        and 'struct hist_entry' have callchains (Arnaldo Carvalho de Melo)
      
      - Fix error index in the PMU event parser, so that error messages can
        point to the problematic token (Jiri Olsa)
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      a89d0c2a
  3. 11 6月, 2018 5 次提交
    • L
      Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d82991a8
      Linus Torvalds 提交于
      Pull restartable sequence support from Thomas Gleixner:
       "The restartable sequences syscall (finally):
      
        After a lot of back and forth discussion and massive delays caused by
        the speculative distraction of maintainers, the core set of
        restartable sequences has finally reached a consensus.
      
        It comes with the basic non disputed core implementation along with
        support for arm, powerpc and x86 and a full set of selftests
      
        It was exposed to linux-next earlier this week, so it does not fully
        comply with the merge window requirements, but there is really no
        point to drag it out for yet another cycle"
      
      * 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rseq/selftests: Provide Makefile, scripts, gitignore
        rseq/selftests: Provide parametrized tests
        rseq/selftests: Provide basic percpu ops test
        rseq/selftests: Provide basic test
        rseq/selftests: Provide rseq library
        selftests/lib.mk: Introduce OVERRIDE_TARGETS
        powerpc: Wire up restartable sequences system call
        powerpc: Add syscall detection for restartable sequences
        powerpc: Add support for restartable sequences
        x86: Wire up restartable sequence system call
        x86: Add support for restartable sequences
        arm: Wire up restartable sequences system call
        arm: Add syscall detection for restartable sequences
        arm: Add restartable sequences support
        rseq: Introduce restartable sequences system call
        uapi/headers: Provide types_32_64.h
      d82991a8
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f4e5b30d
      Linus Torvalds 提交于
      Pull x86 updates and fixes from Thomas Gleixner:
      
       - Fix the (late) fallout from the vector management rework causing
         hlist corruption and irq descriptor reference leaks caused by a
         missing sanity check.
      
         The straight forward fix triggered another long standing issue to
         surface. The pre rework code hid the issue due to being way slower,
         but now the chance that user space sees an EBUSY error return when
         updating irq affinities is way higher, though quite a bunch of
         userspace tools do not handle it properly despite the fact that EBUSY
         could be returned for at least 10 years.
      
         It turned out that the EBUSY return can be avoided completely by
         utilizing the existing delayed affinity update mechanism for irq
         remapped scenarios as well. That's a bit more error handling in the
         kernel, but avoids fruitless fingerpointing discussions with tool
         developers.
      
       - Decouple PHYSICAL_MASK from AMD SME as its going to be required for
         the upcoming Intel memory encryption support as well.
      
       - Handle legacy device ACPI detection properly for newer platforms
      
       - Fix the wrong argument ordering in the vector allocation tracepoint
      
       - Simplify the IDT setup code for the APIC=n case
      
       - Use the proper string helpers in the MTRR code
      
       - Remove a stale unused VDSO source file
      
       - Convert the microcode update lock to a raw spinlock as its used in
         atomic context.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel_rdt: Enable CMT and MBM on new Skylake stepping
        x86/apic/vector: Print APIC control bits in debugfs
        genirq/affinity: Defer affinity setting if irq chip is busy
        x86/platform/uv: Use apic_ack_irq()
        x86/ioapic: Use apic_ack_irq()
        irq_remapping: Use apic_ack_irq()
        x86/apic: Provide apic_ack_irq()
        genirq/migration: Avoid out of line call if pending is not set
        genirq/generic_pending: Do not lose pending affinity update
        x86/apic/vector: Prevent hlist corruption and leaks
        x86/vector: Fix the args of vector_alloc tracepoint
        x86/idt: Simplify the idt_setup_apic_and_irq_gates()
        x86/platform/uv: Remove extra parentheses
        x86/mm: Decouple dynamic __PHYSICAL_MASK from AMD SME
        x86: Mark native_set_p4d() as __always_inline
        x86/microcode: Make the late update update_lock a raw lock for RT
        x86/mtrr: Convert to use strncpy_from_user() helper
        x86/mtrr: Convert to use match_string() helper
        x86/vdso: Remove unused file
        x86/i8237: Register device based on FADT legacy boot flag
      f4e5b30d
    • L
      Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a2211de0
      Linus Torvalds 提交于
      Pull x86 pti updates from Thomas Gleixner:
       "Three small commits updating the SSB mitigation to take the updated
        AMD mitigation variants into account"
      
      * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/bugs: Switch the selection of mitigation from CPU vendor to CPU features
        x86/bugs: Add AMD's SPEC_CTRL MSR usage
        x86/bugs: Add AMD's variant of SSB_NO
      a2211de0
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2322d6c5
      Linus Torvalds 提交于
      Pull more perf tooling updates from Thomas Gleixner:
       "Perf tool updates and fixes:
      
        perf stat:
      
         - Display user and system time for workload targets (Jiri Olsa)
      
        perf record:
      
         - Enable arbitrary event names thru name= modifier (Alexey Budankov)
      
        PowerPC:
      
         - Add a python script for hypervisor call statistics (Ravi Bangoria)
      
        Intel PT: (Adrian Hunter)
      
         - Fix sync_switch INTEL_PT_SS_NOT_TRACING
      
         - Fix decoding to accept CBR between FUP and corresponding TIP
      
         - Fix MTC timing after overflow
      
         - Fix "Unexpected indirect branch" error
      
        perf test:
      
         - record+probe_libc_inet_pton:
            - To get the symbol table for dynamic shared objects on ubuntu we
              need to pass the -D/--dynamic command line option, unlike with
              the fedora distros (Arnaldo Carvalho de Melo)
      
         - code-reading:
            - Fix perf_env setup for PTI entry trampolines (Adrian Hunter)
      
         - kmod-path:
            - Add tests for vdso32 and vdsox32 (Adrian Hunter)
      
         - Use header file util/debug.h (Thomas Richter)
      
        perf annotate:
      
         - Make the various UI backends (stdio, TUI, gtk) use more
           consistently structs with annotation options as specified by the
           user (Arnaldo Carvalho de Melo)
      
         - Move annotation specific knobs from the symbol_conf global kitchen
           sink to the annotation option structs (Arnaldo Carvalho de Melo)
      
        perf script:
      
         - Add more PMU fields to python scripts event handler dict (Jin Yao)
      
        Core:
      
         - Fix misleading error for some unparsable events mentioning PMUs
           when those are not involved in the problem (Jiri Olsa)
      
         - Consider BSS symbols when processing /proc/kallsyms ('B' and 'b')
           (Arnaldo Carvalho de Melo)
      
         - Be more robust when trying to use per-symbol histograms, checking
           for unlikely but possible cases where the space for the histograms
           wasn't allocated, print a debug message for such cases (Arnaldo
           Carvalho de Melo)
      
         - Fix symbol and object code resolution for vdso32 and vdsox32
           (Adrian Hunter)
      
         - No need to check for null when passing pointers to foo__get() style
           refcount grabbing helpers, just like in the kernel and with free(),
           its safe to pass a NULL pointer to avoid having to check it before
           each and every foo__get() call (Arnaldo Carvalho de Melo)
      
         - Remove some dead code (quote.[ch]) (Arnaldo Carvalho de Melo)
      
         - Remove some needless globals, making them local (Arnaldo Carvalho
           de Melo)
      
         - Reduce usage of symbol_conf.use_callchain, using other means of
           finding out if callchains are in use or available for specific
           events, as we evolved this codebase to allow requesting callchains
           for just a subset of the monitored events. In time it will help
           polish recording and showing mixed sets accross the various tools:
      
              perf record -e cycles/call-graph=fp/,cache-misses/call-graph=dwarf/,instructions'
      
           (Arnaldo Carvalho de Melo)
      
         - Consider PTI entry trampolines in map__rip_2objdump() (Adrian
           Hunter)"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (50 commits)
        perf script python: Add dict fields introduction to Documentation
        perf script python: Add more PMU fields to event handler dict
        perf script python: Move dsoname code to a new function
        perf symbols: Add BSS symbols when reading from /proc/kallsyms
        perf annnotate: Make __symbol__inc_addr_samples handle src->histograms == NULL
        perf intel-pt: Fix "Unexpected indirect branch" error
        perf intel-pt: Fix MTC timing after overflow
        perf intel-pt: Fix decoding to accept CBR between FUP and corresponding TIP
        perf intel-pt: Fix sync_switch INTEL_PT_SS_NOT_TRACING
        perf script powerpc: Python script for hypervisor call statistics
        perf test record+probe_libc_inet_pton: Ask 'nm' for dynamic symbols
        perf map: Consider PTI entry trampolines in rip_2objdump()
        perf test code-reading: Fix perf_env setup for PTI entry trampolines
        perf tools: Fix pmu events parsing rule
        perf stat: Display user and system time
        perf record: Enable arbitrary event names thru name= modifier
        perf tools: Fix symbol and object code resolution for vdso32 and vdsox32
        perf tests kmod-path: Add tests for vdso32 and vdsox32
        perf hists: Check if a hist_entry has callchains before using them
        perf hists: Introduce hist_entry__has_callchain() method
        ...
      2322d6c5
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9f3fbe85
      Linus Torvalds 提交于
      Pull irq fixes from Thomas Gleixner:
       "Two small fixlets:
      
         - Add the missing iomu mapping call in the Freescale/NXP/Qualcomm/
           whoever owns it now/ SCFG MSI irqchip driver. Otherwise IRQs wont
           work at all.
      
         - Fix a SMP=n build warning in the STM32 irq chip driver"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/ls-scfg-msi: Map MSIs in the iommu
        irqchip/stm32: Fix non-SMP build warning
      9f3fbe85
  4. 10 6月, 2018 12 次提交
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a8a4021b
      Linus Torvalds 提交于
      Pull core fixes from Thomas Gleixner:
       "A small set of core updates:
      
         - Make objtool cope with GCC8 oddities some more
      
         - Remove a stale local_irq_save/restore sequence in the signal code
           along with the stale comment in the RCU code. The underlying issue
           which led to this has been solved long time ago, but nobody cared
           to cleanup the hackarounds"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        signal: Remove no longer required irqsave/restore
        rcu: Update documentation of rcu_read_unlock()
        objtool: Fix GCC 8 cold subfunction detection for aliased functions
      a8a4021b
    • A
      signal: Remove no longer required irqsave/restore · 59dc6f3c
      Anna-Maria Gleixner 提交于
      Commit a841796f ("signal: align __lock_task_sighand() irq disabling and
      RCU") introduced a rcu read side critical section with interrupts
      disabled. The changelog suggested that a better long-term fix would be "to
      make rt_mutex_unlock() disable irqs when acquiring the rt_mutex structure's
      ->wait_lock".
      
      This long-term fix has been made in commit b4abf910 ("rtmutex: Make
      wait_lock irq safe") for a different reason.
      
      Therefore revert commit a841796f ("signal: align >
      __lock_task_sighand() irq disabling and RCU") as the interrupt disable
      dance is not longer required.
      
      The change was tested on the base of b4abf910 ("rtmutex: Make wait_lock
      irq safe") with a four hour run of rcutorture scenario TREE03 with lockdep
      enabled as suggested by Paul McKenney.
      Signed-off-by: NAnna-Maria Gleixner <anna-maria@linutronix.de>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Acked-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Acked-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Cc: bigeasy@linutronix.de
      Link: https://lkml.kernel.org/r/20180525090507.22248-3-anna-maria@linutronix.de
      59dc6f3c
    • A
      rcu: Update documentation of rcu_read_unlock() · ec84b27f
      Anna-Maria Gleixner 提交于
      Since commit b4abf910 ("rtmutex: Make wait_lock irq safe") the
      explanation in rcu_read_unlock() documentation about irq unsafe rtmutex
      wait_lock is no longer valid.
      
      Remove it to prevent kernel developers reading the documentation to rely on
      it.
      Suggested-by: NEric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: NAnna-Maria Gleixner <anna-maria@linutronix.de>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Acked-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Cc: bigeasy@linutronix.de
      Link: https://lkml.kernel.org/r/20180525090507.22248-2-anna-maria@linutronix.de
      ec84b27f
    • L
      Merge branch 'proc-cmdline' · 3ca24ce9
      Linus Torvalds 提交于
      Merge proc_cmdline simplifications.
      
      This re-writes the get_mm_cmdline() logic to be rather simpler than it
      used to be, and makes the semantics for "cmdline goes past the end of
      the original area" more natural.
      
      You _can_ use prctl(PR_SET_MM) to just point your command line somewhere
      else entirely, but the traditional model is to just edit things in place
      and that still needs to continue to work.  At least this way the code
      makes some sense.
      
      * proc-cmdline:
        fs/proc: simplify and clarify get_mm_cmdline() function
        fs/proc: re-factor proc_pid_cmdline_read() a bit
      3ca24ce9
    • M
      hpfs: Use EUCLEAN for filesystem errors · f72328d2
      Mikulas Patocka 提交于
      Use the error code EUCLEAN for filesystem errors because other
      filesystems use this code too.
      
      [ And remove unused EMEMERROR  - Linus ]
      Signed-off-by: NMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f72328d2
    • L
      Merge tag 'for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · a16afaf7
      Linus Torvalds 提交于
      Pull power supply and reset updates from Sebastian Reichel:
       - bq27xxx: Add BQ27426 support
       - ab8500: Drop AB8540/9540 support
       - Introduced new usb_type property
       - Properly document the power-supply ABI
       - misc. cleanups and fixes
      
      * tag 'for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        MAINTAINERS: add entry for LEGO MINDSTORMS EV3
        power: supply: ab8500_charger: fix spelling mistake: "faile" -> "failed"
        power: supply: axp288_fuel_gauge: Remove polling from the driver
        power: supply: axp288_fuelguage: Do not bind when the fg function is not used
        power: supply: axp288_charger: Do not bind when the charge function is not used
        power: supply: axp288_charger: Support 3500 and 4000 mA input current limit
        power: supply: s3c-adc-battery: fix driver data initialization
        power: supply: charger-manager: Verify polling interval only when polling requested
        power: supply: sysfs: Use enum to specify property
        power: supply: ab8500: Drop AB8540/9540 support
        power: supply: ab8500_fg: fix spelling mistake: "Disharge" -> "Discharge"
        power: supply: simplify getting .drvdata
        power: supply: bq27xxx: Add support for BQ27426
        gpio-poweroff: Use gpiod_set_value_cansleep
      a16afaf7
    • L
      Merge tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 2a70ea5c
      Linus Torvalds 提交于
      Pull HSI update from Sebastian Reichel:
       "Just one patch for the HSI subsystem this time: use the new vm_fault_t
        return type"
      
      * tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        hsi: clients: Change return type to vm_fault_t
      2a70ea5c
    • L
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 6419945e
      Linus Torvalds 提交于
      Pull clk updates from Stephen Boyd:
       "This time we have a good set of changes to the core framework that do
        some general cleanups, but nothing too major. The majority of the diff
        goes to two SoCs, Actions Semi and Qualcomm. A brand new driver is
        introduced for Actions Semi so it takes up some lines to add all the
        different types, and the Qualcomm diff is there because we add support
        for two SoCs and it's quite a bit of data.
      
        Otherwise the big driver updates are on TI Davinci and Amlogic
        platforms. And then the long tail of driver updates for various fixes
        and stuff follows after that.
      
        Core:
         - debugfs cleanups removing error checking and an unused provider API
         - Removal of a clk init typedef that isn't used
         - Usage of match_string() to simplify parent string name matching
         - OF clk helpers moved to their own file (linux/of_clk.h)
         - Make clk warnings more readable across kernel versions
      
        New Drivers:
         - Qualcomm SDM845 GCC and Video clk controllers
         - Qualcomm MSM8998 GCC
         - Actions Semi S900 SoC support
         - Nuvoton npcm750 microcontroller clks
         - Amlogic axg AO clock controller
      
        Removed Drivers:
         - Deprecated Rockchip clk-gate driver
      
        Updates:
         - debugfs functions stopped checking return values
         - Support for the MSIOF module clocks on Rensas R-Car M3-N
         - Support for the new Rensas RZ/G1C and R-Car E3 SoCs
         - Qualcomm GDSC, RCG, and PLL updates for clk changes in new SoCs
         - Berlin and Amlogic SPDX tagging
         - Usage of of_clk_get_parent_count() in more places
         - Proper implementation of the CDEV1/2 clocks on Tegra20
         - Allwinner H6 PRCM clock support and R40 EMAC support
         - Add critical flag to meson8b's fdiv2 as temporary fixup for ethernet
         - Round closest support for meson's mpll driver
         - Support for meson8b nand clocks and gxbb video decoder clocks
         - Mediatek mali clks
         - STM32MP1 fixes
         - Uniphier LD11/LD20 stream demux system clock"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (134 commits)
        clk: qcom: Export clk_fabia_pll_configure()
        clk: bcm: Update and add Stingray clock entries
        dt-bindings: clk: Update Stingray binding doc
        clk-si544: Properly round requested frequency to nearest match
        clk: ingenic: jz4770: Add 150us delay after enabling VPU clock
        clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock
        clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle
        clk: ingenic: jz4770: Change OTG from custom to standard gated clock
        clk: ingenic: Support specifying "wait for clock stable" delay
        clk: ingenic: Add support for clocks whose gate bit is inverted
        clk: use match_string() helper
        clk: bcm2835: use match_string() helper
        clk: Return void from debug_init op
        clk: remove clk_debugfs_add_file()
        clk: tegra: no need to check return value of debugfs_create functions
        clk: davinci: no need to check return value of debugfs_create functions
        clk: bcm2835: no need to check return value of debugfs_create functions
        clk: no need to check return value of debugfs_create functions
        clk: imx6: add EPIT clock support
        clk: mvebu: use correct bit for 98DX3236 NAND
        ...
      6419945e
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · d60dafdc
      Linus Torvalds 提交于
      Pull MD updates from Shaohua Li:
       "A few fixes of MD for this merge window. Mostly bug fixes:
      
         - raid5 stripe batch fix from Amy
      
         - Read error handling for raid1 FailFast device from Gioh
      
         - raid10 recovery NULL pointer dereference fix from Guoqing
      
         - Support write hint for raid5 stripe cache from Mariusz
      
         - Fixes for device hot add/remove from Neil and Yufen
      
         - Improve flush bio scalability from Xiao"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        MD: fix lock contention for flush bios
        md/raid5: Assigning NULL to sh->batch_head before testing bit R5_Overlap of a stripe
        md/raid1: add error handling of read error from FailFast device
        md: fix NULL dereference of mddev->pers in remove_and_add_spares()
        raid5: copy write hint from origin bio to stripe
        md: fix two problems with setting the "re-add" device state.
        raid10: check bio in r10buf_pool_free to void NULL pointer dereference
        md: fix an error code format and remove unsed bio_sector
      d60dafdc
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 1329c204
      Linus Torvalds 提交于
      Pull sparc updates from David Miller:
      
       - a FPE signal fix that was also merged upstream
      
       - privileged ADI driver from Tom Hromatka
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: fix compat siginfo ABI regression
        selftests: sparc64: char: Selftest for privileged ADI driver
        char: sparc64: Add privileged ADI driver
      1329c204
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · d6c75284
      Linus Torvalds 提交于
      Pull IDE updates from David Miller:
       "Primarily IRQ disabling avoidance changes from Sebastian Andrzej
        Siewior"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: don't enable/disable interrupts in force threaded-IRQ mode
        ide: don't disable interrupts during kmap_atomic()
        ide: Handle irq disabling consistently
        alim15x3: move irq-restore before pci_dev_put()
      d6c75284
    • L
      Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · eafdca4d
      Linus Torvalds 提交于
      Pull staging/IIO updates from Greg KH:
       "Here is the big staging and IIO driver update for 4.18-rc1.
      
        It was delayed as I wanted to make sure the final driver deletions did
        not cause any major merge issues, and all now looks good.
      
        There are a lot of patches here, just over 1000. The diffstat summary
        shows the major changes here:
      
      	1007 files changed, 16828 insertions(+), 227770 deletions(-)
      
        Because of this, we might be close to shrinking the overall kernel
        source code size for two releases in a row.
      
        There was loads of work in this release cycle, primarily:
      
         - tons of ks7010 driver cleanups
      
         - lots of mt7621 driver fixes and cleanups
      
         - most driver cleanups
      
         - wilc1000 fixes and cleanups
      
         - lots and lots of IIO driver cleanups and new additions
      
         - debugfs cleanups for all staging drivers
      
         - lots of other staging driver cleanups and fixes, the shortlog has
           the full details.
      
        but the big user-visable things here are the removal of 3 chunks of
        code:
      
         - ncpfs and ipx were removed on schedule, no one has cared about this
           code since it moved to staging last year, and if it needs to come
           back, it can be reverted.
      
         - lustre file system is removed.
      
           I've ranted at the lustre developers about once a year for the past
           5 years, with no real forward progress at all to clean things up
           and get the code into the "real" part of the kernel.
      
           Given that the lustre developers continue to work on an external
           tree and try to port those changes to the in-kernel tree every once
           in a while, this whole thing really really is not working out at
           all. So I'm deleting it so that the developers can spend the time
           working in their out-of-tree location and get things cleaned up
           properly to get merged into the tree correctly at a later date.
      
        Because of these file removals, you will have merge issues on some of
        these files (2 in the ipx code, 1 in the ncpfs code, and 1 in the
        atomisp driver). Just delete those files, it's a simple merge :)
      
        All of this has been in linux-next for a while with no reported
        problems"
      
      * tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1011 commits)
        staging: ipx: delete it from the tree
        ncpfs: remove uapi .h files
        ncpfs: remove Documentation
        ncpfs: remove compat functionality
        staging: ncpfs: delete it
        staging: lustre: delete the filesystem from the tree.
        staging: vc04_services: no need to save the log debufs dentries
        staging: vc04_services: vchiq_debugfs_log_entry can be a void *
        staging: vc04_services: remove struct vchiq_debugfs_info
        staging: vc04_services: move client dbg directory into static variable
        staging: vc04_services: remove odd vchiq_debugfs_top() wrapper
        staging: vc04_services: no need to check debugfs return values
        staging: mt7621-gpio: reorder includes alphabetically
        staging: mt7621-gpio: change gc_map to don't use pointers
        staging: mt7621-gpio: use GPIOF_DIR_OUT and GPIOF_DIR_IN macros instead of custom values
        staging: mt7621-gpio: change 'to_mediatek_gpio' to make just a one line return
        staging: mt7621-gpio: dt-bindings: update documentation for #interrupt-cells property
        staging: mt7621-gpio: update #interrupt-cells for the gpio node
        staging: mt7621-gpio: dt-bindings: complete documentation for the gpio
        staging: mt7621-dts: add missing properties to gpio node
        ...
      eafdca4d
  5. 09 6月, 2018 21 次提交
    • T
      x86/intel_rdt: Enable CMT and MBM on new Skylake stepping · 1d9f3e20
      Tony Luck 提交于
      New stepping of Skylake has fixes for cache occupancy and memory
      bandwidth monitoring.
      
      Update the code to enable these by default on newer steppings.
      Signed-off-by: NTony Luck <tony.luck@intel.com>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: stable@vger.kernel.org # v4.14
      Cc: Vikas Shivappa <vikas.shivappa@linux.intel.com>
      Link: https://lkml.kernel.org/r/20180608160732.9842-1-tony.luck@intel.com
      1d9f3e20
    • L
      Merge tag 'libnvdimm-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 7d3bf613
      Linus Torvalds 提交于
      Pull libnvdimm updates from Dan Williams:
       "This adds a user for the new 'bytes-remaining' updates to
        memcpy_mcsafe() that you already received through Ingo via the
        x86-dax- for-linus pull.
      
        Not included here, but still targeting this cycle, is support for
        handling memory media errors (poison) consumed via userspace dax
        mappings.
      
        Summary:
      
         - DAX broke a fundamental assumption of truncate of file mapped
           pages. The truncate path assumed that it is safe to disconnect a
           pinned page from a file and let the filesystem reclaim the physical
           block. With DAX the page is equivalent to the filesystem block.
           Introduce dax_layout_busy_page() to enable filesystems to wait for
           pinned DAX pages to be released. Without this wait a filesystem
           could allocate blocks under active device-DMA to a new file.
      
         - DAX arranges for the block layer to be bypassed and uses
           dax_direct_access() + copy_to_iter() to satisfy read(2) calls.
           However, the memcpy_mcsafe() facility is available through the pmem
           block driver. In order to safely handle media errors, via the DAX
           block-layer bypass, introduce copy_to_iter_mcsafe().
      
         - Fix cache management policy relative to the ACPI NFIT Platform
           Capabilities Structure to properly elide cache flushes when they
           are not necessary. The table indicates whether CPU caches are
           power-fail protected. Clarify that a deep flush is always performed
           on REQ_{FUA,PREFLUSH} requests"
      
      * tag 'libnvdimm-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (21 commits)
        dax: Use dax_write_cache* helpers
        libnvdimm, pmem: Do not flush power-fail protected CPU caches
        libnvdimm, pmem: Unconditionally deep flush on *sync
        libnvdimm, pmem: Complete REQ_FLUSH => REQ_PREFLUSH
        acpi, nfit: Remove ecc_unit_size
        dax: dax_insert_mapping_entry always succeeds
        libnvdimm, e820: Register all pmem resources
        libnvdimm: Debug probe times
        linvdimm, pmem: Preserve read-only setting for pmem devices
        x86, nfit_test: Add unit test for memcpy_mcsafe()
        pmem: Switch to copy_to_iter_mcsafe()
        dax: Report bytes remaining in dax_iomap_actor()
        dax: Introduce a ->copy_to_iter dax operation
        uio, lib: Fix CONFIG_ARCH_HAS_UACCESS_MCSAFE compilation
        xfs, dax: introduce xfs_break_dax_layouts()
        xfs: prepare xfs_break_layouts() for another layout type
        xfs: prepare xfs_break_layouts() to be called with XFS_MMAPLOCK_EXCL
        mm, fs, dax: handle layout changes to pinned dax mappings
        mm: fix __gup_device_huge vs unmap
        mm: introduce MEMORY_DEVICE_FS_DAX and CONFIG_DEV_PAGEMAP_OPS
        ...
      7d3bf613
    • D
      930218af
    • D
      Merge branch 'for-4.18/dax' into libnvdimm-for-next · b5684579
      Dan Williams 提交于
      b5684579
    • L
      Merge tag 'for-linus-20180608' of git://git.kernel.dk/linux-block · a3818841
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "A few fixes for this merge window, where some of them should go in
        sooner rather than later, hence a new pull this week. This pull
        request contains:
      
         - Set of NVMe fixes, mostly follow up cleanups/fixes to the queue
           changes, but also teardown/removal and misc changes (Christop/Dan/
           Johannes/Sagi/Steve).
      
         - Two lightnvm fixes for issues that showed up in this window
           (Colin/Wei).
      
         - Failfast/driver flags inheritance for flush requests (Hannes).
      
         - The md device put sanitization and fix (Kent).
      
         - dm bio_set inheritance fix (me).
      
         - nbd discard granularity fix (Josef).
      
         - nbd consistency in command printing (Kevin).
      
         - Loop recursion validation fix (Ted).
      
         - Partition overlap check (Wang)"
      
      [ .. and now my build is warning-free again thanks to the md fix  - Linus ]
      
      * tag 'for-linus-20180608' of git://git.kernel.dk/linux-block: (22 commits)
        nvme: cleanup double shift issue
        nvme-pci: make CMB SQ mod-param read-only
        nvme-pci: unquiesce dead controller queues
        nvme-pci: remove HMB teardown on reset
        nvme-pci: queue creation fixes
        nvme-pci: remove unnecessary completion doorbell check
        nvme-pci: remove unnecessary nested locking
        nvmet: filter newlines from user input
        nvme-rdma: correctly check for target keyed sgl support
        nvme: don't hold nvmf_transports_rwsem for more than transport lookups
        nvmet: return all zeroed buffer when we can't find an active namespace
        md: Unify mddev destruction paths
        dm: use bioset_init_from_src() to copy bio_set
        block: add bioset_init_from_src() helper
        block: always set partition number to '0' in blk_partition_remap()
        block: pass failfast and driver-specific flags to flush requests
        nbd: set discard_alignment to the granularity
        nbd: Consistently use request pointer in debug messages.
        block: add verifier for cmdline partition
        lightnvm: pblk: fix resource leak of invalid_bitmap
        ...
      a3818841
    • L
      Merge tag 'regulator-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 68cc38ff
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "Quite a lot of core work this time around, though not 100% successful.
      
        We gained support for runtime mode changes thanks to David Collins and
        improved support for write only regulators (ones where we can't read
        back the configuration) from Douglas Anderson.
      
        There's been quite a bit of work from Linus Walleij on converting from
        specfying GPIOs by numbers to descriptors. Sadly the testing turned
        out to be less good than we had hoped and so a lot of this had to be
        reverted.
      
        We also have the start of updates to use coupled regulators from
        Maciej Purski, unfortunately there are further problems there so the
        last couple of patches have been reverted.
      
        We also have new drivers for BD71837 and SY8106A devices, SAW
        regulators on Qualcomm SPMI and dropped support for some preproduction
        chips that never made it to market from the AB8500 driver"
      
      * tag 'regulator-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (57 commits)
        regulator: gpio: Revert
        ARM: pxa, regulator: fix building ezx e680
        regulator: Revert coupled regulator support again
        regulator: wm8994: Fix shared GPIOs
        regulator: max77686: Fix shared GPIOs
        regulator: bd71837: BD71837 PMIC regulator driver
        regulator: bd71837: Devicetree bindings for BD71837 regulators
        regulator: gpio: Get enable GPIO using GPIO descriptor
        regulator: fixed: Convert to use GPIO descriptor only
        regulator: s2mps11: Fix boot on Odroid XU3
        dt-bindings: qcom_spmi: Document SAW support
        regulator: qcom_spmi: Add support for SAW
        regulator: tps65090: Pass descriptor instead of GPIO number
        regulator: s5m8767: Pass descriptor instead of GPIO number
        regulator: pfuze100: Delete reference to ena_gpio
        regulator: max8952: Pass descriptor instead of GPIO number
        regulator: lp8788-ldo: Pass descriptor instead of GPIO number
        regulator: lm363x: Pass descriptor instead of GPIO number
        regulator: max8973: Pass descriptor instead of GPIO number
        regulator: mc13xxx-core: Switch to SPDX identifier
        ...
      68cc38ff
    • D
      nvme: cleanup double shift issue · 77016199
      Dan Carpenter 提交于
      The problem here is that set_bit() and test_bit() take a bit number so
      we should be passing 0 but instead we're passing (1 << 0) which leads to
      a double shift.  It doesn't cause a runtime bug in the current code
      because it's done consistently and we only set that one bit.
      
      I decided to just re-use NVME_AER_NOTICE_NS_CHANGED instead of
      introducing a new define for this.
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      77016199
    • K
      nvme-pci: make CMB SQ mod-param read-only · 69f4eb9f
      Keith Busch 提交于
      A controller reset after a run time change of the CMB module parameter
      breaks the driver. An 'on -> off' will have the driver use NULL for the
      host memory queue, and 'off -> on' will use mismatched queue depth between
      the device and the host.
      
      We could fix both, but there isn't really a good reason to change this
      at run time anyway, compared to at module load time, so this patch makes
      parameter read-only after after modprobe.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      69f4eb9f
    • K
      nvme-pci: unquiesce dead controller queues · 1d39e692
      Keith Busch 提交于
      This patch ensures the nvme namsepace request queues are not quiesced
      on a surprise removal. It's possible the queues were previously killed
      in a failed reset, so the queues need to be unquiesced to ensure all
      requests are flushed to completion.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      1d39e692
    • K
      nvme-pci: remove HMB teardown on reset · fe76fcfb
      Keith Busch 提交于
      The controller is required to disable its host memory buffer use on
      controller reset. We don't need to submit an admin command to delete it,
      so this patch skips sending that command so we don't need to worry about
      handling a timeout.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      fe76fcfb
    • K
      nvme-pci: queue creation fixes · ded45505
      Keith Busch 提交于
      We've been ignoring NVMe error status on queue creations. Fortunately they
      are uncommon, but we should handle these anyway. This patch adds checks
      for the a positive error return value that indicates an NVMe status.
      
      If we do see a negative return, the controller isn't usable, so this
      patch returns immediately in since we can't unwind that failure.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NJens Axboe <axboe@kernel.dk>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      ded45505
    • K
      nvme-pci: remove unnecessary completion doorbell check · 397c699f
      Keith Busch 提交于
      The nvme pci driver never unmaps the doorbell registers while the requests
      are active, so we can always safely update the completion queue head.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NJens Axboe <axboe@kernel.dk>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      397c699f
    • K
      nvme-pci: remove unnecessary nested locking · 0bc88192
      Keith Busch 提交于
      The nvme pci driver no longer handles completions under the cq lock,
      so the nested locking is not necessary.
      Signed-off-by: NKeith Busch <keith.busch@intel.com>
      Reviewed-by: NJens Axboe <axboe@kernel.dk>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      0bc88192
    • S
      nvmet: filter newlines from user input · 9ba2a5cb
      Sagi Grimberg 提交于
      We should avoid consuming the newlines in traddr, trsvcid and
      device_path. Add minimal processing to make sure they are gone.
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NSagi Grimberg <sagi@grimberg.me>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      9ba2a5cb
    • S
      nvme-rdma: correctly check for target keyed sgl support · d4c68c7a
      Steve Wise 提交于
      The code was checking bit 20 instead of bit 2.  Also fixed the log entry.
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Signed-off-by: NSteve Wise <swise@opengridcomputing.com>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      d4c68c7a
    • J
      nvme: don't hold nvmf_transports_rwsem for more than transport lookups · 12a0b662
      Johannes Thumshirn 提交于
      Only take nvmf_transports_rwsem when doing a lookup of registered
      transports, so that a blocking ->create_ctrl doesn't prevent other
      actions on /dev/nvme-fabrics.
      Signed-off-by: NJohannes Thumshirn <jthumshirn@suse.de>
      [hch: increased lock hold time a bit to be safe, added a comment
       and updated the changelog]
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reviewed-by: NSagi Grimberg <sagi@grimberg.me>
      Reviewed-by: NHannes Reinecke <hare@suse.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      12a0b662
    • C
      nvmet: return all zeroed buffer when we can't find an active namespace · f39ae471
      Christoph Hellwig 提交于
      Quote from Figure 106 in NVMe 1.3a:
      
        The Identify Namespace data structure is returned to the host for the
        namespace specified in the Namespace Identifier (CDW1.NSID) field if it
        is an active NSID. If the specified namespace is not an active NSID,
        then the controller returns a zero filled data structure.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Reviewed-by: NSagi Grimberg <sagi@rimberg.me>
      Reviewed-by: NMax Gurtovoy <maxg@mellanox.com>
      Reviewed-by: NJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      f39ae471
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 410feb75
      Linus Torvalds 提交于
      Pull arm64 updates from Catalin Marinas:
       "Apart from the core arm64 and perf changes, the Spectre v4 mitigation
        touches the arm KVM code and the ACPI PPTT support touches drivers/
        (acpi and cacheinfo). I should have the maintainers' acks in place.
      
        Summary:
      
         - Spectre v4 mitigation (Speculative Store Bypass Disable) support
           for arm64 using SMC firmware call to set a hardware chicken bit
      
         - ACPI PPTT (Processor Properties Topology Table) parsing support and
           enable the feature for arm64
      
         - Report signal frame size to user via auxv (AT_MINSIGSTKSZ). The
           primary motivation is Scalable Vector Extensions which requires
           more space on the signal frame than the currently defined
           MINSIGSTKSZ
      
         - ARM perf patches: allow building arm-cci as module, demote
           dev_warn() to dev_dbg() in arm-ccn event_init(), miscellaneous
           cleanups
      
         - cmpwait() WFE optimisation to avoid some spurious wakeups
      
         - L1_CACHE_BYTES reverted back to 64 (for performance reasons that
           have to do with some network allocations) while keeping
           ARCH_DMA_MINALIGN to 128. cache_line_size() returns the actual
           hardware Cache Writeback Granule
      
         - Turn LSE atomics on by default in Kconfig
      
         - Kernel fault reporting tidying
      
         - Some #include and miscellaneous cleanups"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (53 commits)
        arm64: Fix syscall restarting around signal suppressed by tracer
        arm64: topology: Avoid checking numa mask for scheduler MC selection
        ACPI / PPTT: fix build when CONFIG_ACPI_PPTT is not enabled
        arm64: cpu_errata: include required headers
        arm64: KVM: Move VCPU_WORKAROUND_2_FLAG macros to the top of the file
        arm64: signal: Report signal frame size to userspace via auxv
        arm64/sve: Thin out initialisation sanity-checks for sve_max_vl
        arm64: KVM: Add ARCH_WORKAROUND_2 discovery through ARCH_FEATURES_FUNC_ID
        arm64: KVM: Handle guest's ARCH_WORKAROUND_2 requests
        arm64: KVM: Add ARCH_WORKAROUND_2 support for guests
        arm64: KVM: Add HYP per-cpu accessors
        arm64: ssbd: Add prctl interface for per-thread mitigation
        arm64: ssbd: Introduce thread flag to control userspace mitigation
        arm64: ssbd: Restore mitigation status on CPU resume
        arm64: ssbd: Skip apply_ssbd if not using dynamic mitigation
        arm64: ssbd: Add global mitigation state accessor
        arm64: Add 'ssbd' command-line option
        arm64: Add ARCH_WORKAROUND_2 probing
        arm64: Add per-cpu infrastructure to call ARCH_WORKAROUND_2
        arm64: Call ARCH_WORKAROUND_2 on transitions between EL0 and EL1
        ...
      410feb75
    • L
      Merge tag 'dmaengine-4.18-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 2996148a
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
      
       - updates to sprd, bam_dma, stm drivers
      
       - remove VLAs in dmatest
      
       - move TI drivers to their own subdir
      
       - switch to SPDX tags for ima/mxs dma drivers
      
       - simplify getting .drvdata on bunch of drivers by Wolfram Sang
      
      * tag 'dmaengine-4.18-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (32 commits)
        dmaengine: sprd: Add Spreadtrum DMA configuration
        dmaengine: sprd: Optimize the sprd_dma_prep_dma_memcpy()
        dmaengine: imx-dma: Switch to SPDX identifier
        dmaengine: mxs-dma: Switch to SPDX identifier
        dmaengine: imx-sdma: Switch to SPDX identifier
        dmaengine: usb-dmac: Document R8A7799{0,5} bindings
        dmaengine: qcom: bam_dma: fix some doc warnings.
        dmaengine: qcom: bam_dma: fix invalid assignment warning
        dmaengine: sprd: fix an NULL vs IS_ERR() bug
        dmaengine: sprd: Use devm_ioremap_resource() to map memory
        dmaengine: sprd: Fix potential NULL dereference in sprd_dma_probe()
        dmaengine: pl330: flush before wait, and add dev burst support.
        dmaengine: axi-dmac: Request IRQ with IRQF_SHARED
        dmaengine: stm32-mdma: fix spelling mistake: "avalaible" -> "available"
        dmaengine: rcar-dmac: Document R-Car D3 bindings
        dmaengine: sprd: Move DMA request mode and interrupt type into head file
        dmaengine: sprd: Define the DMA data width type
        dmaengine: sprd: Define the DMA transfer step type
        dmaengine: ti: New directory for Texas Instruments DMA drivers
        dmaengine: shdmac: Change platform check to CONFIG_ARCH_RENESAS
        ...
      2996148a
    • L
      Merge tag 'iommu-updates-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 18f18376
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
       "Nothing big this time. In particular:
      
         - Debugging code for Tegra-GART
      
         - Improvement in Intel VT-d fault printing to prevent soft-lockups
           when on fault storms
      
         - Improvements in AMD IOMMU event reporting
      
         - NUMA aware allocation in io-pgtable code for ARM
      
         - Various other small fixes and cleanups all over the place"
      
      * tag 'iommu-updates-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/io-pgtable-arm: Make allocations NUMA-aware
        iommu/amd: Prevent possible null pointer dereference and infinite loop
        iommu/amd: Fix grammar of comments
        iommu: Clean up the comments for iommu_group_alloc
        iommu/vt-d: Remove unnecessary parentheses
        iommu/vt-d: Clean up pasid quirk for pre-production devices
        iommu/vt-d: Clean up unused variable in find_or_alloc_domain
        iommu/vt-d: Fix iotlb psi missing for mappings
        iommu/vt-d: Introduce __mapping_notify_one()
        iommu: Remove extra NULL check when call strtobool()
        iommu/amd: Update logging information for new event type
        iommu/amd: Update the PASID information printed to the system log
        iommu/tegra: gart: Fix gart_iommu_unmap()
        iommu/tegra: gart: Add debugging facility
        iommu/io-pgtable-arm: Use for_each_set_bit to simplify code
        iommu/qcom: Simplify getting .drvdata
        iommu: Remove depends on HAS_DMA in case of platform dependency
        iommu/vt-d: Ratelimit each dmar fault printing
      18f18376
    • L
      Merge tag 'mtd/for-4.18' of git://git.infradead.org/linux-mtd · f4e70c2e
      Linus Torvalds 提交于
      Pull MTD updates from Boris Brezillon:
       "Core changes:
         - Add a sysfs attribute to expose available OOB size
      
        Driver changes:
         - Remove HAS_DMA dependency on various drivers
         - Use dev_get_drvdata() instead of platform_get_drvdata() in docg3
         - Replace msleep by usleep_range() in the dataflash driver
         - Avoid VLA usage in nftl layers
         - Remove useless .owner assignment in pismo
         - Fix various issues in the CFI driver
         - Improve TRX partition handling expose a DT compat for this part
           parser
         - Clarify OFFSET_CONTINUOUS meaning
      
        NAND core changes:
         - Add Miquel as a NAND maintainer
         - Add access mode to the nand_page_io_req struct
         - Fix kernel-doc in rawnand.h
         - Support bit-wise majority to recover from corrupted ONFI parameter
           pages
         - Stop checking FAIL bit after a SET_FEATURES, as documented in the
           ONFI spec
      
        Raw NAND Driver changes:
         - Fix and cleanup the error path of many NAND controller drivers
         - GPMI:
            + Cleanup/simplification of a few aspects in the driver
            + Take ECC setup specified in the DT into account
         - sunxi: remove support for GPIO-based R/B polling
         - MTK:
            + Use of_device_get_match_data() instead of of_match_device()
            + Add an entry in MAINTAINERS for this driver
            + Fix nand-ecc-step-size and nand-ecc-strength description in the
              DT bindings doc
         - fsl_ifc: fix ->cmdfunc() to read more than one ONFI parameter page
      
        OneNAND driver changes:
         - samsung: use dev_get_drvdata() instead of platform_get_drvdata()
      
        SPI NOR core changes:
         - Add support for a bunch of SPI NOR chips
         - Clear EAR reg when switching to 3-byte addressing mode on Winbond
           chips
      
        SPI NOR controller driver changes:
         - cadence: Add DMA support for direct mode reads
         - hisi: Prefix a few functions with hisi_
         - intel:
            + Mark the driver as "dangerous" in Kconfig
            + Fix atomic sequence handling
            + Pass a 40us delay (instead of 0us) to readl_poll_timeout()
         - fsl:
            + fix a typo in a function name
            + add support for IP variants embedded in the ls2080a and ls1080a
              SoCs
         - stm32: request exclusive control of the reset line"
      
      * tag 'mtd/for-4.18' of git://git.infradead.org/linux-mtd: (66 commits)
        mtd: nand: Pass mode information to nand_page_io_req
        mtd: cfi_cmdset_0002: Change erase one block to enable XIP once
        mtd: cfi_cmdset_0002: Change erase functions to check chip good only
        mtd: cfi_cmdset_0002: Change erase functions to retry for error
        mtd: cfi_cmdset_0002: Change definition naming to retry write operation
        mtd: cfi_cmdset_0002: Change write buffer to check correct value
        mtd: cmdlinepart: Update comment for introduction of OFFSET_CONTINUOUS
        mtd: bcm47xxpart: add of_match_table with a new DT binding
        dt-bindings: mtd: document Broadcom's BCM47xx partitions
        mtd: spi-nor: Add support for EN25QH32
        mtd: spi-nor: Add support for is25wp series chips
        mtd: spi-nor: Add Winbond w25q32jv support
        mtd: spi-nor: fsl-quadspi: add support for ls2080a/ls1080a
        mtd: spi-nor: stm32-quadspi: explicitly request exclusive reset control
        mtd: spi-nor: intel: provide a range for poll_timout
        mtd: spi-nor: fsl-quadspi: fix api naming typo _init_ahb_read
        mtd: spi-nor: intel-spi: Explicitly mark the driver as dangerous in Kconfig
        mtd: spi-nor: intel-spi: Fix atomic sequence handling
        mtd: rawnand: Do not check FAIL bit when executing a SET_FEATURES op
        mtd: rawnand: use bit-wise majority to recover the ONFI param page
        ...
      f4e70c2e