09 Aug, 2010

1 commit


07 Aug, 2010

1 commit

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    sata_fsl,mv,nv: prepare for NCQ command completion update
    ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
    libata: more PCI IDs for jmicron controllers
    ata_piix: fix locking around SIDPR access
    [libata] update blacklist for new hyphenated pattern ranges (v2)
    libata: allow hyphenated pattern ranges
    ata_generic: drop hard coded DMA force logic for CENATEK
    [libata] ahci: Fix warning: comparison between 'enum ' and 'enum '
    [libata] add ATA_CMD_DSM to ata_get_cmd_descript
    [libata] Add Samsung PATA controller driver, pata_samsung_cf
    [libata] Add 460EX on-chip SATA driver, sata_dwc_460ex
    libata: reduce blacklist size even more (v2)
    libata: reduce blacklist size (v2)
    libata: glob_match for ata_device_blacklist (v2)
    ahci_platform: Remove unneeded ahci_driver.probe assignment
    ahci_platform: Provide for vendor specific init

    Linus Torvalds
     

06 Aug, 2010

2 commits

  • * 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
    xen/panic: use xen_reboot and fix smp_send_stop
    Xen: register panic notifier to take crashes of xen guests on panic
    xen: support large numbers of CPUs with vcpu info placement
    xen: drop xen_sched_clock in favour of using plain wallclock time
    pvops: do not notify callers from register_xenstore_notifier
    Introduce CONFIG_XEN_PVHVM compile option
    blkfront: do not create a PV cdrom device if xen_hvm_guest
    support multiple .discard.* sections to avoid section type conflicts
    xen/pvhvm: fix build problem when !CONFIG_XEN
    xenfs: enable for HVM domains too
    x86: Call HVMOP_pagetable_dying on exit_mmap.
    x86: Unplug emulated disks and nics.
    x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.
    implement O_NONBLOCK for /proc/xen/xenbus
    xen: Fix find_unbound_irq in presence of ioapic irqs.
    xen: Add suspend/resume support for PV on HVM guests.
    xen: Xen PCI platform device driver.
    x86/xen: event channels delivery on HVM.
    x86: early PV on HVM features initialization.
    xen: Add support for HVM hypercalls.
    ...

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)
    powerpc/8xx: Add support for the MPC8xx based boards from TQC
    powerpc/85xx: Introduce support for the Freescale P1022DS reference board
    powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board
    powerpc/85xx: Change deprecated binding for 85xx-based boards
    powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge
    powerpc/tqm85xx: update PCI interrupt-map attribute
    powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale
    powerpc/fsl_pci: add quirk for mpc8308 pcie bridge
    powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
    powerpc/85xx: Fix booting for P1021MDS boards
    powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards
    powerpc/85xx: kexec for SMP 85xx BookE systems
    powerpc/5200/i2c: improve i2c bus error recovery
    of/xilinxfb: update tft compatible versions
    powerpc/fsl-diu-fb: Support setting display mode using EDID
    powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
    powerpc/5121: shared DIU framebuffer support
    powerpc/5121: move fsl-diu-fb.h to include/linux
    powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor
    powerpc/512x: add clock structure for Video-IN (VIU) unit
    ...

    Linus Torvalds
     

05 Aug, 2010

2 commits

  • This patch adds the quirk for PCIE controller found on Freescale MPC8308.
    The quirk is the same as for other MPC83xx processors.

    Signed-off-by: Ilya Yanok
    Signed-off-by: Kumar Gala

    Ilya Yanok
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
    phy/marvell: add 88ec048 support
    igb: Program MDICNFG register prior to PHY init
    e1000e: correct MAC-PHY interconnect register offset for 82579
    hso: Add new product ID
    can: Add driver for esd CAN-USB/2 device
    l2tp: fix export of header file for userspace
    can-raw: Fix skb_orphan_try handling
    Revert "net: remove zap_completion_queue"
    net: cleanup inclusion
    phy/marvell: add 88e1121 interface mode support
    u32: negative offset fix
    net: Fix a typo from "dev" to "ndev"
    igb: Use irq_synchronize per vector when using MSI-X
    ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
    e1000e: Fix irq_synchronize in MSI-X case
    e1000e: register pm_qos request on hardware activation
    ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
    net: Add getsockopt support for TCP thin-streams
    cxgb4: update driver version
    cxgb4: add new PCI IDs
    ...

    Manually fix up conflicts in:
    - drivers/net/e1000e/netdev.c: due to pm_qos registration
    infrastructure changes
    - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
    and cleaning up the IDs
    - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
    conflict (registration change vs marking it static)

    Linus Torvalds
     

03 Aug, 2010

2 commits


02 Aug, 2010

1 commit


23 Jul, 2010

