1. 15 Apr, 2009 4 commits
    • Sachin Sant's avatar
      powerpc: pseries/dtl.c should include asm/firmware.h · b71a0c29
      Sachin Sant authored
      A randconfig build on powerpc failed with:
      
      dtl.c: In function 'dtl_init':
      dtl.c:238: error: implicit declaration of function 'firmware_has_feature'
      dtl.c:238: error: 'FW_FEATURE_SPLPAR' undeclared (first use in this function)
      
      - We need firmware.h for these definitions.
      Signed-off-by: default avatarSachin Sant <sachinp@in.ibm.com>
      Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      b71a0c29
    • Paul Mackerras's avatar
      powerpc: Fix data-corrupting bug in __futex_atomic_op · 306a8288
      Paul Mackerras authored
      Richard Henderson pointed out that the powerpc __futex_atomic_op has a
      bug: it will write the wrong value if the stwcx. fails and it has to
      retry the lwarx/stwcx. loop, since 'oparg' will have been overwritten
      by the result from the first time around the loop.  This happens
      because it uses the same register for 'oparg' (an input) as it uses
      for the result.
      
      This fixes it by using separate registers for 'oparg' and 'ret'.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      306a8288
    • Mike Mason's avatar
      powerpc/pseries: Set error_state to pci_channel_io_normal in eeh_report_reset() · c58dc575
      Mike Mason authored
      While adding native EEH support to Emulex and Qlogic drivers, it was
      discovered that dev->error_state was set to pci_io_channel_normal too
      late in the recovery process. These drivers rely on error_state to
      determine if they can access the device in their slot_reset callback,
      thus error_state needs to be set to pci_io_channel_normal in
      eeh_report_reset(). Below is a detailed explanation (courtesy of Richard
      Lary) as to why this is necessary.
      
      Background:
      PCI MMIO or DMA accesses to a frozen slot generate additional EEH
      errors. If the number of additional EEH errors exceeds EEH_MAX_FAILS the
      adapter will be shutdown. To avoid triggering excessive EEH errors and
      an undesirable adapter shutdown, some drivers use the
      pci_channel_offline(dev) wrapper function to return a Boolean value
      based on the value of pci_dev->error_state to determine if PCI MMIO or
      DMA accesses are safe. If the wrapper returns TRUE, drivers must not
      make PCI MMIO or DMA access to their hardware.
      
      The pci_dev structure member error_state reflects one of three values,
      1) pci_channel_io_normal, 2) pci_channel_io_frozen, 3)
      pci_channel_io_perm_failure.  Function pci_channel_offline(dev) returns
      TRUE if error_state is pci_channel_io_frozen or pci_channel_io_perm_failure.
      
      The EEH driver sets pci_dev->error_state to pci_channel_io_frozen at the
      point where the PCI slot is frozen. Currently, the EEH driver restores
      dev->error_state to pci_channel_io_normal in eeh_report_resume() before
      calling the driver's resume callback. However, when the EEH driver calls
      the driver's slot_reset callback() from eeh_report_reset(), it
      incorrectly indicates the error state is still pci_channel_io_frozen.
      
      Waiting until eeh_report_resume() to restore dev->error_state to
      pci_channel_io_normal is too late for Emulex and QLogic FC drivers and
      any other drivers which are designed to use common code paths in these
      two cases: i) those called after the driver's slot_reset callback() and
      ii) those called after the PCI slot is frozen but before the driver's
      slot_reset callback is called. Case i) all driver paths executed to
      reinitialize the hardware after a reset and case ii) all code paths
      executed by driver kernel threads that run asynchronous to the main
      driver thread, such as interrupt handlers and worker threads to process
      driver work queues.
      
      Emulex and QLogic FC drivers are designed with common code paths which
      require that pci_channel_offline(dev) reflect the true state of the
      hardware. The state transitions that the hardware takes from Normal
      Operations to Slot Frozen to Reset to Normal Operations are documented
      in the Power Architecture Platform Requirements+ (PAPR+) in Table 75.
      PE State Control.
      
      PAPR defines the following 3 states:
      
      0 -- Not reset, Not EEH stopped, MMIO load/store allowed, DMA allowed
           (Normal Operations)
      1 -- Reset, Not EEH stopped, MMIO load/store disabled, DMA disabled
      2 -- Not reset, EEH stopped, MMIO load/store disabled, DMA disabled
           (Slot Frozen)
      
      An EEH error places the slot in state 2 (Frozen) and the adapter driver
      is notified that an EEH error was detected. If the adapter driver
      returns PCI_ERS_RESULT_NEED_RESET, the EEH driver calls
      eeh_reset_device() to place the slot into state 1 (Reset) and
      eeh_reset_device completes by placing the slot into State 0 (Normal
      Operations). Upon return from eeh_reset_device(), the EEH driver calls
      eeh_report_reset, which then calls the adapter's slot_reset callback. At
      the time the adapter's slot_reset callback is called, the true state of
      the hardware is Normal Operations and should be accurately reflected by
      setting dev->error_state to pci_channel_io_normal.
      
      The current implementation of EEH driver does not do so and requires
      this change to correct this deficiency.
      Signed-off-by: default avatarMike Mason <mmlnx@us.ibm.com>
      Acked-by: default avatarLinas Vepstas <linasvepstas@gmail.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      c58dc575
    • Hugh Dickins's avatar
      powerpc: Allow 256kB pages with SHMEM · adf213c4
      Hugh Dickins authored
      Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed,
      let powerpc 256kB pages coexist with CONFIG_SHMEM again.
      Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      adf213c4
  2. 08 Apr, 2009 2 commits
  3. 07 Apr, 2009 23 commits
  4. 06 Apr, 2009 5 commits
  5. 05 Apr, 2009 6 commits
    • Linus Torvalds's avatar
      Merge branch 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · 0221c81b
      Linus Torvalds authored
      * 'audit.b62' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
        Audit: remove spaces from audit_log_d_path
        audit: audit_set_auditable defined but not used
        audit: incorrect ref counting in audit tree tag_chunk
        audit: Fix possible return value truncation in audit_get_context()
        audit: ignore terminating NUL in AUDIT_USER_TTY messages
        Audit: fix handling of 'strings' with NULL characters
        make the e->rule.xxx shorter in kernel auditfilter.c
        auditsc: fix kernel-doc notation
        audit: EXECVE record - removed bogus newline
      0221c81b
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.o-hand.com/linux-mfd · 48f286a2
      Linus Torvalds authored
      * 'for-next' of git://git.o-hand.com/linux-mfd:
        mfd: fix da903x warning
        mfd: fix MAINTAINERS entry
        mfd: Use the value of the final spin when reading the AUXADC
        mfd: Storage class should be before const qualifier
        mfd: PASIC3: supply clock_rate to DS1WM via driver_data
        mfd: remove DS1WM clock handling
        mfd: remove unused PASIC3 bus_shift field
        pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data
        mfd: convert PASIC3 to use MFD core
        mfd: convert DS1WM to use MFD core
        mfd: Support active high IRQs on WM835x
        mfd: Use bulk read to fill WM8350 register cache
        mfd: remove duplicated #include from pcf50633
      48f286a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://repo.or.cz/cris-mirror · ea431793
      Linus Torvalds authored
      * 'for-linus' of git://repo.or.cz/cris-mirror:
        CRISv32: Remove extraneous space between -I and the path.
        cris: convert obsolete hw_interrupt_type to struct irq_chip
        BUG to BUG_ON changes
        cpumask: use mm_cpumask() wrapper: cris
        cpumask: Use accessors code.: cris
        cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris
      ea431793
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 32fb6c17
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
        ACPI: processor: use .notify method instead of installing handler directly
        ACPI: button: use .notify method instead of installing handler directly
        ACPI: support acpi_device_ops .notify methods
        toshiba-acpi: remove MAINTAINERS entry
        ACPI: battery: asynchronous init
        acer-wmi: Update copyright notice & documentation
        acer-wmi: Cleanup the failure cleanup handling
        acer-wmi: Blacklist Acer Aspire One
        video: build fix
        thinkpad-acpi: rework brightness support
        thinkpad-acpi: enhanced debugging messages for the fan subdriver
        thinkpad-acpi: enhanced debugging messages for the hotkey subdriver
        thinkpad-acpi: enhanced debugging messages for rfkill subdrivers
        thinkpad-acpi: restrict access to some firmware LEDs
        thinkpad-acpi: remove HKEY disable functionality
        thinkpad-acpi: add new debug helpers and warn of deprecated atts
        thinkpad-acpi: add missing log levels
        thinkpad-acpi: cleanup debug helpers
        thinkpad-acpi: documentation cleanup
        thinkpad-acpi: drop ibm-acpi alias
        ...
      32fb6c17
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 45e36c16
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
        sh: sh7785lcr: Map whole PCI address space.
        sh: Fix up DSP context save/restore.
        sh: Fix up number of on-chip DMA channels on SH7091.
        sh: update defconfigs.
        sh: Kill off broken direct-mapped cache mode.
        sh: Wire up ARCH_HAS_DEFAULT_IDLE for cpuidle.
        sh: Add a command line option for disabling I/O trapping.
        sh: Select ARCH_HIBERNATION_POSSIBLE.
        sh: migor: Fix up CEU use flags.
        input: migor_ts: add wakeup support
        rtc: rtc-sh: use set_irq_wake()
        input: sh_keysc: use enable/disable_irq_wake()
        sh: intc: set_irq_wake() support
        sh: intc: install enable, disable and shutdown callbacks
        clocksource: sh_cmt: use remove_irq() and remove clockevent workaround
        sh: ap325 and Migo-R use new sh_mobile_ceu_info flags
        sh: Fix up -Wformat-security whining.
        sh: ap325rxa: Add ov772x support, again.
        sh: Sanitize asm/mmu.h for assembly use.
        sh: Tidy up sh7786 pinmux table.
        ...
      45e36c16
    • Linus Torvalds's avatar
      Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 87fc94d5
      Linus Torvalds authored
      * 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: add hardware handshake support to atmel_serial
        avr32: add RTS/CTS/CLK pin selection for the USARTs
        Add RTC support for Merisc boards
        avr32: at32ap700x: setup DMA for AC97C in the machine code
        avr32: at32ap700x: setup DMA for ABDAC in the machine code
        Add Merisc board support
        avr32: use gpio_is_valid() to check USBA vbus_pin I/O line
        atmel-usba-udc: use gpio_is_valid() to check vbus_pin I/O line
        avr32: fix timing LCD parameters for EVKLCD10X boards
        avr32: use GPIO line PB15 on EVKLCD10x boards for backlight
        avr32: configure MCI detect and write protect pins for EVKLCD10x boards
        avr32: set pin mask to alternative 18 bpp for EVKLCD10x boards
        avr32: add pin mask for 18-bit color on the LCD controller
        avr32: fix 15-bit LCDC pin mask to use MSB lines
      87fc94d5