1. 12 4月, 2018 30 次提交
  2. 11 4月, 2018 8 次提交
    • L
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · f77cfbe6
      Linus Torvalds 提交于
      Pull c6x updates from Mark Salter.
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        c6x: pass endianness info to sparse
        c6x: fix platforms/plldata.c get_coreid build error
        c6x: remove unused KTHREAD_SIZE definition
      f77cfbe6
    • L
      Merge tag 'mips_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 948869fa
      Linus Torvalds 提交于
      Pull MIPS updates from James Hogan:
       "These are the main MIPS changes for 4.17. Rough overview:
      
         (1) generic platform: Add support for Microsemi Ocelot SoCs
      
         (2) crypto: Add CRC32 and CRC32C HW acceleration module
      
         (3) Various cleanups and misc improvements
      
        More detailed summary:
      
        Miscellaneous:
         - hang more efficiently on halt/powerdown/restart
         - pm-cps: Block system suspend when a JTAG probe is present
         - expand make help text for generic defconfigs
         - refactor handling of legacy defconfigs
         - determine the entry point from the ELF file header to fix microMIPS
           for certain toolchains
         - introduce isa-rev.h for MIPS_ISA_REV and use to simplify other code
      
        Minor cleanups:
         - DTS: boston/ci20: Unit name cleanups and correction
         - kdump: Make the default for PHYSICAL_START always 64-bit
         - constify gpio_led in Alchemy, AR7, and TXX9
         - silence a couple of W=1 warnings
         - remove duplicate includes
      
        Platform support:
        Generic platform:
         - add support for Microsemi Ocelot
         - dt-bindings: Add vendor prefix for Microsemi Corporation
         - dt-bindings: Add bindings for Microsemi SoCs
         - add ocelot SoC & PCB123 board DTS files
         - MAINTAINERS: Add entry for Microsemi MIPS SoCs
         - enable crc32-mips on r6 configs
      
        ath79:
         - fix AR724X_PLL_REG_PCIE_CONFIG offset
      
        BCM47xx:
         - firmware: Use mac_pton() for MAC address parsing
         - add Luxul XAP1500/XWR1750 WiFi LEDs
         - use standard reset button for Luxul XWR-1750
      
        BMIPS:
         - enable CONFIG_BRCMSTB_PM in bmips_stb_defconfig for build coverage
         - add STB PM, wake-up timer, watchdog DT nodes
      
        Octeon:
         - drop '.' after newlines in printk calls
      
        ralink:
         - pci-mt7621: Enable PCIe on MT7688"
      
      * tag 'mips_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (37 commits)
        MIPS: BCM47XX: Use standard reset button for Luxul XWR-1750
        MIPS: BCM47XX: Add Luxul XAP1500/XWR1750 WiFi LEDs
        MIPS: Make the default for PHYSICAL_START always 64-bit
        MIPS: Use the entry point from the ELF file header
        MAINTAINERS: Add entry for Microsemi MIPS SoCs
        MIPS: generic: Add support for Microsemi Ocelot
        MIPS: mscc: Add ocelot PCB123 device tree
        MIPS: mscc: Add ocelot dtsi
        dt-bindings: mips: Add bindings for Microsemi SoCs
        dt-bindings: Add vendor prefix for Microsemi Corporation
        MIPS: ath79: Fix AR724X_PLL_REG_PCIE_CONFIG offset
        MIPS: pci-mt7620: Enable PCIe on MT7688
        MIPS: pm-cps: Block system suspend when a JTAG probe is present
        MIPS: VDSO: Replace __mips_isa_rev with MIPS_ISA_REV
        MIPS: BPF: Replace __mips_isa_rev with MIPS_ISA_REV
        MIPS: cpu-features.h: Replace __mips_isa_rev with MIPS_ISA_REV
        MIPS: Introduce isa-rev.h to define MIPS_ISA_REV
        MIPS: Hang more efficiently on halt/powerdown/restart
        FIRMWARE: bcm47xx_nvram: Replace mac address parsing
        MIPS: BMIPS: Add Broadcom STB watchdog nodes
        ...
      948869fa
    • L
      Merge tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 2a56bb59
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "New features:
      
         - Tom Zanussi's extended histogram work.
      
           This adds the synthetic events to have histograms from multiple
           event data Adds triggers "onmatch" and "onmax" to call the
           synthetic events Several updates to the histogram code from this
      
         - Allow way to nest ring buffer calls in the same context
      
         - Allow absolute time stamps in ring buffer
      
         - Rewrite of filter code parsing based on Al Viro's suggestions
      
         - Setting of trace_clock to global if TSC is unstable (on boot)
      
         - Better OOM handling when allocating large ring buffers
      
         - Added initcall tracepoints (consolidated initcall_debug code with
           them)
      
        And other various fixes and clean ups"
      
      * tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (68 commits)
        init: Have initcall_debug still work without CONFIG_TRACEPOINTS
        init, tracing: Have printk come through the trace events for initcall_debug
        init, tracing: instrument security and console initcall trace events
        init, tracing: Add initcall trace events
        tracing: Add rcu dereference annotation for test func that touches filter->prog
        tracing: Add rcu dereference annotation for filter->prog
        tracing: Fixup logic inversion on setting trace_global_clock defaults
        tracing: Hide global trace clock from lockdep
        ring-buffer: Add set/clear_current_oom_origin() during allocations
        ring-buffer: Check if memory is available before allocation
        lockdep: Add print_irqtrace_events() to __warn
        vsprintf: Do not preprocess non-dereferenced pointers for bprintf (%px and %pK)
        tracing: Uninitialized variable in create_tracing_map_fields()
        tracing: Make sure variable string fields are NULL-terminated
        tracing: Add action comparisons when testing matching hist triggers
        tracing: Don't add flag strings when displaying variable references
        tracing: Fix display of hist trigger expressions containing timestamps
        ftrace: Drop a VLA in module_exists()
        tracing: Mention trace_clock=global when warning about unstable clocks
        tracing: Default to using trace_global_clock if sched_clock is unstable
        ...
      2a56bb59
    • L
      Merge tag 'libnvdimm-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 9f3a0941
      Linus Torvalds 提交于
      Pull libnvdimm updates from Dan Williams:
       "This cycle was was not something I ever want to repeat as there were
        several late changes that have only now just settled.
      
        Half of the branch up to commit d2c997c0 ("fs, dax: use
        page->mapping to warn...") have been in -next for several releases.
        The of_pmem driver and the address range scrub rework were late
        arrivals, and the dax work was scaled back at the last moment.
      
        The of_pmem driver missed a previous merge window due to an oversight.
        A sense of obligation to rectify that miss is why it is included for
        4.17. It has acks from PowerPC folks. Stephen reported a build failure
        that only occurs when merging it with your latest tree, for now I have
        fixed that up by disabling modular builds of of_pmem. A test merge
        with your tree has received a build success report from the 0day robot
        over 156 configs.
      
        An initial version of the ARS rework was submitted before the merge
        window. It is self contained to libnvdimm, a net code reduction, and
        passing all unit tests.
      
        The filesystem-dax changes are based on the wait_var_event()
        functionality from tip/sched/core. However, late review feedback
        showed that those changes regressed truncate performance to a large
        degree. The branch was rewound to drop the truncate behavior change
        and now only includes preparation patches and cleanups (with full acks
        and reviews). The finalization of this dax-dma-vs-trnucate work will
        need to wait for 4.18.
      
        Summary:
      
         - A rework of the filesytem-dax implementation provides for detection
           of unmap operations (truncate / hole punch) colliding with
           in-progress device-DMA. A fix for these collisions remains a
           work-in-progress pending resolution of truncate latency and
           starvation regressions.
      
         - The of_pmem driver expands the users of libnvdimm outside of x86
           and ACPI to describe an implementation of persistent memory on
           PowerPC with Open Firmware / Device tree.
      
         - Address Range Scrub (ARS) handling is completely rewritten to
           account for the fact that ARS may run for 100s of seconds and there
           is no platform defined way to cancel it. ARS will now no longer
           block namespace initialization.
      
         - The NVDIMM Namespace Label implementation is updated to handle
           label areas as small as 1K, down from 128K.
      
         - Miscellaneous cleanups and updates to unit test infrastructure"
      
      * tag 'libnvdimm-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (39 commits)
        libnvdimm, of_pmem: workaround OF_NUMA=n build error
        nfit, address-range-scrub: add module option to skip initial ars
        nfit, address-range-scrub: rework and simplify ARS state machine
        nfit, address-range-scrub: determine one platform max_ars value
        powerpc/powernv: Create platform devs for nvdimm buses
        doc/devicetree: Persistent memory region bindings
        libnvdimm: Add device-tree based driver
        libnvdimm: Add of_node to region and bus descriptors
        libnvdimm, region: quiet region probe
        libnvdimm, namespace: use a safe lookup for dimm device name
        libnvdimm, dimm: fix dpa reservation vs uninitialized label area
        libnvdimm, testing: update the default smart ctrl_temperature
        libnvdimm, testing: Add emulation for smart injection commands
        nfit, address-range-scrub: introduce nfit_spa->ars_state
        libnvdimm: add an api to cast a 'struct nd_region' to its 'struct device'
        nfit, address-range-scrub: fix scrub in-progress reporting
        dax, dm: allow device-mapper to operate without dax support
        dax: introduce CONFIG_DAX_DRIVER
        fs, dax: use page->mapping to warn if truncate collides with a busy page
        ext2, dax: introduce ext2_dax_aops
        ...
      9f3a0941
    • L
      Merge tag 'rtc-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · fbe173e3
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "This contains a few series that have been in preparation for a while
        and that will help systems with RTCs that will fail in 2038, 2069 or
        2100.
      
        Subsystem:
         - Add tracepoints
         - Rework of the RTC/nvmem API to allow drivers to discard struct
           nvmem_config after registration
         - New range API, drivers can now expose the useful range of the RTC
         - New offset API the core is now able to add an offset to the RTC
           time, modifying the supported range.
         - Multiple rtc_time64_to_tm fixes
         - Handle time_t overflow on 32 bit platforms in the core instead of
           letting drivers do crazy things.
         - remove rtc_control API
      
        New driver:
         - Intersil ISL12026
      
        Drivers:
         - Drivers exposing the RTC non volatile memory have been converted to
           use nvmem
         - Removed useless time and date validation
         - Removed an indirection pattern that was a cargo cult from ancient
           drivers
         - Removed VLA usage
         - Fixed a possible race condition in probe functions
         - AB8540 support is dropped from ab8500
         - pcf85363 now has alarm support"
      
      * tag 'rtc-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (128 commits)
        rtc: snvs: Fix usage of snvs_rtc_enable
        rtc: mt7622: fix module autoloading for OF platform drivers
        rtc: isl12022: use true and false for boolean values
        rtc: ab8500: Drop AB8540 support
        rtc: remove a warning during scripts/kernel-doc step
        rtc: 88pm860x: remove artificial limitation
        rtc: 88pm80x: remove artificial limitation
        rtc: st-lpc: remove artificial limitation
        rtc: mrst: remove artificial limitation
        rtc: mv: remove artificial limitation
        rtc: hctosys: Ensure system time doesn't overflow time_t
        parisc: time: stop validating rtc_time in .read_time
        rtc: pcf85063: fix clearing bits in pcf85063_start_clock
        rtc: at91sam9: Set name of regmap_config
        rtc: s5m: Remove VLA usage
        rtc: s5m: Move enum from rtc.h to rtc-s5m.c
        rtc: remove VLA usage
        rtc: Add useful timestamp definitions
        rtc: Add one offset seconds to expand RTC range
        rtc: Factor out the RTC range validation into rtc_valid_range()
        ...
      fbe173e3
    • L
      Merge tag 'fbdev-v4.17' of git://github.com/bzolnier/linux · 5e630afd
      Linus Torvalds 提交于
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
       "There is nothing really major here, just a couple of small bugfixes,
        improvements and cleanups:
      
         - make it possible to load radeonfb driver when offb driver is loaded
           first (Mathieu Malaterre)
      
         - fix memory leak in offb driver (Mathieu Malaterre)
      
         - fix unaligned access in udlfb driver (Ladislav Michl)
      
         - convert atmel_lcdfb driver to use GPIO descriptors (Ludovic
           Desroches)
      
         - avoid mismatched prototypes in sisfb driver (Arnd Bergmann)
      
         - remove VLA usage from viafb driver (Gustavo A. R. Silva)
      
         - add missing help text to FB_I810_I2 config option (Ulf Magnusson)
      
         - misc fixes (Gustavo A. R. Silva, Colin Ian King, Markus Elfring)
      
         - remove dead code from s3c-fb driver for Exynos and S5PV210
           platforms
      
         - misc cleanups (Corentin Labbe, Ladislav Michl, Ulf Magnusson,
           Vladimir Zapolskiy, Markus Elfring)"
      
      * tag 'fbdev-v4.17' of git://github.com/bzolnier/linux: (32 commits)
        video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms
        video: au1100fb: Delete an unnecessary variable initialisation in au1100fb_drv_probe()
        video: au1100fb: Improve a size determination in au1100fb_drv_probe()
        video: au1100fb: Delete an error message for a failed memory allocation in au1100fb_drv_probe()
        video/console/sticore: Delete an error message for a failed memory allocation in sti_try_rom_generic()
        video: ARM CLCD: Improve a size determination in clcdfb_probe()
        video: ARM CLCD: Delete an error message for a failed memory allocation in clcdfb_probe()
        video: matroxfb: Delete an error message for a failed memory allocation in matroxfb_crtc2_probe()
        video: s3c-fb: Improve a size determination in s3c_fb_probe()
        video: s3c-fb: Delete an error message for a failed memory allocation in s3c_fb_probe()
        video: fsl-diu-fb: Delete an error message for a failed memory allocation in fsl_diu_init()
        video: ssd1307fb: Improve a size determination in ssd1307fb_probe()
        video: smscufx: Delete an error message for a failed memory allocation in ufx_realloc_framebuffer()
        video: smscufx: Return an error code only as a constant in ufx_realloc_framebuffer()
        video: smscufx: Less checks in ufx_usb_probe() after error detection
        video: udlfb: Return an error code only as a constant in dlfb_realloc_framebuffer()
        video/fbdev/stifb: Delete an error message for a failed memory allocation in stifb_init_fb()
        video/fbdev/stifb: Return -ENOMEM after a failed kzalloc() in stifb_init_fb()
        video: fbdev: aty128fb: use true and false for boolean values
        fbdev: aty: fix missing indentation in if statement
        ...
      5e630afd
    • L
      Merge tag 'sound-fix-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 7aa1cf25
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "The main purpose of this pull request is a fix for a regression in the
        recent PCM OSS emulation code that may lead to RCU stall. Since
        syzkaller hits this too often, I send the pull request now with a
        minimal collection. Possibly another pull request may follow before
        RC1.
      
        The other fixes here are for USB-audio class 2 and 3 to improve the
        parser for the clock descriptors. These are rather cleanups but good
        for security, too.
      
        Last but not least, another included fix is the trivial one to remove
        superfluous WARN_ON() that annoyed syzbot"
      
      * tag 'sound-fix-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: pcm: Remove WARN_ON() at snd_pcm_hw_params() error
        ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
        ALSA: usb-audio: Add sanity checks in UAC3 clock parsers
        ALSA: usb-audio: More strict sanity checks for clock parsers
        ALSA: usb-audio: Refactor clock finder helpers
      7aa1cf25
    • L
      Merge tag 'media/v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · d3626005
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "A series of media updates/fixes for 4.17.
      
        There are two important core fix patches in this series:
      
         - A regression fix on Kernel 4.16 with causes it to not work with
           some input devices that depend on media core
      
         - A fix at compat32 bits with causes it to OOPS on overlay, and
           affects the Kernels where the CVE-2017-13166 was backported
      
        The remaining ones are other random fixes at the documentation and on
        drivers.
      
        The biggest part of this series is a set of 18 patches for the Intel
        atomisp driver. Currently, it produces hundreds of warnings/errors on
        sparse/smatch, causing me to sometimes ignore new warnings on other
        drivers that are not so broken. This driver is on really poor state,
        even for staging standards: it has several layers of abstraction on
        it, and it supports two different hardware. Selecting between them
        require to add a define (there isn't even a Kconfig option for such
        purpose). Just on this smatch cleanup, I could easily get rid of 8
        "do-nothing" files. So, I'm seriously considering its removal from
        upstream, if I don't see any real work on addressing the problems
        there along this year"
      
      * tag 'media/v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (48 commits)
        media: v4l2-core: fix size of devnode_nums[] bitarray
        media: v4l2-compat-ioctl32: don't oops on overlay
        media: i2c: adv748x: afe: fix sparse warning
        media: extended-controls.rst: transmitter -> receiver
        media: staging: atomisp: stop duplicating input format types
        media: staging: atomisp: get rid of an unused var
        media: staging: atomisp: stop mixing enum types
        media: staging: atomisp: get rid of some static warnings
        media: staging: atomisp: use %p to print pointers
        media: staging: atomisp: remove an useless check
        media: staging: atomisp: avoid a warning if 32 bits build
        media: staging: atomisp: don't access a NULL var
        media: staging: atomisp: Get rid of *default.host.[ch]
        media: staging: atomisp: get rid of an unused function
        media: staging: atomisp: remove unused set_pd_base()
        media: staging: atomisp: fix endianess issues
        media: staging: atomisp: add a missing include
        media: staging: atomisp: get rid of stupid statements
        media: staging: atomisp: declare static vars as such
        media: staging: atomisp: ia_css_output.host: don't use var before check
        ...
      d3626005
  3. 10 4月, 2018 2 次提交
    • L
      c6x: pass endianness info to sparse · 85fa2cc5
      Luc Van Oostenryck 提交于
      c6x depends on the macro '_BIG_ENDIAN' being defined or not
      to correctly select or define endian-specific macros, structures
      or pieces of code.
      
      This macro is predefined by the compiler but sparse knows nothing
      about it and thus may pre-process files differently from what
      gcc would.
      
      Fix this by passing '-D_BIG_ENDIAN' when compiling a big-endian
      kernel, like GCC would have done.
      
      To: Mark Salter <msalter@redhat.com>
      To: Aurelien Jacquiot <a-jacquiot@ti.com>
      CC: linux-c6x-dev@linux-c6x.org
      Signed-off-by: NLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
      Signed-off-by: NMark Salter <msalter@redhat.com>
      85fa2cc5
    • R
      c6x: fix platforms/plldata.c get_coreid build error · 319938bd
      Randy Dunlap 提交于
      Fix build error reported by the 0day bot by including the header
      file for that macro.
      
      Fixes this build error: (should fix; not tested)
      arch/c6x/platforms/plldata.c: In function 'c6472_setup_clocks':
      arch/c6x/platforms/plldata.c:279:33: error: implicit declaration of function 'get_coreid'; did you mean 'get_order'? [-Werror=implicit-function-declaration]
            c6x_core_clk.parent = &sysclks[get_coreid() + 1];
      Reported-by: NFengguang Wu <fengguang.wu@intel.com>
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
      Cc: linux-c6x-dev@linux-c6x.org
      Cc: Ingo Molnar <mingo@kernel.org>
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NMark Salter <msalter@redhat.com>
      319938bd