1 commit

  • Add the xen pci platform device driver that is responsible
    for initializing the grant table and xenbus in PV on HVM mode.
    Few changes to xenbus and grant table are necessary to allow the delayed
    initialization in HVM mode.
    Grant table needs few additional modifications to work in HVM mode.

    The Xen PCI platform device raises an irq every time an event has been
    delivered to us. However these interrupts are only delivered to vcpu 0.
    The Xen PCI platform interrupt handler calls xen_hvm_evtchn_do_upcall
    that is a little wrapper around __xen_evtchn_do_upcall, the traditional
    Xen upcall handler, the very same used with traditional PV guests.

    When running on HVM the event channel upcall is never called while in
    progress because it is a normal Linux irq handler (and we cannot switch
    the irq chip wholesale to the Xen PV ones as we are running QEMU and
    might have passed in PCI devices), therefore we cannot be sure that
    evtchn_upcall_pending is 0 when returning.
    For this reason if evtchn_upcall_pending is set by Xen we need to loop
    again on the event channels set pending otherwise we might loose some
    event channel deliveries.

    Signed-off-by: Stefano Stabellini
    Signed-off-by: Sheng Yang
    Signed-off-by: Jeremy Fitzhardinge

    Stefano Stabellini
     

02 Jul, 2010

1 commit

  • For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
    linux but the controller doesn't require explicit mode setting and
    works fine with ata_generic. Make ahci ignore the controller on MBP
    7,1 and let ata_generic take it for now.

    Reported in bko#15923.

    https://bugzilla.kernel.org/show_bug.cgi?id=15923

    NVIDIA is investigating why ahci mode doesn't work.

    Signed-off-by: Tejun Heo
    Cc: Peer Chen
    Cc: stable@kernel.org
    Reported-by: Anders Østhus
    Reported-by: Andreas Graf
    Reported-by: Benoit Gschwind
    Reported-by: Damien Cassou
    Reported-by: tixetsal@juno.com
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

08 Jun, 2010

1 commit

  • JMB362 is a new variant of jmicron controller which is similar to
    JMB360 but has two SATA ports instead of one. As there is no PATA
    port, single function AHCI mode can be used as in JMB360. Add pci
    quirk for JMB362.

    Signed-off-by: Tejun Heo
    Reported-by: Aries Lee
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik

    Tejun Heo
     

05 Jun, 2010

1 commit

  • * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core: (83 commits)
    i7core_edac: Better describe the supported devices
    Add support for Westmere to i7core_edac driver
    i7core_edac: don't free on success
    i7core_edac: Add support for X5670
    Always call i7core_[ur]dimm_check_mc_ecc_err
    i7core_edac: fix memory leak of i7core_dev
    EDAC: add __init to i7core_xeon_pci_fixup
    i7core_edac: Fix wrong device id for channel 1 devices
    i7core: add support for Lynnfield alternate address
    i7core_edac: Add initial support for Lynnfield
    i7core_edac: do not export static functions
    edac: fix i7core build
    edac: i7core_edac produces undefined behaviour on 32bit
    i7core_edac: Use a more generic approach for probing PCI devices
    i7core_edac: PCI device is called NONCORE, instead of NOCORE
    i7core_edac: Fix ringbuffer maxsize
    i7core_edac: First store, then increment
    i7core_edac: Better parse "any" addrmask
    i7core_edac: Use a lockless ringbuffer
    edac: Create an unique instance for each kobj
    ...

    Linus Torvalds
     

19 May, 2010

2 commits

  • This adds new PCI IDs for the Westmere's memory controller
    devices and modifies the i7core_edac driver to be able to
    probe both Nehalem and Westmere processors.

    Signed-off-by: Vernon Mauery
    Signed-off-by: Mauro Carvalho Chehab

    Vernon Mauery
     
  • As reported by Vernon Mauery , X5670 (Westmere-EP) uses a
    different register for one of the uncore PCI devices. Add support for
    it.

    Those are the PCI ID's on this new chipset:

    fe:00.0 0600: 8086:2c70 (rev 02)
    fe:00.1 0600: 8086:2d81 (rev 02)
    fe:02.0 0600: 8086:2d90 (rev 02)
    fe:02.1 0600: 8086:2d91 (rev 02)
    fe:02.2 0600: 8086:2d92 (rev 02)
    fe:02.3 0600: 8086:2d93 (rev 02)
    fe:02.4 0600: 8086:2d94 (rev 02)
    fe:02.5 0600: 8086:2d95 (rev 02)
    fe:03.0 0600: 8086:2d98 (rev 02)
    fe:03.1 0600: 8086:2d99 (rev 02)
    fe:03.2 0600: 8086:2d9a (rev 02)
    fe:03.4 0600: 8086:2d9c (rev 02)
    fe:04.0 0600: 8086:2da0 (rev 02)
    fe:04.1 0600: 8086:2da1 (rev 02)
    fe:04.2 0600: 8086:2da2 (rev 02)
    fe:04.3 0600: 8086:2da3 (rev 02)
    fe:05.0 0600: 8086:2da8 (rev 02)
    fe:05.1 0600: 8086:2da9 (rev 02)
    fe:05.2 0600: 8086:2daa (rev 02)
    fe:05.3 0600: 8086:2dab (rev 02)
    fe:06.0 0600: 8086:2db0 (rev 02)
    fe:06.1 0600: 8086:2db1 (rev 02)
    fe:06.2 0600: 8086:2db2 (rev 02)
    fe:06.3 0600: 8086:2db3 (rev 02)
    (as usual, the same PCI devices repeat at ff: bus)

    The PCI device 8086:2c70 is shown as:

    fe:00.0 Host bridge: Intel Corporation QuickPath Architecture Generic
    Non-core Registers (rev 02)

    So, for this device to be recognized, it is only a matter of adding this
    new PCI ID to the driver.

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

