1. 29 Dec, 2004 4 commits
  2. 27 Dec, 2004 22 commits
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk · eb5a1b89
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      eb5a1b89
    • David Vrabel's avatar
      [ARM PATCH] 2323/1: Expand IXP4XX_WATCHDOG config help text · d2c04833
      David Vrabel authored
      Patch from David Vrabel
      
      Expand the IXP4XX_WATCHDOG (IXP4xx internal watchdog) config option help text with a note about its ineffectiveness.
      
      Signed-off-by: David Vrabel
      Signed-off-by: Russell King
      d2c04833
    • Catalin Marinas's avatar
      [ARM PATCH] 2322/1: Enable ARM922T configuration option for Integrator · 0b154da7
      Catalin Marinas authored
      Patch from Catalin Marinas
      
      This patch enables the ARM922T configuration option for the
      Integrator platforms (there is an Excalibur core module available).
      
      Signed-off-by: Catalin Marinas
      Signed-off-by: Russell King
      0b154da7
    • Deepak Saxena's avatar
      [ARM PATCH] 2264/1: Move platform-specific code out of entry-armv.S · 6883df3c
      Deepak Saxena authored
      Patch from Deepak Saxena
      
      This patch borrows from the uclinux source where they have moved
      the per-platform code for get_irqnr_and_base, disable_fiq, and
      irq_prio_table out of entry-armv.S. However, instead of putting the
      macros in arch/arm/mach-$(MACHINE)/entry-header.S, we just have
      it in the machine's incdir. This means we don't need the extra
      complexity of creating symlink at build time. The patch also removes 
      the irq_prio_table as a requirement for all machines and makes it
      specific to IOC/IOMD machines. 
        
      This patch drastically shrinks entry-armv.S and allows us to delete 
      and add machines without having to touch generic code (there were two 
      dead machines laying around in entry-armv.S).
        
      Tested on IXP4xx and test-built for just about every defconfig.
      
      Signed-off-by: Deepak Saxena
      Signed-off-by: Russell King
      6883df3c
    • Linus Torvalds's avatar
      Merge bk://gkernel.bkbits.net/libata-2.6 · b3b9be04
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      b3b9be04
    • Stefan Knoblich's avatar
      12a3949a
    • Jeff Garzik's avatar
      Merge pobox.com:/garz/repo/libata-dev/sata_uli · c1999ccb
      Jeff Garzik authored
      into pobox.com:/garz/repo/libata-2.6
      c1999ccb
    • Albert Lee's avatar
      [libata] verify ATAPI DMA for a given request is OK · a56bb4da
      Albert Lee authored
      After some testing, it seems that some PATA host adapter (ex. pdc20275) cannot 
      work reliably with specific request buffer sizes under ATAPI DMA mode.
      
      Detailed test result:
      4096, 2048, 1024, 512, 256: OK
      384, 257, 255, 128, 96, 64, 32:  failed (irq lost)
       
      It seems multiple of 256 bytes are the safe ATAPI DMA buffer sizes to use.
      
      Attached please find the patch to fix the pdc2027x ATAPI DMA problem.
      
      Changes:
      1. Add a callback function "check_atapi_dma()" to ata_port_operations such that libata core
      can ask the driver: "Can this command be processed in ATAPI DMA mode safely? " 
      when the the command is received.
      2. ATAPI DMA is off by default if the callback function is not provided by the driver
      
      If the callback function is not provided by the driver, the ATAPI DMA should be as is.
      The ATAPI DMA is already controlled by dev->flags.
      
      BTW, the patch isolates the ATAPI DMA workaround to the pdc20275 driver itself,
      not impacting libata core .
      Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>
      a56bb4da
    • Albert Lee's avatar
      [libata] PIO error handling improvement · 623b57b3
      Albert Lee authored
      Tested burning CD-RW with libata-dev-2.6 and cdrecord:
      1. ATAPI DMA mode - tested OK
      2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.
      
       After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
      However, the error is not handled by ata_pio_task().
      
      Attached please find the patch for ata_pio_task() error handling for your review.
      (The patch is against the libata-dev-2.6 tree. )
      
      Changes in the patch:
      1. End the PIO task when PIO_ST_IDLE state is entered
      2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
      3. Remove the first "if" statement to handle the error condition returned from 
         ata_pio_block(), ata_pio_complete() and ata_pio_poll().
      
      Change #2 is not so necessary since ata_pio_error() will put the cmd to  PIO_ST_IDLE state
      after the error condition is handled. The change just saves a function call to queue_work().
      
      Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
      Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>
      623b57b3
    • Albert Lee's avatar
      [libata] use PIO mode for request sense · 652f8d65
      Albert Lee authored
      Signed-off-by: default avatarAlbert Lee <albertcc@tw.ibm.com>
      652f8d65
    • Linus Torvalds's avatar
      Merge bk://gkernel.bkbits.net/misc-2.6 · 0b103497
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      0b103497
    • Adrian Bunk's avatar
      66bf70c2
    • James Nelson's avatar
      [PATCH] hw_random: Minor cleanup to hw_random.c · 653af321
      James Nelson authored
      Clean up in drivers/char/hw_random.c:
      Make debug #defines a little easier to understand.
      Small whitespace cleanup.
      Change some printk()'s into pr_info()'s.
      Add KERN_ constant to debug printk().
      Signed-off-by: default avatarJames Nelson <james4765@gmail.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
      653af321
    • Jeff Garzik's avatar
    • Linus Torvalds's avatar
      Merge bk://linux-acpi.bkbits.net/26-latest-release · e3fc88e7
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      e3fc88e7
    • Linus Torvalds's avatar
      Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6 · 3e704faf
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      3e704faf
    • James Bottomley's avatar
      SCSI: fix compile warning in fc transport class · a7968735
      James Bottomley authored
        CC [M]  drivers/scsi/scsi_transport_fc.o
      drivers/scsi/scsi_transport_fc.c: In function `fc_stat_show':
      drivers/scsi/scsi_transport_fc.c:634: warning: long long unsigned int format, long unsigned int arg (arg 4)
      
      To us %llx on a 64 bit platform we have to cast u64 to 
      unsigned long long.
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      a7968735
    • James Bottomley's avatar
      SCSI: Add FC transport host attributes · 85175168
      James Bottomley authored
      From: 	James.Smart@Emulex.Com
      
      This patch updates the fc_transport with attributes for local FC ports
      (e.g. Hosts).  The port attributes are defined per HBAAPI v2.0 definitions.
      
      This patch results in the following in /sys/class:
      -----------------------------------------------------
      
      [jsmart@elxware class]$ cd /sys/class
      [jsmart@elxware class]$ ls
      fc_host       graphics  misc     pci_bus       scsi_host  usb_host
      fc_transport  input     net      scsi_device   tty        vc
      firmware      mem       netlink  scsi_generic  usb
      [jsmart@elxware class]$ cd fc_host
      [jsmart@elxware fc_host]$ ls
      host4
      
      [jsmart@elxware fc_host]$ cd host4
      [jsmart@elxware host4]$ ls
      device                 host_port_maxframe_size      host_port_supported_speeds
      host_fabric_name       host_port_name               host_port_symbolic_name
      host_link_down_tmo     host_port_speed              host_port_type
      host_node_name         host_port_state              host_tgtid_bind_type
      host_port_active_fc4s  host_port_supported_classes  statistics
      host_port_id           host_port_supported_fc4s
      [jsmart@elxware host4]$ ls -ld *
      lrwxrwxrwx  1 root root    0 Oct 13 18:24 device -> ../../../devices/platform/host4
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_fabric_name
      -rw-r--r--  1 root root 4096 Oct 13 18:24 host_link_down_tmo
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_node_name
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_active_fc4s
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_id
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_maxframe_size
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_name
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_speed
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_state
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_classes
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_fc4s
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_speeds
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_symbolic_name
      -r--r--r--  1 root root 4096 Oct 13 18:24 host_port_type
      -rw-r--r--  1 root root 4096 Oct 13 18:24 host_tgtid_bind_type
      drwxr-xr-x  2 root root    0 Oct 13 18:24 statistics
      
      
      Using the following script (/tmp/show_attributes):
          #!/bin/sh
          FILES=`ls *`
          for file in $FILES; do
            if [ -f $file ] ; then
              echo "$file : " `cat $file`
            fi
          done
      
      Here's a sample of querying the attributes:
      
      [jsmart@elxware /]$ cd /sys/class/fc_host/host4
      [jsmart@elxware host4]$ /tmp/show_attributes
      host_fabric_name :  0x33334444ffeeddcc
      host_link_down_tmo :  30
      host_node_name :  0x78563412aabbccdd
      host_port_active_fc4s :  hex: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f
      host_port_id :  0x789abc
      host_port_maxframe_size :  2511 bytes
      host_port_name :  0xefcdab9011223344
      host_port_speed :  2 Gbit
      host_port_state :  Online
      host_port_supported_classes :  Class 2, Class 3
      host_port_supported_fc4s :  hex: 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f
      host_port_supported_speeds :  2 Gbit, 4 Gbit, 10 Gbit
      host_port_symbolic_name :  LP9052 Dual Port Adapter
      host_port_type :  NPort (fabric via point-to-point)
      host_tgtid_bind_type :  wwpn (World Wide Port Name)
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      85175168
    • Dave Boutcher's avatar
      [PATCH] ibmvscsi: replace schedule_timeout() with msleep() · 18a1de8b
      Dave Boutcher authored
      Description: Use msleep() instead of schedule_timeout()
      to guarantee the task delays as expected.  Originally
      submitted to linux-scsi by the janitors, and resubmitted
      by boutcher (after testing :-)
      Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
      Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
      Signed-off-by: default avatarDave Boutcher <boutcher@us.ibm.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
      18a1de8b
    • Arjan van de Ven's avatar
      [PATCH] drivers/acpi/ibm_acpi.o .init.text refers to .exit.text · e30561d9
      Arjan van de Ven authored
      the ibm_acpi.c driver references acpi_ibm_exit() from it's __init function,
      which means the exit function isn't allowed to be __exit since __exit
      functions are not part of vmlinux while __init functions are.
      Signed-off-by: default avatarArjan van de Ven <arjan@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      e30561d9
    • Linus Torvalds's avatar
      Merge bk://linux-voyager.bkbits.net/mca-2.6 · 1972ddad
      Linus Torvalds authored
      into ppc970.osdl.org:/home/torvalds/v2.6/linux
      1972ddad
    • Linus Torvalds's avatar
      Revert duplicate AC97 id's. · 0812e18a
      Linus Torvalds authored
      They were already there, properly sorted too.
      0812e18a
  3. 26 Dec, 2004 14 commits