05 Feb, 2009

3 commits


29 Jan, 2009

3 commits

  • Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code
    powerpc/pseries: Correct VIO bus accounting problem in CMO env.
    powerpc: More printing warning fixes for the l64 to ll64 conversion
    powerpc: Remove arch/ppc cruft from Kconfig
    powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
    powerpc/embedded6xx: Update defconfigs
    powerpc/8xx: Update defconfigs
    powerpc/86xx: Update defconfigs
    powerpc/83xx: Update defconfigs
    powerpc/85xx: Update defconfigs
    powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed
    powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
    powerpc/44x: Update PowerPC 44x defconfigs
    powerpc/40x: Update PowerPC 40x defconfigs
    powerpc/85xx: Fix typo in mpc8572ds dts
    powerpc/44x: Warp patches for the new NDFC driver
    powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68knommu: fix 5329 ColdFire periphal addressing
    uclinux: add process name to allocation error message
    m68knommu: correct the mii calculations for 532x ColdFire FEC
    m68knommu: add ColdFire M532x to the FEC configuration options
    m68knommu: fix syscall restarting
    m68knommu: remove the obsolete and long unused comempci chip support
    m68knommu: remove the no longer used PCI support option
    m68knommu: remove obsolete and unused eLIA board
    m68knommu: set NO_DMA
    m68knommu: fix cache flushing for the 527x ColdFire processors
    m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
    m68knommu: use one exist from execption

    Linus Torvalds
     

28 Jan, 2009