12 May, 2010

1 commit


10 May, 2010

7 commits


04 Mar, 2010

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
    jsm: fixing error if the driver fails to load
    jsm: removing the uart structure and filename on error
    tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call
    tty: Keep the default buffering to sub-page units
    tty: Fix up char drivers request_room usage
    tty: Fix the ldisc hangup race
    serial: timberdale: Remove dependancies
    nozomi: Tidy up the PCI table
    nozomi: Fix mutex handling
    nozomi: Add tty_port usage
    sdio_uart: Use kfifo instead of the messy circ stuff
    serial: bcm63xx_uart: allow more than one uart to be registered.
    serial: bcm63xx_uart: don't use kfree() on non kmalloced area.
    serial: bfin_5xx: pull in linux/io.h for ioremap prototypes
    serial: bfin_5xx: kgdboc should accept gdb break only when it is active
    serial: bfin_5xx: need to disable DMA TX interrupt too
    serial: bfin_5xx: remove useless gpio handling with hard flow control
    Char: synclink, remove unnecessary checks
    tty: declare MODULE_FIRMWARE in various drivers
    ip2: Add module parameter.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (23 commits)
    firewire: ohci: extend initialization log message
    firewire: ohci: fix IR/IT context mask mixup
    firewire: ohci: add module parameter to activate quirk fixes
    firewire: ohci: use an ID table for quirks detection
    firewire: ohci: reorder struct fw_ohci for better cache efficiency
    firewire: ohci: remove unused dualbuffer IR code
    firewire: core: combine a bit of repeated code
    firewire: core: change type of a data buffer
    firewire: cdev: increment ABI version number
    firewire: cdev: add more flexible cycle timer ioctl
    firewire: core: rename an internal function
    firewire: core: fix an information leak
    firewire: core: increase stack size of config ROM reader
    firewire: core: don't fail device creation in case of too large config ROM blocks
    firewire: core: fix "giving up on config rom" with Panasonic AG-DV2500
    firewire: remove incomplete Bus_Time CSR support
    firewire: get_cycle_timer optimization and cleanup
    firewire: ohci: enable cycle timer fix on ALi and NEC controllers
    firewire: ohci: work around cycle timer bugs on VIA controllers
    firewire: make PCI device id constant
    ...

    Linus Torvalds
     

03 Mar, 2010

2 commits

  • Add different model (with a different PCI ID) to support Korenix JetCard.

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

    Kiros Yeh
     
  • This patch is heavily based on an earlier patch found on the linux-serial
    mailing list [1], written by Darius Augulis.

    The previous incarnation of this patch only supported a 2x serial port
    card. I have added support for my SYBA 6x serial port card, and tested on
    x86.

    [1]: http://marc.info/?l=linux-serial&m=124975806304760

    Signed-off-by: Ira W. Snyder
    Cc: Darius Augulis
    Cc: Greg KH
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Ira W. Snyder
     

25 Feb, 2010

1 commit

  • This code was no longer used since 2.6.33, "firewire: ohci: always use
    packet-per-buffer mode for isochronous reception" commit 090699c0. If
    anybody needs this code in the future for special purposes, it can be
    brought back in. But it must not be re-enabled by default; drivers
    (kernelspace or userspace drivers) should only get this mode if they
    explicitly request it.

    Signed-off-by: Stefan Richter

    Stefan Richter
     

23 Feb, 2010

1 commit


13 Dec, 2009

