23 Dec, 2006

8 commits


21 Dec, 2006

32 commits

  • * 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
    [PATCH] block: document io scheduler allow_merge_fn hook
    [PATCH] cfq-iosched: don't allow sync merges across queues
    [PATCH] Fixup blk_rq_unmap_user() API
    [PATCH] __blk_rq_unmap_user() fails to return error
    [PATCH] __blk_rq_map_user() doesn't need to grab the queue_lock
    [PATCH] Remove queue merging hooks
    [PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
    [PATCH] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request
    [PATCH] cciss: set default raid level when reading geometry fails

    Linus Torvalds
     
  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    [libata] sata_svw, sata_vsc: kill iomem warnings
    [PATCH] libata: take scmd->cmd_len into account when translating SCSI commands
    [PATCH] libata: kill @cdb argument from xlat methods
    [PATCH] libata: clean up variable name usage in xlat related functions
    [libata] Move some PCI IDs from sata_nv to ahci
    [libata] pata_via: suspend/resume support fix
    [libata] pata_cs5530: suspend/resume support tweak

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
    Driver core: proper prototype for drivers/base/init.c:driver_init()
    kobject: kobject_uevent() returns manageable value
    kref refcnt and false positives

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits)
    acpiphp: Link-time error for PCI Hotplug
    shpchp: cleanup shpchp.h
    shpchp: remove shpchprm_get_physical_slot_number
    shpchp: cleanup struct controller
    shpchp: remove unnecessary struct php_ctlr
    PCI: ATI sb600 sata quirk
    PCI legacy resource fix
    PCI: don't export device IDs to userspace
    PCI: Be a bit defensive in quirk_nvidia_ck804() so we don't risk dereferencing a NULL pdev.
    PCI: Fix multiple problems with VIA hardware
    PCI: Only check the HT capability bits in mpic.c
    PCI: Use pci_find_ht_capability() in drivers/pci/quirks.c
    PCI: Add #defines for Hypertransport MSI fields
    PCI: Use pci_find_ht_capability() in drivers/pci/htirq.c
    PCI: Add pci_find_ht_capability() for finding Hypertransport capabilities
    PCI: Create __pci_bus_find_cap_start() from __pci_bus_find_cap()
    pci: Introduce pci_find_present
    PCI: pcieport-driver: remove invalid warning message
    rpaphp: compiler warning cleanup
    PCI quirks: remove redundant check
    ...

    Linus Torvalds
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (34 commits)
    USB Storage: remove duplicate Nokia entry in unusual_devs.h
    [PATCH] bluetooth: add support for another Kensington dongle
    [PATCH] usb serial: add support for Novatel S720/U720 CDMA/EV-DO modems
    [PATCH] USB: Nokia E70 is an unusual device
    USB: fix to usbfs_snoop logging of user defined control urbs
    USB: at91_udc: Additional checks
    USB: at91_udc: Cleanup variables after failure in usb_gadget_register_driver()
    USB: at91_udc: allow drivers that support high speed
    USB: u132-hcd/ftdi-elan: add support for Option GT 3G Quad card
    USB: at91_udc, misc fixes
    USB: at91 udc, support at91sam926x addresses
    USB: OHCI support for PNX8550
    USB: ohci handles hardware faults during root port resets
    USB: ohci at91 warning fix
    USB: ohci whitespace/comment fixups
    USB: MAINTAINERS update, EHCI and OHCI
    USB: gadget driver unbind() is optional; section fixes; misc
    UHCI: module parameter to ignore overcurrent changes
    USB: Nokia E70 is an unusual device
    USB AUERSWALD: replace kmalloc+memset with kzalloc
    ...

    Linus Torvalds
     
  • * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
    [POWERPC] Fix register save area alignment for swapcontext syscall
    [POWERPC] Fix PCI device channel state initialization
    [POWERPC] Update MTD OF documentation
    [POWERPC] Probe Efika platform before CHRP.
    [POWERPC] Fix build of cell zImage.initrd
    [POWERPC] iSeries: fix CONFIG_VIOPATH dependency
    [POWERPC] iSeries: fix viocons init
    [POWERPC] iSeries: fix viocd init
    [POWERPC] iSeries: fix iseries_veth init
    [POWERPC] iSeries: fix viotape init
    [POWERPC] iSeries: fix viodasd init
    [POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges
    [POWERPC] powerpc: add scanning of ebc bus to of_platform
    [POWERPC] spufs: fix assignment of node numbers
    [POWERPC] cell: Fix spufs with "new style" device-tree
    [POWERPC] cell: Enable spider workarounds on all PCI buses
    [POWERPC] cell: add forward struct declarations to spu.h
    [POWERPC] cell: update cell_defconfig

    Linus Torvalds
     
  • * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm: Stop defining pci_pretty_name
    drm: r128: comment aligment with drm git
    drm: make kernel context switch same as for drm git tree.
    drm: fixup comment header style
    drm: savage: compat fix from drm git.
    drm: Unify radeon offset checking.
    i915_vblank_tasklet: Try harder to avoid tearing.
    DRM: handle pci_enable_device failure
    drm: fix return value check

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits)
    [ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
    [ARM] 4060/1: update several ARM defconfigs
    [ARM] 4061/1: xsc3: change of maintainer
    [ARM] 4059/1: VR1000: fix LED3's platform device number
    [ARM] 4022/1: iop13xx: generic irq fixups
    [ARM] 4015/1: s3c2410 cpu ifdefs
    [ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
    [ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
    [ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
    [ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
    [ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
    [ARM] Fix warnings from asm/system.h
    [ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
    [ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
    [ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
    [ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
    [ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
    [ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
    [ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
    [ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
    ...

    Linus Torvalds
     
  • How many times are we going to merge this entry...

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • Now that iomap merge is close to reality, and since the warnings and
    issue have been around so long, we don't need a reminder on every build
    that libata needs to be converted over to iomap.

    Signed-off-by: Jeff Garzik

    Jeff Garzik
     
  • Add the stupid sco fixup quirk to yet another Broadcom/Kensington device.

    Cc: Marcel Holtmann
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Olivier Galibert
     
  • Add USB vendor/device IDs for Novatel Wireless S720 and U720 CDMA/EV-DO
    modems to airprime.c.

    Signed-off-by: Eric Smith
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Eric Smith
     
  • Taken from http://bugzilla.kernel.org/show_bug.cgi?id=7508

    When the Nokia E70 Phone is plugged in to the USB port, I get:

    end_request: I/O error, dev sda, sector 1824527
    sd 0:0:0:0: SCSI error: return code = 0x10070000
    end_request: I/O error, dev sda, sector 1824535
    sd 0:0:0:0: SCSI error: return code = 0x10070000

    The fix is to add these lines to drivers/usb/storage/unusual_devs.h:

    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Andrew Morton
     
  • libata depended on SCSI command to have the correct length when
    tranlating it into an ATA command. This generally worked for commands
    issued by SCSI HLD but user could issue arbitrary broken command using
    sg interface.

    Also, when building ATAPI command, full command size was always
    copied. Because some ATAPI devices needs bytes after CDB cleared, if
    upper layer doesn't clear bytes after CDB, such devices will
    malfunction. This necessiated recent clear-garbage-after-CDB fix in
    sg interfaces. However, scsi_execute() isn't fixed yet and HL-DT-ST
    DVD-RAM GSA-H30N malfunctions on initialization commands issued from
    SCSI.

    This patch makes xlat functions always consider SCSI cmd_len. Each
    translation function checks for proper cmd_len and ATAPI translaation
    clears bytes after CDB.

    Signed-off-by: Tejun Heo
    Cc: Jens Axboe
    Cc: Douglas Gilbert
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • xlat function will be updated to consider qc->scsicmd->cmd_len and
    many xlat functions deference qc->scsicmd already. It doesn't make
    sense to pass qc->scsicmd->cmnd as @cdb separately. Kill the
    argument.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • Variable names in xlat functions are quite confusing now. 'scsicmd'
    is used for CDB while qc->scsicmd points to struct scsi_cmnd while
    'cmd' is used for struct scsi_cmnd.

    This patch cleans up variable names in xlat functions such that 'scmd'
    is used for struct scsi_cmnd and 'cdb' for CDB. Also, 'scmd' local
    variable is added if qc->scsicmd is used multiple times.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jeff Garzik

    Tejun Heo
     
  • The content of memory map io of BAR5 have been change from MCP65 then
    sata_nv can't work fine on the platform based on MCP65 and MCP67, so move
    their IDs from sata_nv.c to ahci.c.

    Signed-off-by: Peer Chen
    Signed-off-by: Jeff Garzik

    Peer Chen
     
  • Add a prototype for driver_init() in include/linux/device.h.

    Also remove a static function of the same name in drivers/acpi/ibm_acpi.c to
    ibm_acpi_driver_init() to fix the namespace collision.

    Signed-off-by: Adrian Bunk
    Acked-by: Henrique de Moraes Holschuh
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Adrian Bunk
     
  • I'm seeing:
    `acpiphp_glue_exit' referenced in section `.init.text' of
    drivers/built-in.o: defined in discarded section `.exit.text' of
    drivers/built-in.o

    when trying to compile an IA64 kernel with PCI hotplug enabled.

    I suggest this patch:

    Signed-off-by: Peter Chubb
    Signed-off-by: Kristen Carlson Accardi
    Signed-off-by: Greg Kroah-Hartman

    Kristen Carlson Accardi
     
  • This patch cleans up shpchp.h.

    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Kristen Carlson Accardi
    Signed-off-by: Greg Kroah-Hartman

    Kenji Kaneshige
     
  • This patch removes unnecessary shpchprm_get_physical_slot_number()
    function.

    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Kristen Carlson Accardi
    Signed-off-by: Greg Kroah-Hartman

    Kenji Kaneshige
     
  • This patch removes unused/unnecessary members from struct controller.

    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Kristen Carlson Accardi
    Signed-off-by: Greg Kroah-Hartman

    Kenji Kaneshige
     
  • The struct php_ctlr seems to be only for complicating codes. This
    patch removes struct php_ctlr and related codes.

    Signed-off-by: Kenji Kaneshige
    Signed-off-by: Kristen Carlson Accardi
    Signed-off-by: Greg Kroah-Hartman

    Kenji Kaneshige
     
  • Acked-by: Jeff Garzik
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Conke Hu
     
  • Since commit 368c73d4f689dae0807d0a2aa74c61fd2b9b075f the kernel will try
    to update the non-writeable BAR registers 0..3 of PIIX4 IDE adapters if
    pci_assign_unassigned_resources() is used to do full resource assignment of
    the bus. This fails because in the PIIX4 these BAR registers have
    implicitly assumed values and read back as zero; it used to work because
    the kernel used to just write zero to that register the read back value did
    match what was written.

    The fix is a new resource flag IORESOURCE_PCI_FIXED used to mark a resource
    as non-movable. This will also be useful to keep other import system
    resources from being moved around - for example system consoles on PCI
    busses.

    [akpm@osdl.org: cleanup]
    Signed-off-by: Ralf Baechle
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Ralf Baechle
     
  • pci_get_slot() may return NULL if nothing was found. quirk_nvidia_ck804()
    does not check the value returned from pci_get_slot(), so it may end up
    causing a NULL pointer deref.

    Signed-off-by: Jesper Juhl
    Acked-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Jesper Juhl
     
  • This patch is designed to fix:
    - Disk eating corruptor on KT7 after resume from RAM
    - VIA IRQ handling
    - VIA fixups for bus lockups after resume from RAM

    The core of this is to add a table of resume fixups run at resume time.
    We need to do this for a variety of boards and features, but particularly
    we need to do this to get various critical VIA fixups done on resume.

    The second part of the problem is to handle VIA IRQ number rules which
    are a bit odd and need special handling for PIC interrupts. Various
    patches broke various boxes and while this one may not be perfect
    (hopefully it is) it ensures the workaround is applied to the right
    devices only.

    From: Jean Delvare

    Now that PCI quirks are replayed on software resume, we can safely
    re-enable the Asus SMBus unhiding quirk even when software suspend support
    is enabled.

    [akpm@osdl.org: fix const warning]
    Signed-off-by: Alan Cox
    Cc: Jean Delvare
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Alan Cox
     
  • Use pci_find_ht_capability() in drivers/pci/quirks.c.

    I'm pretty sure the logic is unchanged here, but someone please eye-ball it
    for me. I've changed the message to be a little shorter, it's now:

    PCI: Found (enabled|disabled) HT MSI mapping on xxxx:xx:xx.x

    Signed-off-by: Michael Ellerman
    Signed-off-by: Greg Kroah-Hartman

    Michael Ellerman
     
  • Use pci_find_ht_capability() in drivers/pci/htirq.c

    Signed-off-by: Michael Ellerman
    Signed-off-by: Greg Kroah-Hartman

    Michael Ellerman
     
  • There are already several places in the kernel that want to search a PCI
    device for a given Hypertransport capability. Although this is possible
    using pci_find_capability() etc., it makes sense to encapsulate that
    logic in a helper - pci_find_ht_capability().

    To cater for searching exhaustively for a capability, we also provide
    pci_find_next_ht_capability().

    We also need to cater for the fact that the HT capability fields may be
    either 3 or 5 bits wide. pci_find_ht_capability() deals with this for you,
    but callers using the #defines directly must handle that themselves.

    Signed-off-by: Michael Ellerman
    Signed-off-by: Greg Kroah-Hartman

    Michael Ellerman
     
  • The current implementation of __pci_bus_find_cap() does two things,
    first it determines the start of the capability chain for the device,
    and then it trys to find the requested capability.

    Split these out, so that we can use the two parts independantly in
    a subsequent patch. Externally visible behaviour should be unchanged.

    Signed-off-by: Michael Ellerman
    Signed-off-by: Greg Kroah-Hartman

    Michael Ellerman
     
  • This works like pci_dev_present but instead of returning boolean returns
    the matching pci_device_id entry. This makes it much more useful. Code
    bloat is basically nil as the old boolean function is rewritten in terms of
    the new one.

    This will be used by the updated VIA PCI quirks for one

    Signed-off-by: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Alan Cox