1. 22 10月, 2011 6 次提交
    • S
      PM / Documentation: Update docs about suspend and CPU hotplug · 7fef9fc8
      Srivatsa S. Bhat 提交于
      Update the documentation about the interaction between the suspend (S3) call
      path and the CPU hotplug infrastructure.
      This patch focusses only on the activities of the freezer, cpu hotplug and
      the notifications involved. It outlines how regular CPU hotplug differs from
      the way it is invoked during suspend and also tries to explain the locking
      involved. In addition to that, it discusses the issue of microcode update
      during CPU hotplug operations.
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      7fef9fc8
    • D
      ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist. · d11c78e9
      Dave Jones 提交于
      As noted by a user in https://bugzilla.redhat.com/show_bug.cgi?id=641789
      The Sony VGN-FW21E also needs the nonvs by default workaround added.
      Signed-off-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      d11c78e9
    • R
      Merge branch 'pm-domains' into pm-for-linus · d033e078
      Rafael J. Wysocki 提交于
      * pm-domains:
        ARM: mach-shmobile: sh7372 A4R support (v4)
        ARM: mach-shmobile: sh7372 A3SP support (v4)
        PM / Sleep: Mark devices involved in wakeup signaling during suspend
      d033e078
    • M
      ARM: mach-shmobile: sh7372 A4R support (v4) · 382414b9
      Magnus Damm 提交于
      This change adds support for the sh7372 A4R power domain.
      
      The sh7372 A4R hardware power domain contains the
      SH CPU Core and a set of I/O devices including
      multimedia accelerators and I2C controllers.
      
      One special case about A4R is the INTCS interrupt
      controller that needs to be saved and restored to
      keep working as expected. Also the LCDC hardware
      blocks are in a different hardware power domain
      but have their IRQs routed only through INTCS. So
      as long as LCDCs are active we cannot power down
      INTCS because that would risk losing interrupts.
      Signed-off-by: NMagnus Damm <damm@opensource.se>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      382414b9
    • M
      ARM: mach-shmobile: sh7372 A3SP support (v4) · d93f5cde
      Magnus Damm 提交于
      This change adds support for the sh7372 A3SP power domain.
      
      The sh7372 A3SP hardware power domain contains a
      wide range of I/O devices. The list of I/O devices
      include SCIF serial ports, DMA Engine hardware,
      SD and MMC controller hardware, USB controllers
      and I2C master controllers.
      
      This patch adds the A3SP low level code which
      powers the hardware power domain on and off. It
      also ties in platform devices to the pm domain
      support code.
      
      It is worth noting that the serial console is
      hooked up to SCIFA0 on most sh7372 boards, and
      the SCIFA0 port is included in the A3SP hardware
      power domain. For this reason we cannot output
      debug messages from the low level power control
      code in the case of A3SP.
      
      QoS support is needed in drivers before we can
      enable the A3SP power control on the fly.
      Signed-off-by: NMagnus Damm <damm@opensource.se>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      d93f5cde
    • R
      PM / Sleep: Mark devices involved in wakeup signaling during suspend · 4ca46ff3
      Rafael J. Wysocki 提交于
      The generic PM domains code in drivers/base/power/domain.c has
      to avoid powering off domains that provide power to wakeup devices
      during system suspend.  Currently, however, this only works for
      wakeup devices directly belonging to the given domain and not for
      their children (or the children of their children and so on).
      Thus, if there's a wakeup device whose parent belongs to a power
      domain handled by the generic PM domains code, the domain will be
      powered off during system suspend preventing the device from
      signaling wakeup.
      
      To address this problem introduce a device flag, power.wakeup_path,
      that will be set during system suspend for all wakeup devices,
      their parents, the parents of their parents and so on.  This way,
      all wakeup paths in the device hierarchy will be marked and the
      generic PM domains code will only need to avoid powering off
      domains containing devices whose power.wakeup_path is set.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      4ca46ff3
  2. 17 10月, 2011 19 次提交
  3. 11 10月, 2011 1 次提交
  4. 08 10月, 2011 4 次提交
    • R
      Merge branch 'pm-devfreq' into pm-for-linus · 7811ac27
      Rafael J. Wysocki 提交于
      * pm-devfreq:
        PM / devfreq: Add basic governors
        PM / devfreq: Add common sysfs interfaces
        PM: Introduce devfreq: generic DVFS framework with device-specific OPPs
        PM / OPP: Add OPP availability change notifier.
      7811ac27
    • R
      Merge branch 'pm-qos' into pm-for-linus · 9696cc90
      Rafael J. Wysocki 提交于
      * pm-qos:
        PM / QoS: Update Documentation for the pm_qos and dev_pm_qos frameworks
        PM / QoS: Add function dev_pm_qos_read_value() (v3)
        PM QoS: Add global notification mechanism for device constraints
        PM QoS: Implement per-device PM QoS constraints
        PM QoS: Generalize and export constraints management code
        PM QoS: Reorganize data structs
        PM QoS: Code reorganization
        PM QoS: Minor clean-ups
        PM QoS: Move and rename the implementation files
      9696cc90
    • R
      Merge branch 'pm-domains' into pm-for-linus · c28b56b1
      Rafael J. Wysocki 提交于
      * pm-domains:
        PM / Domains: Split device PM domain data into base and need_restore
        ARM: mach-shmobile: sh7372 sleep warning fixes
        ARM: mach-shmobile: sh7372 A3SM support
        ARM: mach-shmobile: sh7372 generic suspend/resume support
        PM / Domains: Preliminary support for devices with power.irq_safe set
        PM: Move clock-related definitions and headers to separate file
        PM / Domains: Use power.sybsys_data to reduce overhead
        PM: Reference counting of power.subsys_data
        PM: Introduce struct pm_subsys_data
        ARM / shmobile: Make A3RV be a subdomain of A4LC on SH7372
        PM / Domains: Rename argument of pm_genpd_add_subdomain()
        PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER
        PM / Domains: Allow generic PM domains to have multiple masters
        PM / Domains: Add "wait for parent" status for generic PM domains
        PM / Domains: Make pm_genpd_poweron() always survive parent removal
        PM / Domains: Do not take parent locks to modify subdomain counters
        PM / Domains: Implement subdomain counters as atomic fields
      c28b56b1
    • R
      Merge branch 'pm-runtime' into pm-for-linus · d727b606
      Rafael J. Wysocki 提交于
      * pm-runtime:
        PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
        PM / Runtime: Replace dev_dbg() with trace_rpm_*()
        PM / Runtime: Introduce trace points for tracing rpm_* functions
        PM / Runtime: Don't run callbacks under lock for power.irq_safe set
        USB: Add wakeup info to debugging messages
        PM / Runtime: pm_runtime_idle() can be called in atomic context
        PM / Runtime: Add macro to test for runtime PM events
        PM / Runtime: Add might_sleep() to runtime PM functions
      d727b606
  5. 07 10月, 2011 4 次提交
    • L
      Merge git://github.com/davem330/net · 3ee72ca9
      Linus Torvalds 提交于
      * git://github.com/davem330/net:
        net: fix typos in Documentation/networking/scaling.txt
        bridge: leave carrier on for empty bridge
        netfilter: Use proper rwlock init function
        tcp: properly update lost_cnt_hint during shifting
        tcp: properly handle md5sig_pool references
        macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
      3ee72ca9
    • P
      x86/PCI: use host bridge _CRS info on ASUS M2V-MX SE · 29cf7a30
      Paul Menzel 提交于
      In summary, this DMI quirk uses the _CRS info by default for the ASUS
      M2V-MX SE by turning on `pci=use_crs` and is similar to the quirk
      added by commit 2491762c ("x86/PCI: use host bridge _CRS info on
      ASRock ALiveSATA2-GLAN") whose commit message should be read for further
      information.
      
      Since commit 3e3da00c ("x86/pci: AMD one chain system to use pci
      read out res") Linux gives the following oops:
      
          parport0: PC-style at 0x378, irq 7 [PCSPP,TRISTATE]
          HDA Intel 0000:20:01.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
          HDA Intel 0000:20:01.0: setting latency timer to 64
          BUG: unable to handle kernel paging request at ffffc90011c08000
          IP: [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
          PGD 13781a067 PUD 13781b067 PMD 1300ba067 PTE 800000fd00000173
          Oops: 0009 [#1] SMP
          last sysfs file: /sys/module/snd_pcm/initstate
          CPU 0
          Modules linked in: snd_hda_intel(+) snd_hda_codec snd_hwdep snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_midi snd_rawmidi snd_seq_midi_event tpm_tis tpm snd_seq tpm_bios psmouse parport_pc snd_timer snd_seq_device parport processor evdev snd i2c_viapro thermal_sys amd64_edac_mod k8temp i2c_core soundcore shpchp pcspkr serio_raw asus_atk0110 pci_hotplug edac_core button snd_page_alloc edac_mce_amd ext3 jbd mbcache sha256_generic cryptd aes_x86_64 aes_generic cbc dm_crypt dm_mod raid1 md_mod usbhid hid sg sd_mod crc_t10dif sr_mod cdrom ata_generic uhci_hcd sata_via pata_via libata ehci_hcd usbcore scsi_mod via_rhine mii nls_base [last unloaded: scsi_wait_scan]
          Pid: 1153, comm: work_for_cpu Not tainted 2.6.37-1-amd64 #1 M2V-MX SE/System Product Name
          RIP: 0010:[<ffffffffa0578402>]  [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
          RSP: 0018:ffff88013153fe50  EFLAGS: 00010286
          RAX: ffffc90011c08000 RBX: ffff88013029ec00 RCX: 0000000000000006
          RDX: 0000000000000000 RSI: 0000000000000246 RDI: 0000000000000246
          RBP: ffff88013341d000 R08: 0000000000000000 R09: 0000000000000040
          R10: 0000000000000286 R11: 0000000000003731 R12: ffff88013029c400
          R13: 0000000000000000 R14: 0000000000000000 R15: ffff88013341d090
          FS:  0000000000000000(0000) GS:ffff8800bfc00000(0000) knlGS:00000000f7610ab0
          CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
          CR2: ffffc90011c08000 CR3: 0000000132f57000 CR4: 00000000000006f0
          DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
          DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
          Process work_for_cpu (pid: 1153, threadinfo ffff88013153e000, task ffff8801303c86c0)
          Stack:
           0000000000000005 ffffffff8123ad65 00000000000136c0 ffff88013029c400
           ffff8801303c8998 ffff88013341d000 ffff88013341d090 ffff8801322d9dc8
           ffff88013341d208 0000000000000000 0000000000000000 ffffffff811ad232
          Call Trace:
           [<ffffffff8123ad65>] ? __pm_runtime_set_status+0x162/0x186
           [<ffffffff811ad232>] ? local_pci_probe+0x49/0x92
           [<ffffffff8105afc5>] ? do_work_for_cpu+0x0/0x1b
           [<ffffffff8105afc5>] ? do_work_for_cpu+0x0/0x1b
           [<ffffffff8105afd0>] ? do_work_for_cpu+0xb/0x1b
           [<ffffffff8105fd3f>] ? kthread+0x7a/0x82
           [<ffffffff8100a824>] ? kernel_thread_helper+0x4/0x10
           [<ffffffff8105fcc5>] ? kthread+0x0/0x82
           [<ffffffff8100a820>] ? kernel_thread_helper+0x0/0x10
          Code: f4 01 00 00 ef 31 f6 48 89 df e8 29 dd ff ff 85 c0 0f 88 2b 03 00 00 48 89 ef e8 b4 39 c3 e0 8b 7b 40 e8 fc 9d b1 e0 48 8b 43 38 <66> 8b 10 66 89 14 24 8b 43 14 83 e8 03 83 f8 01 77 32 31 d2 be
          RIP  [<ffffffffa0578402>] azx_probe+0x3ad/0x86b [snd_hda_intel]
           RSP <ffff88013153fe50>
          CR2: ffffc90011c08000
          ---[ end trace 8d1f3ebc136437fd ]---
      
      Trusting the ACPI _CRS information (`pci=use_crs`) fixes this problem.
      
          $ dmesg | grep -i crs # with the quirk
          PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug
      
      The match has to be against the DMI board entries though since the vendor entries are not populated.
      
          DMI: System manufacturer System Product Name/M2V-MX SE, BIOS 0304    10/30/2007
      
      This quirk should be removed when `pci=use_crs` is enabled for machines
      from 2006 or earlier or some other solution is implemented.
      
      Using coreboot [1] with this board the problem does not exist but this
      quirk also does not affect it either. To be safe though the check is
      tightened to only take effect when the BIOS from American Megatrends is
      used.
      
              15:13 < ruik> but coreboot does not need that
              15:13 < ruik> because i have there only one root bus
              15:13 < ruik> the audio is behind a bridge
      
              $ sudo dmidecode
              BIOS Information
                      Vendor: American Megatrends Inc.
                      Version: 0304
                      Release Date: 10/30/2007
      
      [1] http://www.coreboot.org/
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=30552
      
      Cc: stable@kernel.org (2.6.34)
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: x86@kernel.org
      Signed-off-by: NPaul Menzel <paulepanter@users.sourceforge.net>
      Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
      Acked-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      29cf7a30
    • B
      net: fix typos in Documentation/networking/scaling.txt · 186c6bbc
      Benjamin Poirier 提交于
      The second hunk fixes rps_sock_flow_table but has to re-wrap the paragraph.
      Signed-off-by: NBenjamin Poirier <benjamin.poirier@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      186c6bbc
    • S
      bridge: leave carrier on for empty bridge · b64b73d7
      stephen hemminger 提交于
      This resolves a regression seen by some users of bridging.
      Some users use the bridge like a dummy device.
      They expect to be able to put an IPv6 address on the device
      with no ports attached. Although there are better ways of doing
      this, there is no reason to not allow it.
      
      Note: the bridge still will reflect the state of ports in the
      bridge if there are any added.
      Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b64b73d7
  6. 06 10月, 2011 5 次提交
  7. 05 10月, 2011 1 次提交