1 commit

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (151 commits)
    powerpc: Fix usage of 64-bit instruction in 32-bit altivec code
    MAINTAINERS: Add PowerPC patterns
    powerpc/pseries: Track previous CPPR values to correctly EOI interrupts
    powerpc/pseries: Correct pseries/dlpar.c build break without CONFIG_SMP
    powerpc: Make "intspec" pointers in irq_host->xlate() const
    powerpc/8xx: DTLB Miss cleanup
    powerpc/8xx: Remove DIRTY pte handling in DTLB Error.
    powerpc/8xx: Start using dcbX instructions in various copy routines
    powerpc/8xx: Restore _PAGE_WRITETHRU
    powerpc/8xx: Add missing Guarded setting in DTLB Error.
    powerpc/8xx: Fixup DAR from buggy dcbX instructions.
    powerpc/8xx: Tag DAR with 0x00f0 to catch buggy instructions.
    powerpc/8xx: Update TLB asm so it behaves as linux mm expects.
    powerpc/8xx: Invalidate non present TLBs
    powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
    pseries/pseries: Add code to online/offline CPUs of a DLPAR node
    powerpc: stop_this_cpu: remove the cpu from the online map.
    powerpc/pseries: Add kernel based CPU DLPAR handling
    sysfs/cpu: Add probe/release files
    powerpc/pseries: Kernel DLPAR Infrastructure
    ...

    Linus Torvalds
     

10 Dec, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (222 commits)
    [SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
    [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
    [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
    [SCSI] zfcp: Update FSF error reporting
    [SCSI] zfcp: Improve ELS ADISC handling
    [SCSI] zfcp: Simplify handling of ct and els requests
    [SCSI] zfcp: Remove ZFCP_DID_MASK
    [SCSI] zfcp: Move WKA port to zfcp FC code
    [SCSI] zfcp: Use common code definitions for FC CT structs
    [SCSI] zfcp: Use common code definitions for FC ELS structs
    [SCSI] zfcp: Update FCP protocol related code
    [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
    [SCSI] zfcp: Assign scheduled work to driver queue
    [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
    [SCSI] zfcp: Implement module unloading
    [SCSI] zfcp: Merge trace code for fsf requests in one function
    [SCSI] zfcp: Access ports and units with container_of in sysfs code
    [SCSI] zfcp: Remove suspend callback
    [SCSI] zfcp: Remove global config_mutex
    [SCSI] zfcp: Replace local reference counting with common kref
    ...

    Linus Torvalds
     

09 Dec, 2009

2 commits

  • Conflicts:
    include/linux/kvm.h

    Benjamin Herrenschmidt
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (54 commits)
    Revert "pata_sis: Implement MWDMA for the UDMA 133 capable chips"
    libata: Clarify ata_set_lba_range_entries function
    libata: Report zeroed read after TRIM and max discard size
    pata_hpt3x2n: fix overclocked MWDMA0 timing
    pata_it8213: MWDMA0 is unsupported
    [libata] MWDMA0 is unsupported on PIIX-like PATA controllers
    pata_via: clear UDMA transfer mode bit for PIO and MWDMA
    pata_sis: Power Management fix
    pata_rz1000: Power Management fix
    pata_radisys: fix UDMA handling
    pata_ns87415: Power Management fix
    pata_marvell: fix marvell_pre_reset() documentation
    pata_legacy: add pointers to QDI65x0 documentation
    pata_legacy: fix access to control register for QDI6580
    pata_legacy: fix QDI6580DP support
    pata_it8213: fix it8213_pre_reset() documentation
    pata_it8213: fix wrong MWDMA timings being programmed
    pata_it8213: fix PIO2 underclocking
    pata_it8213: fix wrong PIO timings being programmed
    pata_it8213: fix UDMA handling
    ...

    Linus Torvalds
     

06 Dec, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (50 commits)
    pcmcia: rework the irq_req_t typedef
    pcmcia: remove deprecated handle_to_dev() macro
    pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
    pcmcia: remove unused "window_t" typedef
    pcmcia: move some window-related code to pcmcia_ioctl.c
    pcmcia: Change window_handle_t logic to unsigned long
    pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
    pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
    drivers/pcmcia: remove unnecessary kzalloc
    pcmcia: correct handling for Zoomed Video registers in topic.h
    pcmcia: fix printk formats
    pcmcia: autoload module pcmcia
    pcmcia/staging: update comedi drivers
    PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
    PCMCIA: ss: allow PCI IRQs > 255
    PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
    PCMCIA: soc_common: constify soc_pcmcia_socket ops member
    PCMCIA: sa1111: remove duplicated initializers
    PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
    ...

    Linus Torvalds
     

05 Dec, 2009

1 commit


04 Dec, 2009

1 commit

  • We were never able to get docs for this out of Toshiba for years. Dave
    Barnes produced a NetBSD driver however and from that we can fill in the
    needed tables.

    As we correct the PCI identifiers a bit also update the old ide generic driver
    at the same time so it stays compiling.

    Signed-off-by: Alan Cox
    Signed-off-by: Jeff Garzik

    Alan Cox
     

24 Nov, 2009

1 commit


21 Nov, 2009

1 commit


12 Nov, 2009

1 commit


07 Nov, 2009

1 commit