Permalink
Switch branches/tags
Commits on Oct 13, 2008
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    torvalds committed Oct 13, 2008
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (66 commits)
      ata: Add documentation for hard disk shock protection interface (v3)
      ide: Implement disk shock protection support (v4)
      ide-cd: fix printk format warning
      piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list
      ide-atapi: assign taskfile flags per device type
      ide-cd: move cdrom_info.dma to ide_drive_t.dma
      ide: add ide_drive_t.dma flag
      ide-cd: add a debug_mask module parameter
      ide-cd: convert driver to new ide debugging macro (v3)
      ide: move SFF DMA code to ide-dma-sff.c
      ide: cleanup ide-dma.c
      ide: cleanup ide_build_dmatable()
      ide: remove needless includes from ide-dma.c
      ide: switch to DMA-mapping API part #2
      ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
      ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
      ide: __ide_dma_end() -> ide_dma_end()
      pmac: remove needless pmac_ide_destroy_dmatable() wrapper
      pmac: remove superfluous pmif == NULL checks
      ide: Two fixes regarding memory allocation
      ...
  2. Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

    torvalds committed Oct 13, 2008
    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
      pcmcia: ioctl-internal definitions
      pcmcia: cistpl header cleanup
      pcmcia: remove unused argument to pcmcia_parse_tuple()
      pcmcia: card services header cleanup
      pcmcia: device_id header cleanup
      pcmcia: encapsulate ioaddr_t
      pcmcia: cleanup device driver header file
      pcmcia: cleanup socket services header file
      pcmcia: merge ds_internal.h into cs_internal.h
      pcmcia: cleanup cs_internal.h
      pcmcia: cs_internal.h is internal
      pcmcia: use dev_printk for cs_error()
      pcmcia: remove CS_ error codes alltogether
      pcmcia: deprecate CS_BAD_TUPLE
      pcmcia: deprecate CS_BAD_ARGS
      pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
      pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
      pcmcia: deprecate CS_NO_MORE_ITEMS
      pcmcia: deprecate CS_IN_USE
      pcmcia: deprecate CS_CONFIGURATION_LOCKED
      ...
    
    Fix trivial conflict in drivers/pcmcia/ds.c manually
  3. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Oct 13, 2008
    …/git/mchehab/linux-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
      V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
      V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
      V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
      V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
      V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
      V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
      V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
      V4L/DVB (9179): S2API: frontend.h cleanup
      V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
      V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
      V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
      V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
      V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
      V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
      V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
      V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
      V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
      V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
      V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
      V4L/DVB: v4l2-dev: remove duplicated #include
      ...
  4. ata: Add documentation for hard disk shock protection interface (v3)

    EOltmanns authored and bzolnier committed Oct 13, 2008
    Put some information (and pointers to more) into the kernel's doc tree,
    describing briefly the interface to the kernel's disk head unloading
    facility. Information about how to set up a complete shock protection
    system under GNU/Linux can be found on the web and is referenced
    accordingly.
    
    v3:
    Here is some final polish including various spelling corrections
    pointed out by Grant Grundler and Peter Moulder. Also, I have added some
    information about the timing constraints related to disk head parking.
    The patch looks more impressive than it really is and I think it would
    be alright just to incorporate it into the original patch so as not to
    clutter up the git log.
    
    Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  5. ide: Implement disk shock protection support (v4)

    EOltmanns authored and bzolnier committed Oct 13, 2008
    On user request (through sysfs), the IDLE IMMEDIATE command with UNLOAD
    FEATURE as specified in ATA-7 is issued to the device and processing of
    the request queue is stopped thereafter until the specified timeout
    expires or user space asks to resume normal operation. This is supposed
    to prevent the heads of a hard drive from accidentally crashing onto the
    platter when a heavy shock is anticipated (like a falling laptop expected
    to hit the floor). Port resets are deferred whenever a device on that
    port is in the parked state.
    
    v3:
    Elias Oltmanns <eo@nebensachen.de> wrote:
    [...]
    > >> 1. Make sure that no negative value is being passed to
    > >>    jiffies_to_msecs() in ide_park_show().
    > >> 2. Drop the superfluous variable hwif in ide_special_rq().
    > >> 3. Skip initialisation of task and tf in ide_special_rq() if we are not
    > >>    handling a (un)park request.
    > >
    > > Well, #3 should have been done differently because we donn't want to
    > > check for REQ_(UN)?PARK_HEADS more often than is necessary.
    > 
    > While preparing the backport to 2.6.27, it has just occurred to me that
    > we need to clear the IDE_DFLAG_PARKED flag in ide_disk_pre_reset()
    > because this flag must not be set after *any* sort of access to the
    > device.
    
    v4:
    Fix a memory leak due to a missing blk_put_request() in
    issue_park_cmd(). Additionally, we should plug the queue when enqueueing
    the unpark request because there is no guarantee that the park timeout
    has not expired by then. Even though the chance for that to happen is
    very slim, the request might end up hanging in the queue until the next
    I/O operation is queued up. While at it, clean up the code a little:
    - make issue_park_cmd() a function of type void since nobody cares for
      the return value anyway;
    - use blk_start_queueing() instead of __blk_run_queue() since we don't
      have to worry about recursion;
    - remove a superfluous pointer deference in task_no_data_intr().
    
    Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
    Cc: Jeff Garzik <jeff@garzik.org>,
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Tejun Heo <htejun@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  6. ide-cd: fix printk format warning

    alexb0 authored and bzolnier committed Oct 13, 2008
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Cc: Borislav Petkov <petkovbb@googlemail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  7. piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list

    Herton Ronaldo Krzesinski authored and bzolnier committed Oct 13, 2008
    Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  8. ide-atapi: assign taskfile flags per device type

    Borislav Petkov authored and bzolnier committed Oct 13, 2008
    There should be no functional change resulting from this patch.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  9. ide-cd: move cdrom_info.dma to ide_drive_t.dma

    Borislav Petkov authored and bzolnier committed Oct 13, 2008
    There should be no functionality change resulting from this patch.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  10. ide: add ide_drive_t.dma flag

    Borislav Petkov authored and bzolnier committed Oct 13, 2008
    This flag is to accomodate ide-cd functionality into ide atapi.
    
    There should be no functionality change resulting from this patch.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  11. ide-cd: add a debug_mask module parameter

    Borislav Petkov authored and bzolnier committed Oct 13, 2008
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    [bart: no need to zero debug_mask + move it next to module_param()]
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  12. ide-cd: convert driver to new ide debugging macro (v3)

    Borislav Petkov authored and bzolnier committed Oct 13, 2008
    Also,
    
    - leave in the possibility for optimizing away all debugging macros
    - add a PFX macro and prepend all printk calls with it for consistency
    - add debug macro calls in important driver paths
    - remove #if 0-ed code
    - mv restore_request -> ide_cd_restore_request
    - add a driver registration printk
    
    v2:
    failed_command can be NULL so check it before accessing it
    
    v3:
    fix another NULL ptr in debug statement
    
    There should be no functionality change resulting from this patch.
    
    Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  13. ide: move SFF DMA code to ide-dma-sff.c

    bzolnier committed Oct 13, 2008
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  14. ide: cleanup ide-dma.c

    bzolnier committed Oct 13, 2008
    - s/HWIF(drive)/drive->hwif/
    - s/HWGROUP(drive)/[drive->]hwif->hwgroup/
    - fixup error messages in ide_dma_intr() & dma_timer_expiry()
    - fix checkpatch.pl errors/warnings
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  15. ide: cleanup ide_build_dmatable()

    bzolnier committed Oct 13, 2008
    - use for_each_sg()
    - move printing 'DMA table too small' message below use_pio_instead label
    - merge '64KB bug' comment with function documentation
    - fix intendation
    
    There should be no functional changes caused by this patch.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  16. ide: remove needless includes from ide-dma.c

    bzolnier committed Oct 13, 2008
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  17. ide: switch to DMA-mapping API part #2

    bzolnier committed Oct 13, 2008
    Follow-up to commit 5c05ff6
    ("ide: switch to DMA-mapping API"):
    
    * pci_{alloc,free}_consistent() -> dma_{alloc,free}_coherent()
      in ide_{allocate,release}_dma_engine().
    
    * Add ->prd_max_nents and ->prd_ent_size fields to ide_hwif_t
      (+ set default values in ide_allocate_dma_engine()).
    
    * Make ide_{allocate,release}_dma_engine() available also
      for CONFIG_BLK_DEV_IDEDMA_SFF=n.  Then convert au1xxx-ide.c,
      scc_pata.c and sgiioc4.c to use them.
    
    * Add missing ->init_dma method to scc_pata.
    
    This patch also fixes:
    - ->dmatable_cpu leak for au1xxx-ide
    - too early realease of ->dmatable_cpu for scc_pata
    - wrong amount of ->dmatable_cpu memory being freed for sgiioc4
    
    While at it:
    - remove superfluous ->dma_base check from ide_unregister()
    - return -ENOMEM on error in ide_release_dma_engine()
    - beautify error message in ide_release_dma_engine()
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  18. ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_…

    bzolnier committed Oct 13, 2008
    …SFF=n
    
    Make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
    and convert {ics,au1xxx-}ide.c to use it.
    
    While at it:
    - dump ATA Status register content on error
    - use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions
    
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  19. ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA…

    bzolnier committed Oct 13, 2008
    …_SFF=n
    
    Make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
    and convert {ics,au1xxx-}ide.c to use it.
    
    While at it:
    - use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions
    
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  20. ide: __ide_dma_end() -> ide_dma_end()

    bzolnier committed Oct 13, 2008
    While at it:
    - use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions
    
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  21. pmac: remove needless pmac_ide_destroy_dmatable() wrapper

    bzolnier committed Oct 13, 2008
    hwif->sg_nents is always != 0 when this function is called
    and there is also no need to explicitely zero hwif->sg_nents.
    
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  22. pmac: remove superfluous pmif == NULL checks

    bzolnier committed Oct 13, 2008
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  23. ide: Two fixes regarding memory allocation

    EOltmanns authored and bzolnier committed Oct 13, 2008
    In function ide_devset_execute() we should use __GFP_WAIT rather than
    GFP_KERNEL. Also, the allocation cannot possibly fail at that point.
    More importantly, there is a potential memory leak in the device probing
    code. The infrastructure seems rather complex and I hope I haven't messed
    anything up by trying to fix this.
    
    Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
    [bart: remove superfluous ide_lock taking]
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  24. ide-disk: move /proc handling to ide-disk_proc.c (take 3)

    bzolnier committed Oct 13, 2008
    While at it:
    - idedisk_capacity() -> ide_disk_capacity()
    - idedisk_proc[] -> ide_disk_proc[]
    - idedisk_settings[] -> ide_disk_settings[]
    
    v2/3:
    Build fix for CONFIG_IDE_PROC_FS=n from Elias Oltmanns.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  25. ide-disk: move all ioctl handling to ide-disk_ioctl.c

    bzolnier committed Oct 13, 2008
    While at it:
    - idedisk_ioctl() -> ide_disk_ioctl()
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  26. ide-floppy: move /proc handling to ide-floppy_proc.c (take 2)

    bzolnier committed Oct 13, 2008
    While at it:
    - idefloppy_capacity() -> ide_floppy_capacity()
    - idefloppy_proc[] -> ide_floppy_proc[]
    - idefloppy_settings[] -> ide_floppy_settings[]
    
    v2:
    Build fix for CONFIG_IDE_PROC_FS=n from Elias Oltmanns.
    
    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  27. ide-floppy: move all ioctl handling to ide-floppy_ioctl.c (take 2)

    bzolnier committed Oct 13, 2008
    While at it:
    - idefloppy_ioctl() -> ide_floppy_ioctl()
    
    v2:
    Fix for idefloppy_ioctl name change from Stephen Rothwell.
    
    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  28. ide-cd: no need to zero drive->special.all

    bzolnier committed Oct 13, 2008
    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  29. ide: set IDE_AFLAG_DRQ_INTERRUPT in do_identify()

    bzolnier committed Oct 13, 2008
    Set IDE_AFLAG_DRQ_INTERRUPT in do_identify() instead of ATAPI
    device drivers *_setup() methods.
    
    While at it:
    - use ata_id_cdb_intr()
    
    There should be no functional changes caused by this patch.
    
    Cc: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  30. ide: remove ide_host_alloc_all()

    bzolnier committed Oct 13, 2008
    * Remove no longer used ide_host_alloc_all().
    
    * Add MAX_HOST_PORTS define and use it instead of MAX_HWIFS
      as the maximum number of host ports possible.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  31. ide-generic: remove no longer needed ide_probe_legacy()

    bzolnier committed Oct 13, 2008
    There is now a generic solution [ide_generic_check_pci_legacy_iobases()]
    so MIPS-specific ide_probe_legacy() is no longer necessary.
    
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  32. ide-generic: no need to probe all ports at once

    bzolnier committed Oct 13, 2008
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  33. ide: ->ide_dma_clear_irq() -> ->clear_irq()

    bzolnier committed Oct 13, 2008
    * Rename ->ide_dma_clear_irq method to ->clear_irq
      and move it from ide_hwif_t to struct ide_port_ops.
    
    * Move ->waiting_for_dma check inside ->clear_irq method.
    
    * Move ->dma_base check inside ->clear_irq method.
    
    piix.c:
    * Add ich_port_ops and remove init_hwif_ich() wrapper.
    
    There should be no functional changes caused by this patch.
    
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  34. ide: use unique names for struct pci_driver instances

    bzolnier committed Oct 13, 2008
    Noticed-by: Russell King <rmk+lkml@arm.linux.org.uk>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  35. ide: merge all TASKFILE_NO_DATA data phase handlers into taskfile_no_…

    bzolnier committed Oct 13, 2008
    …intr()
    
    * Add 'struct task_s' to ide_hwif_t and init it to the current command
      in do_rw_taskfile().
    
    * Merge all TASKFILE_NO_DATA data phase handlers into taskfile_no_intr().
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>