1. 05 6月, 2017 26 次提交
  2. 04 6月, 2017 2 次提交
  3. 03 6月, 2017 12 次提交
    • L
      Merge tag 'hwmon-for-linus-v4.12-rc4' of... · ea094f3c
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
       "A couple of patches for the aspeed pwm fan driver"
      
      * tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1
        hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed
        hwmon: (aspeed-pwm-tacho) On read failure return -ETIMEDOUT
        hwmon: (aspeed-pwm-tacho) Select REGMAP
      ea094f3c
    • L
      Merge tag 'for-linus-20170602' of git://git.infradead.org/linux-mtd · cc548740
      Linus Torvalds 提交于
      Pull MTD fixes from Brian Norris:
       "NAND updates from Boris:
      
        tango fixes:
         - Add missing MODULE_DEVICE_TABLE() in tango_nand.c
         - Update the number of corrected bitflips
      
        core fixes:
         - Fix a long standing memory leak in nand_scan_tail()
         - Fix several bugs introduced by the per-vendor init/detection
           infrastructure (introduced in 4.12)
         - Add a static specifier to nand_ooblayout_lp_hamming_ops definition"
      
      * tag 'for-linus-20170602' of git://git.infradead.org/linux-mtd:
        mtd: nand: make nand_ooblayout_lp_hamming_ops static
        mtd: nand: tango: Update ecc_stats.corrected
        mtd: nand: tango: Export OF device ID table as module aliases
        mtd: nand: samsung: warn about un-parseable ECC info
        mtd: nand: free vendor-specific resources in init failure paths
        mtd: nand: drop unneeded module.h include
        mtd: nand: don't leak buffers when ->scan_bbt() fails
      cc548740
    • S
      hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1 · 5f348fa3
      Stefan Schaeckeler 提交于
      Make fan and pwm names in sysfs start with index 1 in accordance to
      Documentation/hwmon/sysfs-interface conventions.
      
      Current implementation starts with index 0, making tools such as
      sensors(1) skip the first fan.
      Signed-off-by: NStefan Schaeckeler <sschaeck@cisco.com>
      Fixes: 2d7a548a ("drivers: hwmon: Support for ASPEED PWM/Fan tach")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      5f348fa3
    • S
      hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed · 4d58e732
      Stefan Schaeckeler 提交于
      Call of_node_put() on a node claimed with of_node_get() or by any other
      means such as for_each_child_of_node().
      Signed-off-by: NStefan Schaeckeler <sschaeck@cisco.com>
      Fixes: 2d7a548a ("drivers: hwmon: Support for ASPEED PWM/Fan tach")
      Signed-off-by: NGuenter Roeck <linux@roeck-us.net>
      4d58e732
    • H
      Input: axp20x-pek - switch to acpi_dev_present and check for ACPI0011 too · 0fd5f221
      Hans de Goede 提交于
      acpi_dev_found checks that there is a matching ACPI node, but it
      may be disabled (_STA method returns 0) in which case the
      soc_button_array driver will not bind to it and axp20x-pek should
      handle the power-button.
      
      This commit switches from acpi_dev_found to acpi_dev_present to
      avoid not registering an input-dev for the powerbutton when there
      is a disabled PNP0C40 device.
      
      The ACPI-6.0 standard defines a standard gpio button device using
      the ACPI0011 HID replacing the custom PNP0C40 gpio device, many
      newer devices define both PNP0C40 and ACPI0011 devices enabling one
      or the other depending on whether the BIOS thinks it is going to boot
      Android or Windows.
      
      This commit adds a check for the ACPI0011 device, so that if
      either device is present *and* enabled we don't register an input-dev
      for the powerbutton.
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      0fd5f221
    • H
      Input: axp20x-pek - only check for "INTCFD9" ACPI device on Cherry Trail · 8d4b3137
      Hans de Goede 提交于
      Commit 9b13a4ca ("Input: axp20x-pek - do not register input device
      on some systems") added a check for the INTCFD9 ACPI device which also
      handles the powerbutton as on some systems the powerbutton is connected
      to both the PMIC, handled by axp20x-pek, and to a gpio on the SoC, handled
      by soc_button_array which attaches itself to the INTCFD9 ACPI device.
      
      Testing + comparing DSDTs has shown that this only happens on Cherry
      Trail devices with an AXP288 PMIC, the AXP288 PMIC is also used on
      Bay Trail devices but there the power button is only connected to
      the PMIC and not handled by soc_button_array.
      
      This means that the INTCFD9 check has caused a regression on Bay Trail
      devices, causing power-button presses to no longer be seen.
      
      This commit fixes this by limiting the check to devices where the ACPI
      node for the AXP288 contains a _HRV (hardware revision) attribute with
      a value of 3 which indicates we are dealing with a Cherry Trail platform.
      
      Fixes: 9b13a4ca ("Input: axp20x-pek - do not register input ...")
      Reported-by: NСергей Трусов <t.rus76@ya.ru>
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      8d4b3137
    • D
      Merge tag 'v4.12-rc3' into for-linus · eadcbfa5
      Dmitry Torokhov 提交于
      Merge with mainline to get acpi_dev_present() needed by patches to
      axp20x-pek driver.
      eadcbfa5
    • L
      Merge tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 104c08ba
      Linus Torvalds 提交于
      Pull ACPI fixes from Rafael Wysocki:
       "These revert one more problematic commit related to the ACPI-based
        handling of laptop lids and make some unuseful error messages coming
        from ACPICA go away.
      
        Specifics:
      
         - Revert one more commit related to the ACPI-based handling of laptop
           lids that changed the default behavior on laptops that booted with
           closed lids and introduced a regression there (Benjamin Tissoires).
      
         - Add a missing acpi_put_table() to the code implementing the
           /sys/firmware/acpi/tables interface to prevent a counter in the
           ACPICA core from overflowing (Dan Williams).
      
         - Drop error messages printed by ACPICA on acpi_get_table() reference
           counting mismatches as they need not indicate real errors at this
           point (Lv Zheng)"
      
      * tag 'acpi-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPICA: Tables: Fix regression introduced by a too early mechanism enabling
        Revert "ACPI / button: Change default behavior to lid_init_state=open"
        ACPI / sysfs: fix acpi_get_table() leak / acpi-sysfs denial of service
      104c08ba
    • L
      Merge tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 89af529a
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix two bugs in error code paths in the cpufreq core and in the
        kirkwood-cpufreq driver.
      
        Specifics:
      
         - Make cpufreq_register_driver() return an error if the ->init()
           calls fail for all CPUs to prevent non-functional drivers from
           hanging around for no reason (David Arcari).
      
         - Make kirkwood-cpufreq check the return value of
           clk_prepare_enable() (which may fail) as appropriate (Arvind
           Yadav)"
      
      * tag 'pm-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: kirkwood-cpufreq:- Handle return value of clk_prepare_enable()
        cpufreq: cpufreq_register_driver() should return -ENODEV if init fails
      89af529a
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 5a4829b5
      Linus Torvalds 提交于
      Pull /dev/random bug fix from Ted Ts'o:
       "Fix a race on architectures with prioritized interrupts (such as m68k)
        which can causes crashes in drivers/char/random.c:get_reg()"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        fix race in drivers/char/random.c:get_reg()
      5a4829b5
    • L
      Merge branch 'akpm' (patches from Andrew) · f2197649
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "15 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        scripts/gdb: make lx-dmesg command work (reliably)
        mm: consider memblock reservations for deferred memory initialization sizing
        mm/hugetlb: report -EHWPOISON not -EFAULT when FOLL_HWPOISON is specified
        mlock: fix mlock count can not decrease in race condition
        mm/migrate: fix refcount handling when !hugepage_migration_supported()
        dax: fix race between colliding PMD & PTE entries
        mm: avoid spurious 'bad pmd' warning messages
        mm/page_alloc.c: make sure OOM victim can try allocations with no watermarks once
        pcmcia: remove left-over %Z format
        slub/memcg: cure the brainless abuse of sysfs attributes
        initramfs: fix disabling of initramfs (and its compression)
        mm: clarify why we want kmalloc before falling backto vmallock
        frv: declare jiffies to be located in the .data section
        include/linux/gfp.h: fix ___GFP_NOLOCKDEP value
        ksm: prevent crash after write_protect_page fails
      f2197649
    • A
      scripts/gdb: make lx-dmesg command work (reliably) · d6c97087
      André Draszik 提交于
      lx-dmesg needs access to the log_buf symbol from printk.c.
      Unfortunately, the symbol log_buf also exists in BPF's verifier.c and
      hence gdb can pick one or the other.  If it happens to pick BPF's
      log_buf, lx-dmesg doesn't work:
      
        (gdb) lx-dmesg
        Python Exception <class 'gdb.MemoryError'> Cannot access memory at address 0x0:
        Error occurred in Python command: Cannot access memory at address 0x0
        (gdb) p log_buf
        $15 = 0x0
      
      Luckily, GDB has a way to deal with this, see
        https://sourceware.org/gdb/onlinedocs/gdb/Symbols.html
      
        (gdb) info variables ^log_buf$
        All variables matching regular expression "^log_buf$":
      
        File <linux.git>/kernel/bpf/verifier.c:
        static char *log_buf;
      
        File <linux.git>/kernel/printk/printk.c:
        static char *log_buf;
        (gdb) p 'verifier.c'::log_buf
        $1 = 0x0
        (gdb) p 'printk.c'::log_buf
        $2 = 0x811a6aa0 <__log_buf> ""
        (gdb) p &log_buf
        $3 = (char **) 0x8120fe40 <log_buf>
        (gdb) p &'verifier.c'::log_buf
        $4 = (char **) 0x8120fe40 <log_buf>
        (gdb) p &'printk.c'::log_buf
        $5 = (char **) 0x8048b7d0 <log_buf>
      
      By being explicit about the location of the symbol, we can make lx-dmesg
      work again.  While at it, do the same for the other symbols we need from
      printk.c
      
      Link: http://lkml.kernel.org/r/20170526112222.3414-1-git@andred.netSigned-off-by: NAndré Draszik <git@andred.net>
      Tested-by: NKieran Bingham <kieran@bingham.xyz>
      Acked-by: NJan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d6c97087