08 Oct, 2008

3 commits


07 Oct, 2008

12 commits

  • This reverts commit 135aedc38e812b922aa56096f36a3d72ffbcf2fb, as
    requested by Hans Verkuil.

    It was a patch for 2.6.28 where the BKL was pushed down from v4l core to
    the drivers, not for 2.6.27!

    Requested-by: Hans Verkuil
    Cc: Mauro Carvalho Chehab
    Signed-of-by: Linus Torvalds

    Linus Torvalds
     
  • Linus Torvalds
     
  • * Theodore Ts'o (tytso@mit.edu) wrote:
    >
    > I've been playing with adding some markers into ext4 to see if they
    > could be useful in solving some problems along with Systemtap. It
    > appears, though, that as of 2.6.27-rc8, markers defined in code which is
    > compiled directly into the kernel (i.e., not as modules) don't show up
    > in Module.markers:
    >
    > kvm_trace_entryexit arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u
    > kvm_trace_handler arch/x86/kvm/kvm-intel %u %p %u %u %u %u %u %u
    > kvm_trace_entryexit arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u
    > kvm_trace_handler arch/x86/kvm/kvm-amd %u %p %u %u %u %u %u %u
    >
    > (Note the lack of any of the kernel_sched_* markers, and the markers I
    > added for ext4_* and jbd2_* are missing as wel.)
    >
    > Systemtap apparently depends on in-kernel trace_mark being recorded in
    > Module.markers, and apparently it's been claimed that it used to be
    > there. Is this a bug in systemtap, or in how Module.markers is getting
    > built? And is there a file that contains the equivalent information
    > for markers located in non-modules code?

    I think the problem comes from "markers: fix duplicate modpost entry"
    (commit d35cb360c29956510b2fe1a953bd4968536f7216)

    Especially :

    - add_marker(mod, marker, fmt);
    + if (!mod->skip)
    + add_marker(mod, marker, fmt);
    }
    return;
    fail:

    Here is a fix that should take care if this problem.

    Thanks for the bug report!

    Signed-off-by: Mathieu Desnoyers
    Tested-by: "Theodore Ts'o"
    CC: Greg KH
    CC: David Smith
    CC: Roland McGrath
    CC: Sam Ravnborg
    CC: Wenji Huang
    CC: Takashi Nishiie
    Signed-off-by: Linus Torvalds

    Mathieu Desnoyers
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    kgdb: call touch_softlockup_watchdog on resume
    kgdb, x86: Avoid invoking kgdb_nmicallback twice per NMI

    Linus Torvalds
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: gart iommu have direct mapping when agp is present too

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    ide: workaround for bogus gcc warning in ide_sysfs_register_port()
    ide-cd: Optiarc DVD RW AD-7200A does play audio
    IDE: Fix platform device registration in Swarm IDE driver (v2)
    ide-dma: fix ide_build_dmatable() for TRM290
    ide-cd: temporary tray close fix

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
    [MIPS] IP27: Fix build errors if CONFIG_MAPPED_KERNEL=y
    [MIPS] Fix CMP Kconfig configuration and mark as broken.

    Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)
    V4L/DVB (9103): em28xx: HVR-900 B3C0 - fix audio clicking issue
    V4L/DVB (9099): em28xx: Add detection for K-WORLD DVB-T 310U
    V4L/DVB (9092): gspca: Bad init values for sonixj ov7660.
    V4L/DVB (9080): gspca: Add a delay after writing to the sonixj sensors.
    V4L/DVB (9075): gspca: Bad check of returned status in i2c_read() spca561.
    V4L/DVB (9053): fix buffer overflow in uvc-video
    V4L/DVB (9043): S5H1420: Fix size of shadow-array to avoid overflow
    V4L/DVB (9037): Fix support for Hauppauge Nova-S SE
    V4L/DVB (9029): Fix deadlock in demux code
    V4L/DVB (8979): sms1xxx: Add new USB product ID for Hauppauge WinTV MiniStick
    V4L/DVB (8978): sms1xxx: fix product name for Hauppauge WinTV MiniStick
    V4L/DVB (8967): Use correct XC3028L firmware for AMD ATI TV Wonder 600
    V4L/DVB (8963): s2255drv field count fix
    V4L/DVB (8961): zr36067: Fix RGBR pixel format
    V4L/DVB (8960): drivers/media/video/cafe_ccic.c needs mm.h
    V4L/DVB (8958): zr36067: Return proper bytes-per-line value
    V4L/DVB (8957): zr36067: Restore the default pixel format
    V4L/DVB (8955): bttv: Prevent NULL pointer dereference in radio_open
    V4L/DVB (8935): em28xx-cards: Remove duplicate entry (EM2800_BOARD_KWORLD_USB2800)
    V4L/DVB (8933): gspca: Disable light frquency for zc3xx cs2102 Kokom.
    ...

    Linus Torvalds
     
  • The atmel-mci driver sometimes fails data transfers like this:

    mmcblk0: error -5 transferring data
    end_request: I/O error, dev mmcblk0, sector 2749769
    end_request: I/O error, dev mmcblk0, sector 2749777

    It turns out that this might be caused by the BLKR register (which
    contains the block size and the number of blocks being transfered) being
    initialized too late. This patch moves the initialization of BLKR so
    that it contains the correct value before the block transfer command is
    sent.

    This error is difficult to reproduce, but if you insert a long delay
    (mdelay(10) or thereabouts) between the calls to atmci_start_command()
    and atmci_submit_data(), all transfers seem to fail without this patch,
    while I haven't seen any failures with this patch.

    Reported-by: Hein_Tibosch
    Signed-off-by: Haavard Skinnemoen
    Signed-off-by: Pierre Ossman
    Signed-off-by: Linus Torvalds

    Haavard Skinnemoen
     
  • The softlockup watchdog needs to be touched when resuming the from the
    kgdb stopped state to avoid the printk that a CPU is stuck if the
    debugger was active for longer than the softlockup threshold.

    Signed-off-by: Jason Wessel

    Jason Wessel
     
  • Stress-testing KVM's latest NMI support with kgdbts inside an SMP guest,
    I came across spurious unhandled NMIs while running the singlestep test.
    Looking closer at the code path each NMI takes when KGDB is enabled, I
    noticed that kgdb_nmicallback is called twice per event: One time via
    DIE_NMI_IPI notification, the second time on DIE_NMI. Removing the first
    invocation cures the unhandled NMIs here.

    Signed-off-by: Jan Kiszka
    Signed-off-by: Jason Wessel

    Jan Kiszka
     
  • There is a bug in the BIOSes of some HP boxes with AMD Turions which
    connects IO-APIC pins with ACPI thermal trip points in such a way that
    if the state of the IO-APIC is not as expected by the (buggy) BIOS, the
    thermal trip points are set to insanely low values (usually all of them
    become 16 degrees Celsius). As a result, thermal throttling kicks in
    and knock the system down to its shoes.

    Unfortunately some of the recent IO-APIC changes made the bug show up.
    To prevent this from happening, blacklist machines that are known to be
    affected (nx6115 and 6715b in this particular case).

    This fixes http://bugzilla.kernel.org/show_bug.cgi?id=11516 listed as
    a regression from 2.6.26.

    On my box it was caused by:

    commit 691874fa96d6349a8b60f8ea9c2bae52ece79941
    Author: Maciej W. Rozycki
    Date: Tue May 27 21:19:51 2008 +0100

    x86: I/O APIC: timer through 8259A second-chance

    Signed-off-by: Maciej W. Rozycki
    Signed-off-by: Ingo Molnar

    and the whole story is described in this (huge) thread:

    http://marc.info/?l=linux-kernel&m=121358440508410&w=4

    Matthew Garrett told us about that happening on the nx6125:

    http://marc.info/?l=linux-kernel&m=121396307411930&w=4

    and then Maciej analysed the breakage on the basis of a DSDT from the
    nx6325:

    http://marc.info/?l=linux-kernel&m=121401068718826&w=4

    As far as the Dmitry's and Jason's boxes are concerned, I recognized the
    symptoms and asked them to verify that the blacklisting helped.

    It appears that the buggy BIOS code has been copy-pasted to the entire
    range of machines, for no good reason.

    Signed-off-by: Rafael J. Wysocki
    Tested-by: Dmitry Torokhov
    Tested-by: Jason Vas Dias
    Signed-off-by: Linus Torvalds

    Rafael J. Wysocki
     