34 commits

  • Commit d7b1956fed33d30c4815e848fd7a143722916868 ("DMI: Introduce
    dmi_first_match to make the interface more flexible") introduced compile
    errors like the following when !CONFIG_DMI

    drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
    drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
    drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast

    We just need a dummy version of dmi_first_match() to fix this all up.

    Signed-off-by: Kumar Gala
    Signed-off-by: Linus Torvalds

    Kumar Gala
     
  • Schedule a vblank signal, kill the process, and we'll go walking over freed
    memory. Given that no open-source userland exists using this, nor have I
    ever heard of a consumer, just let this code die.

    Signed-off-by: Eric Anholt
    Requested-by: Linus Torvalds
    Acked-by: Dave Airlie
    Signed-off-by: Linus Torvalds

    Eric Anholt
     
  • _PAGE_COHERENT is now always set in _PAGE_RAM resp. PAGE_KERNEL.
    Thus it has to be masked out, if the BAT mapping should be non
    cacheable or CPU_FTR_NEED_COHERENT is not set.

    This will work on normal SMP setups because we force-set
    CPU_FTR_NEED_COHERENT as part of CPU_FTR_COMMON on SMP.

    Signed-off-by: Gerhard Pircher
    Signed-off-by: Benjamin Herrenschmidt

    Gerhard Pircher
     
  • In the VIO bus code the wrappers for dma alloc_coherent and free_coherent
    calls are rounding to IOMMU_PAGE_SIZE. Taking a look at the underlying
    calls, the actual mapping is promoted to PAGE_SIZE. Changing the
    rounding in these two functions fixes under-reporting the entitlement
    used by the system. Without this change, the system could run out of
    entitlement before it believes it has and incur mapping failures at the
    firmware level.

    Also in the VIO bus code, the wrapper for dma map_sg is not exiting in
    an error path where it should. Rather than fall through to code for the
    success case, this patch adds the return that is needed in the error path.

    Signed-off-by: Robert Jennings
    Signed-off-by: Benjamin Herrenschmidt

    Robert Jennings
     
  • These are all powerpc specific drivers.

    res.start in fsl_elbc_nand.c needs to be cast since it may be either 32
    or 64 bit. Thanks to Scott Wood for noticing.

    Signed-off-by: Stephen Rothwell
    Acked-by: Arnd Bergmann call_edac bits in particular
    Acked-by: Olof Johansson pasemi_nand peices
    Acked-by: Scott Wood fsl_elbc fixes
    Signed-off-by: Benjamin Herrenschmidt

    Stephen Rothwell
     
  • Remove some leftover cruft from the arch/ppc days

    Signed-off-by: Josh Boyer
    Acked-by: Kumar Gala
    Signed-off-by: Benjamin Herrenschmidt

    Josh Boyer
     
  • Signed-off-by: Stephen Rothwell
    Signed-off-by: Benjamin Herrenschmidt

    Stephen Rothwell
     
  • Manual merge of:
    arch/powerpc/configs/44x/warp_defconfig

    Benjamin Herrenschmidt
     
  • Benjamin Herrenschmidt
     
  • Given just how hard it is to find the code that uses MAY_APPEND
    it's probably not a big surprise that this went unnoticed for so
    long. The Smack rules loading code is incorrectly setting the
    MAY_READ bit when MAY_APPEND is requested.

    Signed-off-by: Casey Schaufler
    Reviewed-by: James Morris
    Signed-off-by: Linus Torvalds

    Casey Schaufler
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (36 commits)
    USB: Driver for Freescale QUICC Engine USB Host Controller
    USB: option: add QUANTA HSDPA Data Card device ids
    USB: storage: Add another unusual_dev for off-by-one bug
    USB: unusual_dev: usb-storage needs to ignore a device
    USB: GADGET: fix !x & y
    USB: new id for ti_usb_3410_5052 driver
    USB: cdc-acm: Add another conexant modem to the quirks
    USB: 'option' driver - onda device MT503HS has wrong id
    USB: Remove ZTE modem from unusual_devices
    USB: storage: support of Dane-Elec MediaTouch USB device
    USB: usbmon: Implement compat_ioctl
    USB: add kernel-doc for wusb_dev in struct usb_device
    USB: ftdi_sio driver support of bar code scanner from Diebold
    USB: ftdi_sio: added Alti-2 VID and Neptune 3 PID
    USB: cp2101 device
    USB: usblp.c: add USBLP_QUIRK_BIDIR to Brother HL-1440
    USB: remove vernier labpro from ldusb
    USB: CDC-ACM quirk for MTK GPS
    USB: cdc-acm: support some gps data loggers
    USB: composite: Fix bug: low byte of w_index is the usb interface number not the whole 2 bytes of w_index
    ...

    Linus Torvalds
     
  • This patch adds support for the FHCI USB controller, as found
    in the Freescale MPC836x and MPC832x processors. It can support
    Full or Low speed modes.

    Quite a lot the hardware is doing by itself (SOF generation, CRC
    generation and checking), though scheduling and retransmission is on
    software's shoulders.

    This controller does not integrate the root hub, so this driver also
    fakes one-port hub. External hub is required to support more than
    one device.

    Signed-off-by: Anton Vorontsov
    Signed-off-by: Greg Kroah-Hartman

    Anton Vorontsov
     
  • This patch adds the support for the QUANTA Q101 series HSDPA Data Card.
    With the vendor and product IDs are set properly,
    the data card can be detected and works fine.

    Signed-off-by: Alex Cheng
    Signed-off-by: Greg Kroah-Hartman

    Alex.Cheng@quantatw.com
     
  • Argosy has released another device with the off-by-one sector. This is a
    harddrive with an internal cardreader which is affected.

    Based on a patch written by Martijn Hijdra

    Signed-off-by: Phil Dibowitz
    Cc: Martijn Hijdra
    Signed-off-by: Greg Kroah-Hartman

    Phil Dibowitz
     
  • This patch adds an unusual_devs entry for a Sony Ericsson modem. Like many
    other modems, we have to ignore the storage device in order to access the
    modem.

    At this time usb_modeswitch does not work with this device.

    Reported-by: The Solutor .
    Signed-off-by: Phil Dibowitz
    Signed-off-by: Greg Kroah-Hartman

    Phil Dibowitz
     
  • ! has a higher precedence than &

    Signed-off-by: Roel Kluin
    Acked-by: David Brownell
    Signed-off-by: Greg Kroah-Hartman

    Roel Kluin
     
  • This adds a new device id

    Signed-off-by: Oliver Neukum
    Signed-off-by: Greg Kroah-Hartman

    Oliver Neukum
     
  • Another Conexant, another device with the same quirk

    Signed-off-by: Alan Cox
    Acked-by: Oliver Neukum
    Signed-off-by: Greg Kroah-Hartman

    Alan Cox
     
  • While trying to make GSM modem Onda MT503HS working, I found a mismatch
    between device id in the driver code (0x0200) and id in the lsusb
    output (0x2000).

    This patch fixed it for me, but I don't know if the original device id was
    also correct and the new ID should be added instead of replacing the
    old one.

    Signed-off-by: Marcel Sebek
    Acked-by: Domenico Riccio
    Signed-off-by: Greg Kroah-Hartman

    Marcel Sebek
     
  • The ZTE modem entry causes usb-storage to ignore the device, but for some
    versions of the device, usb-storage mode is required to get to modem ode. For
    both kinds the tool: http://www.draisberghof.de/usb_modeswitch/ should work.

    Note that the various versions of the device have the same ProductId,
    VendorId, and bcdDevice number, so we cannot have the entry for some and not
    others.

    Signed-off-by: Phil Dibowitz
    Signed-off-by: Greg Kroah-Hartman

    Phil Dibowitz
     
  • This adds another unusual_devs.h entry for a device that can't handle more
    than 64k reads/writes in a single command.

    Signed-off-by: Jean-Baptiste Onofre
    Signed-off-by: Phil Dibowitz
    Signed-off-by: Greg Kroah-Hartman

    Jean-Baptiste Onofre
     
  • Running a 32-bit usbmon(8) on 2.6.28-rc9 produces the following:
    ioctl32(usbmon:28563): Unknown cmd fd(3) cmd(400c9206){t:ffffff92;sz:12} arg(ffd3f458) on /dev/usbmon0

    It happens because the compatibility mode was implemented for 2.6.18
    and not updated for the fsops.compat_ioctl API.

    This patch relocates the pieces from under #ifdef CONFIG_COMPAT into
    compat_ioctl with no other changes except one new whitespace.

    Signed-off-by: Pete Zaitcev
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Pete Zaitcev
     
  • Reported by Randy Dunlap from a warning on the v2.6.29 merge window.

    Signed-off-by: Inaky Perez-Gonzalez
    Cc: David Vrabel
    Cc: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Inaky Perez-Gonzalez
     
  • Added the product id of bcs(bar code scanner) from Diebold Procomp Brazil.

    Signed-off-by: Mhayk Whandson
    Signed-off-by: Greg Kroah-Hartman

    Mhayk Whandson
     
  • This patch adds the vendor and product ID for the Alti-2 Neptune 3
    (http://www.alti-2.com) which uses the FTDI chip.

    Signed-off-by: Robie Basak
    Signed-off-by: Greg Kroah-Hartman

    Robie Basak
     
  • My girl use modem GSM (EDGE) Commanader 2 on iPlus Polsih provider,

    PLEASE add this vendor=0x10C4 and product=0x822B to USB serial driver cp2101.c

    From: Tomasz K
    Signed-off-by: Greg Kroah-Hartman

    Tomasz K
     
  • My Brother HL-1440 would print one document before CUPS would stop
    printing with the error "Printer not connected; will retry in 30
    seconds...". I traced this down to the CUPS usb backend getting an EIO
    out of usblp on the IOCNR_GET_DEVICE_ID IOCTL. Adding the
    USBLP_QUIRK_BIDIR fixes the problem but is it the right solution?

    output from strace /usr/lib/cups/backend/usb after printing a document
    (Note: SNDCTL_DSP_SYNC == IOCNR_GET_DEVICE_ID):

    before patch

    open("/dev/usb/lp0", O_RDWR|O_EXCL) = 3
    ioctl(3, SNDCTL_DSP_SYNC, 0x7fff2478cef0) = -1 EIO (Input/output error)

    after patch

    open("/dev/usb/lp0", O_RDWR|O_EXCL) = 3
    ioctl(3, SNDCTL_DSP_SYNC, 0x7fffb8d474c0) = 0

    Possibly related bug: https://bugs.launchpad.net/ubuntu/+source/cupsys/+bug/35638

    Signed-off-by: Brandon Philips
    Signed-off-by: Greg Kroah-Hartman

    Brandon Philips
     
  • Labpro device is in both ldusb and vstusb device tables.
    Should only be a vstusb device.

    Signed-off-by: stephen ware
    Signed-off-by: Greg Kroah-Hartman

    sware
     
  • This patch adds a device quirk for a MediaTek Inc GPS chipset. The
    device implements USB CDC ACM, but is missing the union descriptor, so
    the ACM class driver fails to probe the device.

    I've tested this patch with an iBlue A+ GPS which uses this chipset
    and using kernel 2.6.28-rc9.

    Signed-off-by: Andrew Lunn,
    Acked-by: Oliver Neukum
    Signed-off-by: Greg Kroah-Hartman

    Andrew Lunn
     
  • Below is a patch which allows a number of GPS loggers to work
    under linux. It is known to support the i-Blue 747 (all models),
    i-Blue 757, Qstarz BT-Q1000, i.Trek Z1, Konet BGL-32, and the Holux
    M-241.

    From: James A. Treacy
    Signed-off-by: Greg Kroah-Hartman

    James A. Treacy
     
  • … whole 2 bytes of w_index

    In some usb gadget driver, for example usb audio class device, the high
    byte of w_index is the entity id and low byte is the interface number.
    If we use the 2 bytes of w_index as the array number, we will get a
    wrong pointer or NULL pointer.

    This patch fixes this issue.

    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    Bryan Wu
     
  • Signed-off-by: Bryan Wu
    Acked-by: David Brownell
    Signed-off-by: Greg Kroah-Hartman

    Bryan Wu
     
  • The Blackfin MUSB Kconfig text didn't properly parenthesise its
    dependencies. This was visible in non-Blackfin configs by the
    way the user interfaces lost track of dependencies, when doing
    a bunch of test builds.

    Signed-off-by: David Brownell
    Signed-off-by: Greg Kroah-Hartman

    David Brownell
     
  • Initializes the actual_len field to 0 before every DMA transaction.

    Signed-off-by: Swaminathan S
    Acked-by: Felipe Balbi
    Signed-off-by: David Brownell
    Signed-off-by: Greg Kroah-Hartman

    Swaminathan S