1. 04 6月, 2014 18 次提交
    • R
      Merge branches 'acpi-tools' and 'pm-tools' · 2e30baad
      Rafael J. Wysocki 提交于
      * acpi-tools:
        ACPI / tools: Introduce ec_access.c - tool to access the EC
      
      * pm-tools:
        cpupower: Remove mc and smt power aware scheduler info/settings
        cpupower: cpupower info -b should return 0 on success, not the perf bias value
        cpupower: If root, try to load msr driver on x86 if /dev/cpu/0/msr is not available
        cpupower: Install recently added cpupower-idle-{set, info} manpages
        cpupower: Introduce idle state disable-by-latency and enable-all
        cpupower: Remove all manpages on make uninstall
        cpupower: Remove dead link to homepage, and update the targets built.
        cpupower: Rename cpufrequtils -> cpupower, and libcpufreq -> libcpupower.
        PM / tools: cpupower: add option to display values without round offs
        tools / power: turbostat: Drop temperature checks
      2e30baad
    • R
      Merge branch 'pm-cpufreq' · 057beb1d
      Rafael J. Wysocki 提交于
      * pm-cpufreq: (28 commits)
        cpufreq: handle calls to ->target_index() in separate routine
        cpufreq: s5pv210: drop check for CONFIG_PM_VERBOSE
        cpufreq: intel_pstate: Remove unused member name of cpudata
        cpufreq: Break out early when frequency equals target_freq
        cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
        cpufreq: imx6q: Remove unused include
        cpufreq: imx6q: Drop devm_clk/regulator_get usage
        cpufreq: powernow-k8: Suppress checkpatch warnings
        cpufreq: powernv: make local function static
        cpufreq: Enable big.LITTLE cpufreq driver on arm64
        cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro
        intel_pstate: Add CPU IDs for Broadwell processors
        cpufreq: Fix build error on some platforms that use cpufreq_for_each_*
        PM / OPP: Move cpufreq specific OPP functions out of generic OPP library
        PM / OPP: Remove cpufreq wrapper dependency on internal data organization
        cpufreq: Catch double invocations of cpufreq_freq_transition_begin/end
        intel_pstate: Remove sample parameter in intel_pstate_calc_busy
        cpufreq: Kconfig: Fix spelling errors
        cpufreq: Make linux-pm@vger.kernel.org official mailing list
        cpufreq: exynos: Use dev_err/info function instead of pr_err/info
        ...
      057beb1d
    • R
      Merge branch 'pm-devfreq' · 42a09284
      Rafael J. Wysocki 提交于
      * pm-devfreq:
        PM / devfreq: remove checks for CONFIG_EXYNOS_ASV
        PM / devfreq: exynos5: Use devm_devfreq_* function using device resource management
        PM / devfreq: exynos4: Use devm_devfreq_* function using device resource management
        PM / devfreq: Add devm_devfreq_{register,unregister}_opp_notfier function
        PM / devfreq: Add resource-managed function for devfreq device
        PM / devfreq: Fix devfreq_remove_device() to improve the sequence of resource free
        PM / devfreq: exynos: make more PPMU code common
        PM / devfreq: exynos5: introduce struct busfreq_ppmu_data
        PM / devfreq: exynos4: introduce struct busfreq_ppmu_data
        PM / devfreq: exynos4: use common PPMU code
        PM / devfreq: exynos5: Add CONFIG_PM_OPP dependency to fix probe fail
        PM / devfreq: exynos5: Use SIMPLE_DEV_PM_OPS macro
        PM / devfreq: exynos4: Add CONFIG_PM_OPP dependency to fix probe fail
        PM / devfreq: exynos4: Use SIMPLE_DEV_PM_OPS macro
        PM / devfreq: exynos4: Fix bug of resource leak and code clean on probe()
      42a09284
    • R
      Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp' · cd0c5bd3
      Rafael J. Wysocki 提交于
      * pnp:
        MAINTAINERS: Remove Bjorn Helgaas as PNP maintainer
        PNP / resources: remove positive test on unsigned values
      
      * powercap:
        powercap / RAPL: add new CPU IDs
        powercap / RAPL: further relax energy counter checks
      
      * pm-runtime:
        PM / runtime: Update documentation to reflect the current code flow
      
      * pm-opp:
        PM / OPP: discard duplicate OPPs
        PM / OPP: Make OPP invisible to users in Kconfig
        PM / OPP: fix incorrect OPP count handling in of_init_opp_table
      cd0c5bd3
    • R
      Merge branch 'acpi-thermal' · e81a0e77
      Rafael J. Wysocki 提交于
      * acpi-thermal:
        ACPI / thermal: Use acpi_bus_attach_private_data() to attach private data
      e81a0e77
    • R
      Merge branch 'acpi-video' · d9bd4493
      Rafael J. Wysocki 提交于
      * acpi-video:
        ACPI / video: Add 4 new models to the use_native_backlight DMI list
        ACPI / video: Add use native backlight quirk for the ThinkPad W530
        ACPI / video: Unregister the backlight device if a raw one shows up later
        backlight: Add backlight device (un)registration notification
        nouveau: Don't check acpi_video_backlight_support() before registering backlight
        acer-wmi: Add Aspire 5741 to video_vendor_dmi_table
        acer-wmi: Switch to acpi_video_unregister_backlight
        ACPI / video: Add an acpi_video_unregister_backlight function
        ACPI / video: Don't register acpi_video_resume notifier without backlight devices
        ACPI / video: change acpi-video brightness_switch_enabled default to 0
      d9bd4493
    • R
      Merge branch 'acpica' · 0e36d43c
      Rafael J. Wysocki 提交于
      * acpica: (63 commits)
        ACPICA: Namespace: Remove _PRP method support.
        ACPI: Fix x86 regression related to early mapping size limitation
        ACPICA: Tables: Add mechanism to control early table checksum verification.
        ACPICA: acpidump: Fix repetitive table dump in -n mode.
        ACPI: Clean up acpi_os_map/unmap_memory() to eliminate __iomem.
        ACPICA: Clean up redudant definitions already defined elsewhere
        ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of <asm/acpi.h>
        ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h>
        ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages.
        ACPICA: Update version to 20140424.
        ACPICA: Comment/format update, no functional change.
        ACPICA: Events: Update GPE handling and initialization code.
        ACPICA: Remove extraneous error message for large number of GPEs.
        ACPICA: Tables: Remove old mechanism to validate if XSDT contains NULL entries.
        ACPICA: Tables: Add new mechanism to skip NULL entries in RSDT and XSDT.
        ACPICA: acpidump: Add support to force using RSDT.
        ACPICA: Back port of improvements on exception code.
        ACPICA: Back port of _PRP update.
        ACPICA: acpidump: Fix truncated RSDP signature validation.
        ACPICA: Linux header: Add support for stubbed externals.
        ...
      0e36d43c
    • R
      Merge branch 'acpi-enumeration' · b04c58b1
      Rafael J. Wysocki 提交于
      * acpi-enumeration:
        ACPI / scan: use platform bus type by default for _HID enumeration
        ACPI / scan: always register ACPI LPSS scan handler
        ACPI / scan: always register memory hotplug scan handler
        ACPI / scan: always register container scan handler
        ACPI / scan: Change the meaning of missing .attach() in scan handlers
        ACPI / scan: introduce platform_id device PNP type flag
        ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list
        ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
        ACPI / PNP: use device ID list for PNPACPI device enumeration
        ACPI / scan: .match() callback for ACPI scan handlers
      b04c58b1
    • R
      Merge branch 'acpi-lpss' · 864e055f
      Rafael J. Wysocki 提交于
      * acpi-lpss:
        ACPI / LPSS: support for fractional divider clock
        ACPI / LPSS: custom power domain for LPSS
      864e055f
    • R
      Merge branch 'pm-clk' · 6ad29246
      Rafael J. Wysocki 提交于
      * pm-clk:
        clk: new basic clk type for fractional divider
      6ad29246
    • R
      Merge branch 'acpi-platform' · 2770b8b1
      Rafael J. Wysocki 提交于
      * acpi-platform:
        ACPI / platform / LPSS: Enable async suspend/resume of LPSS devices
        ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips
      2770b8b1
    • R
      Merge branch 'acpi-pm' · a392f7d4
      Rafael J. Wysocki 提交于
      * acpi-pm:
        ACPI / PM: Export rest of the subsys PM callbacks
        ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
        ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state
        ACPI / PM: Export acpi_target_system_state() to modules
      a392f7d4
    • R
      Merge branch 'acpi-battery' · f58c41cc
      Rafael J. Wysocki 提交于
      * acpi-battery:
        ACPI / battery: wakeup the system only when necessary
        power_supply: allow power supply devices registered w/o wakeup source
        ACPI / battery: introduce support for POWER_SUPPLY_PROP_CAPACITY_LEVEL
        ACPI / battery: Accelerate battery resume callback
      f58c41cc
    • R
      Merge branch 'pm-sleep' · ee7f9d7c
      Rafael J. Wysocki 提交于
      * pm-sleep:
        PM / hibernate: fixed typo in comment
        PM / sleep: unregister wakeup source when disabling device wakeup
        PM / sleep: Introduce command line argument for sleep state enumeration
        PM / sleep: Use valid_state() for platform-dependent sleep states only
        PM / sleep: Add state field to pm_states[] entries
        PM / sleep: Update device PM documentation to cover direct_complete
        PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily
        PM / hibernate: Fix memory corruption in resumedelay_setup()
        PM / hibernate: convert simple_strtoul to kstrtoul
        PM / hibernate: Documentation: Fix script for unswapping
        PM / hibernate: no kernel_power_off when pm_power_off NULL
        PM / hibernate: use unsigned local variables in swsusp_show_speed()
      ee7f9d7c
    • R
      Merge branch 'pm-cpuidle' · 97b80e68
      Rafael J. Wysocki 提交于
      * pm-cpuidle:
        PM / suspend: Always use deepest C-state in the "freeze" sleep state
        cpuidle / menu: move repeated correction factor check to init
        cpuidle / menu: Return (-1) if there are no suitable states
        cpuidle: Combine cpuidle_enabled() with cpuidle_select()
        ARM: clps711x: Add cpuidle driver
      97b80e68
    • R
      Merge branches 'acpi-tables' and 'acpi-general' · 91ab377b
      Rafael J. Wysocki 提交于
      * acpi-tables:
        ACPI: Fix conflict between customized DSDT and DSDT local copy
      
      * acpi-general:
        ACPI: Add acpi_bus_attach_private_data() to attach data to ACPI handle
      91ab377b
    • R
      Merge branches 'acpi-processor' and 'acpi-pad' · 26f8784e
      Rafael J. Wysocki 提交于
      * acpi-processor:
        ACPI / processor: Fix STARTING/DYING action in acpi_cpu_soft_notify()
        ACPI / processor: Check if LAPIC is present during initialization
        ACPI / ia64: introduce variable acpi_lapic into ia64
      
      * acpi-pad:
        ACPI / PAD: Use time_before() for time comparison
        ACPI / PAD: call schedule() when need_resched() is true
      26f8784e
    • R
      Merge branches 'acpi-scan', 'acpi-hotplug' and 'acpi-pci' · 4db367fd
      Rafael J. Wysocki 提交于
      * acpi-scan:
        ACPI / scan: do not scan fixed hardware on HW-reduced platform
      
      * acpi-hotplug:
        ACPI: add dynamic_debug support
        ACPI / notify: Clean up handling of hotplug events
      
      * acpi-pci:
        ACPI / PCI: Stub out pci_acpi_crs_quirks() and make it x86 specific
      4db367fd
  2. 03 6月, 2014 2 次提交
  3. 02 6月, 2014 9 次提交
  4. 01 6月, 2014 6 次提交
    • N
      PM / hibernate: fixed typo in comment · 057b0a75
      Niv Yehezkel 提交于
      Fix a trivial comment typo (s/mam/map) in kernel/power/swap.c.
      Signed-off-by: NNiv Yehezkel <executerx@gmail.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      057b0a75
    • L
      ACPI: Fix x86 regression related to early mapping size limitation · 4fc0a7e8
      Lv Zheng 提交于
      The following warning message is triggered:
       WARNING: CPU: 0 PID: 0 at mm/early_ioremap.c:136 __early_ioremap+0x11f/0x1f2()
       Modules linked in:
       CPU: 0 PID: 0 Comm: swapper Not tainted 3.15.0-rc1-00017-g86dfc6f3-dirty #298
       Hardware name: Intel Corporation S2600CP/S2600CP, BIOS SE5C600.86B.99.99.x036.091920111209 09/19/2011
        0000000000000009 ffffffff81b75c40 ffffffff817c627b 0000000000000000
        ffffffff81b75c78 ffffffff81067b5d 000000000000007b 8000000000000563
        00000000b96b20dc 0000000000000001 ffffffffff300e0c ffffffff81b75c88
       Call Trace:
        [<ffffffff817c627b>] dump_stack+0x45/0x56
        [<ffffffff81067b5d>] warn_slowpath_common+0x7d/0xa0
        [<ffffffff81067c3a>] warn_slowpath_null+0x1a/0x20
        [<ffffffff81d4b9d5>] __early_ioremap+0x11f/0x1f2
        [<ffffffff81d4bc5b>] early_ioremap+0x13/0x15
        [<ffffffff81d2b8f3>] __acpi_map_table+0x13/0x18
        [<ffffffff817b8d1a>] acpi_os_map_memory+0x26/0x14e
        [<ffffffff813ff018>] acpi_tb_acquire_table+0x42/0x70
        [<ffffffff813ff086>] acpi_tb_validate_table+0x27/0x37
        [<ffffffff813ff0e5>] acpi_tb_verify_table+0x22/0xd8
        [<ffffffff813ff6a8>] acpi_tb_install_non_fixed_table+0x60/0x1c9
        [<ffffffff81d61024>] acpi_tb_parse_root_table+0x218/0x26a
        [<ffffffff81d1b120>] ? early_idt_handlers+0x120/0x120
        [<ffffffff81d610cd>] acpi_initialize_tables+0x57/0x59
        [<ffffffff81d5f25d>] acpi_table_init+0x1b/0x99
        [<ffffffff81d2bca0>] acpi_boot_table_init+0x1e/0x85
        [<ffffffff81d23043>] setup_arch+0x99d/0xcc6
        [<ffffffff81d1b120>] ? early_idt_handlers+0x120/0x120
        [<ffffffff81d1bbbe>] start_kernel+0x8b/0x415
        [<ffffffff81d1b120>] ? early_idt_handlers+0x120/0x120
        [<ffffffff81d1b5ee>] x86_64_start_reservations+0x2a/0x2c
        [<ffffffff81d1b72e>] x86_64_start_kernel+0x13e/0x14d
       ---[ end trace 11ae599a1898f4e7 ]---
      when installing the following table during early stage:
       ACPI: SSDT 0x00000000B9638018 07A0C4 (v02 INTEL  S2600CP  00004000 INTL 20100331)
      The regression is caused by the size limitation of the x86 early IO mapping.
      
      The root cause is:
       1. ACPICA doesn't split IO memory mapping and table mapping;
       2. Linux x86 OSL implements acpi_os_map_memory() using a size limited fix-map
          mechanism during early boot stage, which is more suitable for only IO
          mappings.
      
      This patch fixes this issue by utilizing acpi_gbl_verify_table_checksum to
      disable the table mapping during early stage and enabling it again for the
      late stage. In this way, the normal code path is not affected. Then after
      the code related to the root cause is cleaned up, the early checksum
      verification can be easily re-enabled.
      
      A new boot parameter - acpi_force_table_verification is introduced for
      the platforms that require the checksum verification to stop loading bad
      tables.
      
      This fix also covers the checksum verification for the table overrides. Now
      large tables can also be overridden using the initrd override mechanism.
      Signed-off-by: NLv Zheng <lv.zheng@intel.com>
      Reported-and-tested-by: NYuanhan Liu <yuanhan.liu@linux.intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      4fc0a7e8
    • L
      ACPICA: Tables: Add mechanism to control early table checksum verification. · 47d68c7f
      Lv Zheng 提交于
      It is reported that Linux x86 kernel cannot map large tables. The following
      large SSDT table on such platform fails to pass checksum verification and
      cannot be installed:
       ACPI: SSDT 0x00000000B9638018 07A0C4 (v02 INTEL  S2600CP  00004000 INTL 20100331)
      
      It sounds strange that in the 64-bit virtual memory address space, we
      cannot map a single ACPI table to do checksum verification. The root cause
      is:
       1. ACPICA doesn't split IO memory mapping and table mapping;
       2. Linux x86 OSL implements acpi_os_map_memory() using a size limited fix-map
          mechanism during early boot stage, which is more suitable for only IO
          mappings.
      
      ACPICA originally only mapped table header for signature validation, and
      this header mapping is required by OSL override mechanism. There was no
      checksum verification because we could not map the whole table using this
      OSL. While the following ACPICA commit enforces checksum verification by
      mapping the whole table during Linux boot stage and it finally triggers
      this issue on some platforms:
       Commit: 86dfc6f3
       Subject: ACPICA: Tables: Fix table checksums verification before installation.
      
      Before doing further cleanups for the OSL table mapping and override
      implementation, this patch introduces an option for such OSPMs to
      temporarily discard the checksum verification feature. It then can be
      re-enabled easily when the ACPICA and the underlying OSL is ready.
      
      This patch also deletes a comment around the limitation of mappings because
      it is not correct. The limitation is not how many times we can map in the
      early stage, but the OSL mapping facility may not be suitable for mapping
      the ACPI tables and thus may complain us the size limitation.
      
      The acpi_tb_verify_table() is renamed to acpi_tb_verify_temp_table() due to the
      work around added, it now only applies to the table descriptor that hasn't
      been installed and cannot be used in other cases. Lv Zheng.
      Tested-by: NYuanhan Liu <yuanhan.liu@linux.intel.com>
      Signed-off-by: NLv Zheng <lv.zheng@intel.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      47d68c7f
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4bf79eb
      Linus Torvalds 提交于
      Pull core futex/rtmutex fixes from Thomas Gleixner:
       "Three fixlets for long standing issues in the futex/rtmutex code
        unearthed by Dave Jones syscall fuzzer:
      
         - Add missing early deadlock detection checks in the futex code
         - Prevent user space from attaching a futex to kernel threads
         - Make the deadlock detector of rtmutex work again
      
        Looks large, but is more comments than code change"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rtmutex: Fix deadlock detector for real
        futex: Prevent attaching to kernel threads
        futex: Add another early deadlock detection check
      a4bf79eb
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 80e06794
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Mostly quiet now:
      
        i915:
          fixing userspace visiblie issues, all stable marked
      
        radeon:
          one more pll fix, two crashers, one suspend/resume regression"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: Resume fbcon last
        drm/radeon: only allocate necessary size for vm bo list
        drm/radeon: don't allow RADEON_GEM_DOMAIN_CPU for command submission
        drm/radeon: avoid crash if VM command submission isn't available
        drm/radeon: lower the ref * post PLL maximum once more
        drm/i915: Prevent negative relocation deltas from wrapping
        drm/i915: Only copy back the modified fields to userspace from execbuffer
        drm/i915: Fix dynamic allocation of physical handles
      80e06794
    • L
      dcache: add missing lockdep annotation · 9f12600f
      Linus Torvalds 提交于
      lock_parent() very much on purpose does nested locking of dentries, and
      is careful to maintain the right order (lock parent first).  But because
      it didn't annotate the nested locking order, lockdep thought it might be
      a deadlock on d_lock, and complained.
      
      Add the proper annotation for the inner locking of the child dentry to
      make lockdep happy.
      
      Introduced by commit 046b961b ("shrink_dentry_list(): take parent's
      ->d_lock earlier").
      Reported-and-tested-by: NJosh Boyer <jwboyer@fedoraproject.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9f12600f
  5. 31 5月, 2014 5 次提交