1. 26 5月, 2010 16 次提交
    • T
      libata: implement dump_id force param · 43c9c591
      Tejun Heo 提交于
      Add dump_id libata.force parameter.  If specified, libata dumps full
      IDENTIFY data during device configuration.  This is to aid debugging.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: Larry Baker <baker@usgs.gov>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      43c9c591
    • T
      libata: disable ATAPI AN by default · e7ecd435
      Tejun Heo 提交于
      There are ATAPI devices which raise AN when hit by commands issued by
      open().  This leads to infinite loop of AN -> MEDIA_CHANGE uevent ->
      udev open() to check media -> AN.
      
      Both ACS and SerialATA standards don't define in which case ATAPI
      devices are supposed to raise or not raise AN.  They both list media
      insertion event as a possible use case for ATAPI ANs but there is no
      clear description of what constitutes such events.  As such, it seems
      a bit too naive to export ANs directly to userland as MEDIA_CHANGE
      events without further verification (which should behave similarly to
      windows as it apparently is the only thing that some hardware vendors
      are testing against).
      
      This patch adds libata.atapi_an module parameter and disables ATAPI AN
      by default for now.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: Kay Sievers <kay.sievers@vrfy.org>
      Cc: Nick Bowler <nbowler@elliptictech.com>
      Cc: David Zeuthen <david@fubar.dk>
      Cc: stable@kernel.org
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      e7ecd435
    • T
      libata-sff: make BMDMA optional · 9a7780c9
      Tejun Heo 提交于
      Make BMDMA optional depending on new config variable CONFIG_ATA_BMDMA.
      In Kconfig, drivers are grouped into five groups - non-SFF native, SFF
      w/ custom DMA interface, SFF w/ BMDMA, PIO-only SFF, and generic
      fallback / legacy ones.  Kconfig and Makefile are reorganized
      according to the groups and ordered alphabetically inside each group.
      
      ata_ioports.bmdma_addr and ata_port.bmdma_prd[_dma] are put into
      CONFIG_ATA_BMDMA, as are all bmdma related ops, variables and
      functions.
      
      This increase the binary size slightly when BMDMA is enabled but on
      both native-only and PIO-only configurations the size is slightly
      reduced.  Either way, the size difference is insignificant.  This
      change is more meaningful to signify the separation between SFF and
      BMDMA and as a tool to verify the separation.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      9a7780c9
    • T
      libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf · d6b0de8c
      Tejun Heo 提交于
      Now that SFF and BMDMA are completely separate, sata_qstor and
      pata_octeon_cf which inherit from ata_sff_port_ops don't need to worry
      about BMDMA ops being called.  Kill the dummy BMDMA ops.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      d6b0de8c
    • T
      libata-sff: separate out BMDMA init · 1c5afdf7
      Tejun Heo 提交于
      Separate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one()
      from their SFF counterparts.  SFF ones no longer try to initialize
      BMDMA or set PCI master.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      1c5afdf7
    • T
      libata-sff: separate out BMDMA irq handler · c3b28894
      Tejun Heo 提交于
      Separate out BMDMA irq handler from SFF irq handler.  The misnamed
      host_intr() functions are renamed to ata_sff_port_intr() and
      ata_bmdma_port_intr().  Common parts are factored into
      __ata_sff_port_intr() and __ata_sff_interrupt() and used by sff and
      bmdma interrupt routines.
      
      All BMDMA drivers now use ata_bmdma_interrupt() or
      ata_bmdma_port_intr() while all non-BMDMA SFF ones use
      ata_sff_interrupt() or ata_sff_port_intr().
      
      For now, ata_pci_sff_init_one() uses ata_bmdma_interrupt() as it's
      used by both SFF and BMDMA drivers.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      c3b28894
    • T
      libata-sff: ata_sff_irq_clear() is BMDMA specific · 37f65b8b
      Tejun Heo 提交于
      ata_sff_irq_clear() is BMDMA specific.  Rename it to
      ata_bmdma_irq_clear(), move it to ata_bmdma_port_ops and make
      ->sff_irq_clear() optional.
      
      Note: ata_bmdma_irq_clear() is actually only needed by ata_piix and
            possibly by sata_sil.  This should be moved to respective low
            level drivers later.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      37f65b8b
    • T
      sata_mv: drop unncessary EH callback resetting · 2f20ccf8
      Tejun Heo 提交于
      Now that BMDMA EH ops are separated out from SFF ops, mv5_ops doesn't
      have to explicitly reset ->error_handler() and ->post_internal_cmd().
      Drop them.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      2f20ccf8
    • L
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · ec96e2fe
      Linus Torvalds 提交于
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
        ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
        ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
        ARM: 6140/1: silence a bogus sparse warning in unwind.c
        ARM: mach-at91: duplicated include
        ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
        ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
        ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
        ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
        ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
        ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
        ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
        ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
        ARM: SPEAR6xx: remove duplicated #include
        ARM: s3c6400_defconfig: Add NAND driver
        ARM: s3c6400_defconfig: enable sound as modules
        ARM: s3c6400_defconfig: enable power management
        ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
        ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
        ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
        ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
        ...
      ec96e2fe
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 8e9815a0
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()
        RDMA/nes: Async event for closed QP causes crash
        RDMA/nes: Have ethtool read hardware registers for rx/tx stats
        RDMA/cxgb4: Only insert sq qid in lookup table
        RDMA/cxgb4: Support IB_WR_READ_WITH_INV opcode
        RDMA/cxgb4: Set fence flag for inv-local-stag work requests
        RDMA/cxgb4: Update some HW limits
        RDMA/cxgb4: Don't limit fastreg page list depth
        RDMA/cxgb4: Return proper errors in fastreg mr/pbl allocation
        RDMA/cxgb4: Fix overflow bug in CQ arm
        RDMA/cxgb4: Optimize CQ overflow detection
        RDMA/cxgb4: CQ size must be IQ size - 2
        RDMA/cxgb4: Register RDMA provider based on LLD state_change events
        RDMA/cxgb4: Detach from the LLD after unregistering RDMA device
        IB/ipath: Remove support for QLogic PCIe QLE devices
        IB/qib: Add new qib driver for QLogic PCIe InfiniBand adapters
        IB/mad: Make needlessly global mad_sendq_size/mad_recvq_size static
        IB/core: Allow device-specific per-port sysfs files
        mlx4_core: Clean up mlx4_alloc_icm() a bit
        mlx4_core: Fix possible chunk sg list overflow in mlx4_alloc_icm()
      8e9815a0
    • L
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · 702c0b04
      Linus Torvalds 提交于
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
        spi/xilinx: Fix compile error
        spi/davinci: Fix clock prescale factor computation
        spi: move bitbang txrx utility functions to private header
        spi/mpc5121: Add SPI master driver for MPC5121 PSC
        powerpc/mpc5121: move PSC FIFO memory init to platform code
        spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller
        Documentation/spi/* compile warning fix
        spi/omap2_mcspi: Check params before dereference or use
        spi/omap2_mcspi: add turbo mode support
        spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160
        spi/pl022: fix stop queue procedure
        spi/pl022: add support for the PL023 derivate
        spi/pl022: fix up differences between ARM and ST versions
        spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma
        spi/spi_mpc8xxx: Fix QE mode Litte Endian
        spi/spi_mpc8xxx: fix potential memory corruption.
      702c0b04
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c19eb8f0
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        arch/m68knommu/platform/68360/commproc.c: Checkpatch cleanup
        arch/m68knommu/mm/fault.c: Checkpatch cleanup
        m68knommu: improve short help of m68knommu/Kconfig/RAMSIZE for '0' case
        m68knommu: remove un-used mcfsmc.h
        m68knommu: add smc91x support for ColdFire NETtel boards
        m68knommu: add smc91x support to ColdFire 5249 platform
        m68knommu: remove size limit on non-MMU TASK_SIZE
        m68knommu: fix broken use of BUAD_TABLE_SIZE in 68328serial driver
        m68knommu: Coldfire QSPI platform support
      c19eb8f0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · 99765cc7
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
        regulator: return set_mode is same mode is requested
        Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc
        twl6030: regulator: Remove vsel tables and use formula for calculation
        mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage
        regulator: use voltage number array in 88pm860x
        regulator: make 88pm860x sharing one driver structure
        regulator: simplify regulator_register() error handling
        regulator: fix unset_regulator_supplies() to remove all matches
        regulator: prevent registration of matching regulator consumer supplies
        regulator: Allow regulator-regulator supplies to be specified by name
      99765cc7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 51e618c3
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        watchdog: Driver for the watchdog timer on Freescale IMX2 (and later) processors.
        watchdog: s3c2410_wdt - Fix on handling of the request_mem_region fail
        watchdog: s3c2410_wdt - Add extra option to include watchdog for Samsung SoCs
        iTCO_wdt: fix TCO V1 timeout values and limits
        watchdog: twl4030_wdt: Disable watchdog during probing
        watchdog: update/improve/consolidate watchdog driver
        watchdog: booke_wdt: fix ioctl status flags
        watchdog: fix several MODULE_PARM_DESC strings
        watchdog: bfin: use new common Blackfin watchdog header
      51e618c3
    • R
    • C
      RDMA/nes: Fix incorrect unlock in nes_process_mac_intr() · b17e0969
      Chien Tung 提交于
      Commit ce6e74f2 ("RDMA/nes: Make nesadapter->phy_lock usage
      consistent") introduced a problem where phy_lock was only unlocked
      within an if statement and so nes_process_mac_intr() could return with
      phy_lock still held.  Fix this.
      
      This was discovered because of the sparse warning:
      
          drivers/infiniband/hw/nes/nes_hw.c:2643:9: warning: context imbalance in 'nes_process_mac_intr' - different lock contexts for basic block
      Reported-by: NRoland Dreier <rdreier@cisco.com>
      Signed-off-by: NChien Tung <chien.tin.tung@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      b17e0969
  2. 25 5月, 2010 24 次提交