06 Oct, 2008

9 commits


05 Oct, 2008

16 commits

  • move init_memory_mapping() out of init_k8_gatt.

    for: http://bugzilla.kernel.org/show_bug.cgi?id=11676
    2.6.27-rc2 to rc8, apgart fails, iommu=soft works, regression

    This is needed because we need to map the GART aperture even
    if the GATT is not initialized.

    Signed-off-by: Yinghai Lu
    Signed-off-by: Ingo Molnar

    Yinghai Lu
     
  • Fixed audio clicking problem which could be heard when using analog tv or composite input

    Signed-off-by: Wiktor Grebla
    Signed-off-by: Douglas Schilling Landgraf
    Signed-off-by: Mauro Carvalho Chehab

    Wiktor Grebla
     
  • Correct firmware type to MTS
    Correct audio routing for composite/s-video
    Add DVB-T detection.

    This patch uses the eeprom hash method for detection as the vendor/product
    ids are also used for the DIGIVOX_AD. This may be a clone of the same
    product. Explanatory text has been added prior to the hask look-up in
    anticipation that it may help others.

    The following has been tested to work:
    Analogue TV (PAL-I)
    Composite In
    DVB-T (UK Crystal Palace)
    USB AUDIO

    The following has not been tested but probably works:
    S-Video In

    Signed-off-by: Darron Broad
    Signed-off-by: Douglas Schilling Landgraf
    Signed-off-by: Mauro Carvalho Chehab

    Darron Broad
     
  • Signed-off-by: Jean-Francois Moine
    Signed-off-by: Mauro Carvalho Chehab

    Jean-Francois Moine
     
  • Signed-off-by: Jean-Francois Moine
    Signed-off-by: Mauro Carvalho Chehab

    Jean-Francois Moine
     
  • This makes auto gain functional on 04fc:0561.

    Signed-off-by: Shane
    Signed-off-by: Jean-Francois Moine
    Signed-off-by: Mauro Carvalho Chehab

    Shane
     
  • There is a buffer overflow in drivers/media/video/uvc/uvc_ctrl.c:

    INFO: 0xf2c5ce08-0xf2c5ce0b. First byte 0xa1 instead of 0xcc
    INFO: Allocated in uvc_query_v4l2_ctrl+0x3c/0x239 [uvcvideo] age=13 cpu=1 pid=4975
    ...

    A fixed size 8-byte buffer is allocated, and a variable size field is read
    into it; there is no particular bound on the size of the field (it is
    dependent on hardware and configuration) and it can overflow [also
    verified by inserting printk's.]

    The patch attempts to size the buffer to the correctly.

    Signed-off-by: Andrew Morton
    Acked-by: Laurent Pinchart
    Signed-off-by: Mauro Carvalho Chehab

    Ralph Loader
     
  • The array size of 'shadow' still needs to be fixed in order to not overflow when reading register 0x00.

    Thanks to Oliver Endriss for pointing that out.

    Signed-off-by: Patrick Boettcher
    Signed-off-by: Mauro Carvalho Chehab

    Patrick Boettcher
     
  • Different backends have different input busses (saa7146, flexcop).
    To reflect that a config-option to the s5h1420-driver was added which makes
    the output mode selectable.

    Furthermore the s5h1420-driver is now doing the same i2c-method as it was done
    before adding support for other i2c-users.

    This patch needs to go into the current release of the kernel, as this driver
    is currently broken.

    (Thanks to Eberhard Kaltenhaeuser for helping out to debug this issue.)

    Signed-off-by: Patrick Boettcher
    Signed-off-by: Mauro Carvalho Chehab

    Patrick Boettcher
     
  • The functions dvb_dmxdev_section_callback, dvb_dmxdev_ts_callback,
    dvb_dmx_swfilter_packet, dvb_dmx_swfilter_packets, dvb_dmx_swfilter and
    dvb_dmx_swfilter_204 may be called from both interrupt and process
    context. Therefore they need to be protected by spin_lock_irqsave()
    instead of spin_lock().

    This fixes a deadlock discovered by lockdep.

    Signed-off-by: Andreas Oberritter
    Signed-off-by: Mauro Carvalho Chehab

    Andreas Oberritter
     
  • 2040:5510 is the same hardware as 2040:5500

    Signed-off-by: Michael Krufky
    Signed-off-by: Mauro Carvalho Chehab

    Michael Krufky
     
  • Signed-off-by: Michael Krufky
    Signed-off-by: Mauro Carvalho Chehab

    Michael Krufky
     
  • The AMD ATI TV Wonder 600 has an XC3028L and *not* an XC3028, so we need to
    load the proper firmware to prevent the device from overheating.

    Signed-off-by: Devin Heitmueller
    Signed-off-by: Michael Krufky
    Signed-off-by: Mauro Carvalho Chehab

    Devin Heitmueller
     
  • Fixes videobuf field_count

    Signed-off-by: Dean Anderson
    Signed-off-by: Mauro Carvalho Chehab

    Dean Anderson
     
  • The zr36067 driver is improperly declaring pixel format RGBP twice,
    once as "16-bit RGB LE" and once as "16-bit RGB BE". The latter is
    actually RGBR. Fix the code to properly map both pixel formats.

    Signed-off-by: Jean Delvare
    Acked-by: Trent Piepho
    Signed-off-by: Mauro Carvalho Chehab

    Jean Delvare
     
  • sparc32 allmodconfig:

    drivers/media/video/cafe_ccic.c: In function 'cafe_setup_siobuf':
    drivers/media/video/cafe_ccic.c:1192: error: implicit declaration of function 'PAGE_ALIGN'
    drivers/media/video/cafe_ccic.c: At top level:
    drivers/media/video/cafe_ccic.c:1430: error: variable 'cafe_v4l_vm_ops' has initializer but incomplete type
    drivers/media/video/cafe_ccic.c:1431: error: unknown field 'open' specified in initializer
    drivers/media/video/cafe_ccic.c:1431: warning: excess elements in struct initializer
    drivers/media/video/cafe_ccic.c:1431: warning: (near initialization for 'cafe_v4l_vm_ops')
    drivers/media/video/cafe_ccic.c:1432: error: unknown field 'close' specified in initializer
    drivers/media/video/cafe_ccic.c:1433: warning: excess elements in struct initializer
    drivers/media/video/cafe_ccic.c:1433: warning: (near initialization for 'cafe_v4l_vm_ops')
    drivers/media/video/cafe_ccic.c: In function 'cafe_v4l_mmap':
    drivers/media/video/cafe_ccic.c:1444: error: 'VM_WRITE' undeclared (first use in this function)
    drivers/media/video/cafe_ccic.c:1444: error: (Each undeclared identifier is reported only once
    drivers/media/video/cafe_ccic.c:1444: error: for each function it appears in.)
    drivers/media/video/cafe_ccic.c:1444: error: 'VM_SHARED' undeclared (first use in this function)
    drivers/media/video/cafe_ccic.c:1461: error: 'VM_DONTEXPAND' undeclared (first use in this function)

    This build breakage is caused by some header file shuffle in linux-next. But
    I suggest that this patch be merged ahead of linux-next to avoid bisection
    breakage.

    Signed-off-by: Andrew Morton
    Signed-off-by: Mauro Carvalho Chehab

    Andrew Morton